From 9877ecaed235e18e2a39fffbd954940b1b80952e Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Wed, 24 Jan 2024 15:46:59 +1300 Subject: [PATCH 01/17] Fix wrong key passed for creating FCM provider --- .../project-[project]/messaging/providers/create.svelte | 2 +- .../providers/provider-[provider]/updateStatus.svelte | 2 +- .../project-[project]/messaging/providers/store.ts | 8 ++++---- .../project-[project]/messaging/providers/update.svelte | 2 +- .../messaging/providers/wizard/provider.svelte | 2 +- .../project-[project]/messaging/providers/wizard/store.ts | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/routes/console/project-[project]/messaging/providers/create.svelte b/src/routes/console/project-[project]/messaging/providers/create.svelte index 5cae6700c..b619c04ec 100644 --- a/src/routes/console/project-[project]/messaging/providers/create.svelte +++ b/src/routes/console/project-[project]/messaging/providers/create.svelte @@ -180,7 +180,7 @@ providerId: providerId, name: $providerParams[$provider].name, enabled: $providerParams[$provider].enabled, - serverKey: $providerParams[$provider].serverKey + serviceAccountJSON: $providerParams[$provider].serviceAccountJSON } ); break; diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte index 1349d5632..d6a703e2e 100644 --- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte +++ b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte @@ -101,7 +101,7 @@ providerId: $provider.$id, name: $provider.name, enabled: $provider.enabled, - serverKey: $provider.credentials['serverKey'] + serviceAccountJSON: $provider.credentials['serviceAccountJSON'] }; break; case Providers.APNS: diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/console/project-[project]/messaging/providers/store.ts index 68e518b74..d14286d6e 100644 --- a/src/routes/console/project-[project]/messaging/providers/store.ts +++ b/src/routes/console/project-[project]/messaging/providers/store.ts @@ -49,13 +49,13 @@ export const providers: ProvidersMap = { description: 'Firebase Cloud Messaging', configure: [ { - label: 'Server key (.json file)', - name: 'serverKey', + label: 'Service account JSON (.json file)', + name: 'serviceAccountJSON', type: 'file', allowedFileExtensions: ['json'], - placeholder: 'Enter server key', + placeholder: 'Enter service account JSON', popover: [ - 'How to get the FCM server key?', + 'How to get the FCM service account JSON?', 'Head to Project settings -> Service accounts -> Generate new private key.', 'Generating the new key will result in the download of a JSON file.' ] diff --git a/src/routes/console/project-[project]/messaging/providers/update.svelte b/src/routes/console/project-[project]/messaging/providers/update.svelte index 42b1dfcfd..4b09e1d06 100644 --- a/src/routes/console/project-[project]/messaging/providers/update.svelte +++ b/src/routes/console/project-[project]/messaging/providers/update.svelte @@ -180,7 +180,7 @@ providerId: providerId, name: $providerParams[$provider].name, enabled: $providerParams[$provider].enabled, - serverKey: $providerParams[$provider].serverKey + serviceAccountJSON: $providerParams[$provider].serviceAccountJSON } ); break; diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte b/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte index 97b7ca2d5..49133c425 100644 --- a/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte +++ b/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte @@ -90,7 +90,7 @@ providerId: id, name: name, enabled: true, - serverKey: '' + serviceAccountJSON: '' }; break; case Providers.APNS: diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/store.ts b/src/routes/console/project-[project]/messaging/providers/wizard/store.ts index 4e8aed06f..52458d7f9 100644 --- a/src/routes/console/project-[project]/messaging/providers/wizard/store.ts +++ b/src/routes/console/project-[project]/messaging/providers/wizard/store.ts @@ -63,7 +63,7 @@ export type SendgridProviderParams = ProviderParams & { */ export type FCMProviderParams = ProviderParams & { - serverKey: string; + serviceAccountJSON: string; }; export type APNSProviderParams = ProviderParams & { From 5820b072ac8269031ecd5e640f963e896d64f5cb Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Sun, 28 Jan 2024 16:50:33 -0800 Subject: [PATCH 02/17] Fix vertical alignment of Targets header --- .../project-[project]/auth/user-[user]/targets/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/auth/user-[user]/targets/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/targets/+page.svelte index 39245fe10..316f0def9 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/targets/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/targets/+page.svelte @@ -23,7 +23,7 @@
-
+
Targets
From c28feb378cbf72e1c6e2cb9e0a1046a0ac925afb Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Sun, 28 Jan 2024 22:25:29 -0600 Subject: [PATCH 03/17] Update the date and time inputs to open on click The default behavior is to open only when clicking the icon, but it may be difficult to click such a small icon. This change updates the input so that the picker opens when the input is clicked. --- src/lib/elements/forms/inputDate.svelte | 3 +++ src/lib/elements/forms/inputTime.svelte | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/elements/forms/inputDate.svelte b/src/lib/elements/forms/inputDate.svelte index 380abe279..f0849b222 100644 --- a/src/lib/elements/forms/inputDate.svelte +++ b/src/lib/elements/forms/inputDate.svelte @@ -75,6 +75,9 @@ bind:value bind:this={element} on:invalid={handleInvalid} + on:click={function () { + this.showPicker(); + }} style:--amount-of-buttons={isNullable ? 2.75 : 1} style:--button-size={isNullable ? '2rem' : '1rem'} /> {#if isNullable} diff --git a/src/lib/elements/forms/inputTime.svelte b/src/lib/elements/forms/inputTime.svelte index bc30b8745..cb224bf18 100644 --- a/src/lib/elements/forms/inputTime.svelte +++ b/src/lib/elements/forms/inputTime.svelte @@ -59,7 +59,10 @@ class="input-text" bind:value bind:this={element} - on:invalid={handleInvalid} /> + on:invalid={handleInvalid} + on:click={function () { + this.showPicker(); + }} />
{#if error} {error} From a98e586b694a730c13cee85bd3c1b5ccae6eb3e8 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Sun, 28 Jan 2024 22:53:00 -0600 Subject: [PATCH 04/17] Reset targets accordion when changing pages This fixes a bug where the accordion would stay open when changing pages. --- .../project-[project]/messaging/userTargetsModal.svelte | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/routes/console/project-[project]/messaging/userTargetsModal.svelte b/src/routes/console/project-[project]/messaging/userTargetsModal.svelte index 842bbae42..5f5559a92 100644 --- a/src/routes/console/project-[project]/messaging/userTargetsModal.svelte +++ b/src/routes/console/project-[project]/messaging/userTargetsModal.svelte @@ -22,10 +22,7 @@ let search = ''; let offset = 0; let totalResults = 0; - let userResultsById: Record< - string, - Models.User> - > = {}; // use a hash map so we can quickly look up a user by id + let userResultsById: Record>> = {}; // use a hash map so we can quickly look up a user by id let selected: Record = {}; let hasSelection = false; @@ -147,7 +144,7 @@ bind:value={search} /> {#if Object.keys(userResultsById).length > 0} - {#each Object.entries(userResultsById) as [userId, user]} + {#each Object.entries(userResultsById) as [userId, user] (userId)} {@const selectedCount = user.targets.filter( (target) => selected[target.$id] ).length} From 49ba6f6c503dbaf04b785091e7bed0b770ec952f Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Sun, 28 Jan 2024 23:16:52 -0600 Subject: [PATCH 05/17] Add tooltip to custom data input --- .../project-[project]/messaging/wizard/pushFormList.svelte | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte index 96472f303..452d20414 100644 --- a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte @@ -163,7 +163,11 @@
- + + +
    {#each customData || [] as _, rowIndex} From 3546e436777d30dda44478cd205786c511da2cae Mon Sep 17 00:00:00 2001 From: wess Date: Tue, 30 Jan 2024 10:13:31 -0500 Subject: [PATCH 06/17] Adds pointer cursor to date/time fields --- src/lib/elements/forms/inputDate.svelte | 1 + src/lib/elements/forms/inputTime.svelte | 1 + .../console/project-[project]/messaging/wizard/step3.svelte | 1 + 3 files changed, 3 insertions(+) diff --git a/src/lib/elements/forms/inputDate.svelte b/src/lib/elements/forms/inputDate.svelte index f0849b222..99ea3482e 100644 --- a/src/lib/elements/forms/inputDate.svelte +++ b/src/lib/elements/forms/inputDate.svelte @@ -71,6 +71,7 @@ {max} autocomplete={autocomplete ? 'on' : 'off'} type="date" + style="cursor: pointer;" class="input-text" bind:value bind:this={element} diff --git a/src/lib/elements/forms/inputTime.svelte b/src/lib/elements/forms/inputTime.svelte index cb224bf18..55322f9ca 100644 --- a/src/lib/elements/forms/inputTime.svelte +++ b/src/lib/elements/forms/inputTime.svelte @@ -57,6 +57,7 @@ autocomplete={autocomplete ? 'on' : 'off'} type="time" class="input-text" + style="cursor: pointer;" bind:value bind:this={element} on:invalid={handleInvalid} diff --git a/src/routes/console/project-[project]/messaging/wizard/step3.svelte b/src/routes/console/project-[project]/messaging/wizard/step3.svelte index d7499bff3..f23390bea 100644 --- a/src/routes/console/project-[project]/messaging/wizard/step3.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/step3.svelte @@ -100,3 +100,4 @@ --> + From 951266d9c25ad9cc19479b6b170198c7414b8ac5 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 1 Feb 2024 16:48:47 +0100 Subject: [PATCH 07/17] fix: storage not loading on selfhosted --- .../project-[project]/storage/bucket-[bucket]/+page.svelte | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte index d02d6dd5c..7c92b8cb7 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte @@ -44,6 +44,7 @@ import { sdk } from '$lib/stores/sdk.js'; import Create from './create-file/create.svelte'; import DeleteFile from './deleteFile.svelte'; + import { isCloud } from '$lib/system'; export let data; @@ -53,7 +54,10 @@ const projectId = $page.params.project; const bucketId = $page.params.bucket; - const usedStorage = bytesToSize(data.organizationUsage.storageTotal, 'GB'); + const usedStorage = + isCloud && data?.organizationUsage?.storageTotal + ? bytesToSize(data.organizationUsage.storageTotal, 'GB') + : null; const getPreview = (fileId: string) => sdk.forProject.storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin'; From 0e9a6841a3c2b1424bd12226c965015ab123e5e2 Mon Sep 17 00:00:00 2001 From: wess Date: Thu, 1 Feb 2024 12:22:27 -0500 Subject: [PATCH 08/17] Updated requested size for file image from 32 to 64 --- .../project-[project]/storage/bucket-[bucket]/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte index 7c92b8cb7..4175ca7ce 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte @@ -59,7 +59,7 @@ ? bytesToSize(data.organizationUsage.storageTotal, 'GB') : null; const getPreview = (fileId: string) => - sdk.forProject.storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin'; + sdk.forProject.storage.getFilePreview(bucketId, fileId, 64, 64).toString() + '&mode=admin'; async function fileDeleted(event: CustomEvent) { showDelete = false; From 94e605de42b0c81f14ef8eab091d91f9e68a6d44 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Fri, 2 Feb 2024 02:49:38 +0000 Subject: [PATCH 09/17] Fix provider and provider type checking --- src/lib/helpers/types.ts | 7 +++++ .../messaging/message-[message]/+page.svelte | 4 +++ .../providers/createProviderDropdown.svelte | 6 +---- .../provider-[provider]/updateStatus.svelte | 26 ++++++++++++------- .../messaging/providers/wizard/store.ts | 7 +++-- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/lib/helpers/types.ts b/src/lib/helpers/types.ts index 35e8214c9..d3107faa1 100644 --- a/src/lib/helpers/types.ts +++ b/src/lib/helpers/types.ts @@ -29,3 +29,10 @@ export type Column = { */ filter?: boolean; }; + +export function isValueOfStringEnum>( + enumType: T, + value: string +): value is T[keyof T] { + return Object.values(enumType).includes(value); +} diff --git a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte b/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte index 3db50213c..c259ee99c 100644 --- a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte +++ b/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte @@ -18,10 +18,14 @@ import { wizard } from '$lib/stores/wizard'; import Wizard from '../wizard.svelte'; import type { PageData } from './$types'; + import { isValueOfStringEnum } from '$lib/helpers/types'; export let data: PageData; async function onEdit() { + if (!isValueOfStringEnum(ProviderTypes, $message.providerType)) { + throw new Error(`Invalid provider type: ${$message.providerType}`); + } $operation = 'update'; $providerType = $message.providerType; $topicsById = {}; diff --git a/src/routes/console/project-[project]/messaging/providers/createProviderDropdown.svelte b/src/routes/console/project-[project]/messaging/providers/createProviderDropdown.svelte index d027d3594..e7918d017 100644 --- a/src/routes/console/project-[project]/messaging/providers/createProviderDropdown.svelte +++ b/src/routes/console/project-[project]/messaging/providers/createProviderDropdown.svelte @@ -7,13 +7,9 @@ import { providerType, provider } from './wizard/store'; import { ProviderTypes } from '../providerType.svelte'; import { Providers } from '../provider.svelte'; + import { isValueOfStringEnum } from '$lib/helpers/types'; export let showCreateDropdown = false; - - const isValueOfStringEnum = >( - enumType: T, - value: string - ): value is T[keyof T] => Object.values(enumType).includes(value); diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte index e6ef74f4e..d4134dc73 100644 --- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte +++ b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte @@ -1,19 +1,20 @@ diff --git a/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte b/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte index 067ea2003..956bdc8de 100644 --- a/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte +++ b/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte @@ -4,7 +4,7 @@ import type { Models } from '@appwrite.io/console'; import PushPhone from '../pushPhone.svelte'; - export let message: Models.Message & { data: Record; }; + export let message: Models.Message & { data: Record }; export let onEdit: () => void = null; diff --git a/src/routes/console/project-[project]/messaging/message-[message]/smsPreview.svelte b/src/routes/console/project-[project]/messaging/message-[message]/smsPreview.svelte index b6458a55c..8e6e772bb 100644 --- a/src/routes/console/project-[project]/messaging/message-[message]/smsPreview.svelte +++ b/src/routes/console/project-[project]/messaging/message-[message]/smsPreview.svelte @@ -4,7 +4,7 @@ import type { Models } from '@appwrite.io/console'; import SMSPhone from '../smsPhone.svelte'; - export let message: Models.Message & { data: Record; }; + export let message: Models.Message & { data: Record }; export let onEdit: () => void = null; diff --git a/src/routes/console/project-[project]/messaging/providerType.svelte b/src/routes/console/project-[project]/messaging/providerType.svelte index 8d70392d9..6d5ed9ebc 100644 --- a/src/routes/console/project-[project]/messaging/providerType.svelte +++ b/src/routes/console/project-[project]/messaging/providerType.svelte @@ -7,7 +7,7 @@
    - diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/updateDescription.svelte b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/updateDescription.svelte deleted file mode 100644 index 137e7944c..000000000 --- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/updateDescription.svelte +++ /dev/null @@ -1,65 +0,0 @@ - - - - - Description - - -
      - -
    -
    - - - - -
    - diff --git a/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte index 50a3d4734..4b17e43e1 100644 --- a/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte @@ -52,7 +52,6 @@ createEmailMessage({ topics: $messageParams[ProviderTypes.Email]?.topics || [], targets: $messageParams[ProviderTypes.Email]?.targets || [], - description: $messageParams[ProviderTypes.Email]?.description || 'Test message', status: MessageStatuses.PROCESSING, messageId: ID.unique(), // TODO: properly handle the test email address @@ -126,13 +125,6 @@ Enable the HTML mode if your message contains HTML tags. - - {#if $operation === 'create'} {#if !showCustomId}
    diff --git a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte index 452d20414..8102bd333 100644 --- a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte @@ -86,7 +86,6 @@ createPushMessage({ topics: $messageParams[ProviderTypes.Push]?.topics || [], targets: $messageParams[ProviderTypes.Push]?.targets || [], - description: $messageParams[ProviderTypes.Push]?.description || 'Test push', status: MessageStatuses.PROCESSING, messageId: ID.unique(), // TODO: properly handle the test email address @@ -224,13 +223,6 @@
    - - {#if $operation === 'create'} {#if !showCustomId}
    diff --git a/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte index 946558e53..fdd60d469 100644 --- a/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte @@ -23,14 +23,7 @@ MessageStatuses, operation } from './store'; - import { - Button, - FormList, - InputEmail, - InputRadio, - InputText, - InputTextarea - } from '$lib/elements/forms'; + import { Button, FormList, InputEmail, InputRadio, InputTextarea } from '$lib/elements/forms'; import { Pill } from '$lib/elements'; import { CustomId, Modal } from '$lib/components'; import { user } from '$lib/stores/user'; @@ -51,7 +44,6 @@ createSMSMessage({ topics: $messageParams[ProviderTypes.Email]?.topics || [], targets: $messageParams[ProviderTypes.Email]?.targets || [], - description: $messageParams[ProviderTypes.Email]?.description || 'Test message', status: MessageStatuses.PROCESSING, messageId: ID.unique(), // TODO: properly handle the test email address @@ -115,13 +107,6 @@
    - - {#if $operation === 'create'} {#if !showCustomId}
    diff --git a/src/routes/console/project-[project]/messaging/wizard/store.ts b/src/routes/console/project-[project]/messaging/wizard/store.ts index 0af938e70..f651df27d 100644 --- a/src/routes/console/project-[project]/messaging/wizard/store.ts +++ b/src/routes/console/project-[project]/messaging/wizard/store.ts @@ -1,6 +1,6 @@ import type { Models } from '@appwrite.io/console'; -import { ProviderTypes } from '../providerType.svelte'; import { writable } from 'svelte/store'; +import { ProviderTypes } from '../providerType.svelte'; export enum MessageStatuses { DRAFT = 'draft', @@ -15,7 +15,6 @@ export type MessageParams = { topics: string[]; users: string[]; targets: string[]; - description: string; status: MessageStatuses; scheduledAt?: string; }; From 3928a6352e6bf54c7a57cc42e4377cbdeb95ab31 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Fri, 2 Feb 2024 17:03:14 +1300 Subject: [PATCH 13/17] Add messaging scopes --- src/lib/constants.ts | 54 ++++++++++++++++++- .../overview/keys/scopes.svelte | 1 + 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 630c393f3..109fa3e94 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -79,12 +79,12 @@ export const scopes: { }, { scope: 'accounts.read', - description: 'Access to read your active acount', + description: 'Access to read your active account', category: 'Auth' }, { scope: 'accounts.write', - description: 'Access to create, update and delete your active acount', + description: 'Access to create, update and delete your active account', category: 'Auth' }, { @@ -190,6 +190,56 @@ export const scopes: { description: "Access to execute your project's functions", category: 'Functions' }, + { + scope: 'targets.read', + description: "Access to read your project's targets", + category: 'Messaging' + }, + { + scope: 'targets.write', + description: "Access to create, update, and delete your project's targets", + category: 'Messaging' + }, + { + scope: 'providers.read', + description: "Access to read your project's messaging providers", + category: 'Messaging' + }, + { + scope: 'providers.write', + description: "Access to create, update, and delete your project's messaging providers", + category: 'Messaging' + }, + { + scope: 'messages.read', + description: "Access to read your project's messages", + category: 'Messaging' + }, + { + scope: 'messages.write', + description: "Access to create, update, and delete your project's messages", + category: 'Messaging' + }, + { + scope: 'topics.read', + description: "Access to read your project's messaging topics", + category: 'Messaging' + }, + { + scope: 'topics.write', + description: "Access to create, update, and delete your project's messaging topics", + category: 'Messaging' + }, + { + scope: 'subscribers.read', + description: "Access to read your project's messaging topic subscribers", + category: 'Messaging' + }, + { + scope: 'subscribers.write', + description: "Access to create, update, and delete your project's messaging topic subscribers", + category: 'Messaging' + } { scope: 'locale.read', description: "Access to access your project's Locale service", diff --git a/src/routes/console/project-[project]/overview/keys/scopes.svelte b/src/routes/console/project-[project]/overview/keys/scopes.svelte index a5ec2115e..dd5d094f7 100644 --- a/src/routes/console/project-[project]/overview/keys/scopes.svelte +++ b/src/routes/console/project-[project]/overview/keys/scopes.svelte @@ -12,6 +12,7 @@ Auth = 'Auth', Database = 'Database', Functions = 'Functions', + Messaging = 'Messaging', Storage = 'Storage', Other = 'Other' } From 8a8e68f1790825102217dfe311cb307b8604fdc1 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Fri, 2 Feb 2024 17:09:17 +1300 Subject: [PATCH 14/17] Fix missing comma --- src/lib/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 109fa3e94..b3b8d7a56 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -239,7 +239,7 @@ export const scopes: { scope: 'subscribers.write', description: "Access to create, update, and delete your project's messaging topic subscribers", category: 'Messaging' - } + }, { scope: 'locale.read', description: "Access to access your project's Locale service", From b756b0ca1a5e84baa4d848bb80a83a51eb8993d5 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Fri, 2 Feb 2024 22:30:30 +1300 Subject: [PATCH 15/17] Update target scope descriptions --- src/lib/constants.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index b3b8d7a56..2bcc60366 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -192,12 +192,12 @@ export const scopes: { }, { scope: 'targets.read', - description: "Access to read your project's targets", + description: "Access to read your project's messaging targets", category: 'Messaging' }, { scope: 'targets.write', - description: "Access to create, update, and delete your project's targets", + description: "Access to create, update, and delete your project's messaging targets", category: 'Messaging' }, { From 2962cadf241d6c7a3d0d20401dc6551082657d11 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 2 Feb 2024 11:24:01 +0100 Subject: [PATCH 16/17] chore: use node 20 in ci --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 16da364f4..890c78c8e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 20 - name: Audit dependencies run: npm audit --audit-level low - name: Install dependencies From d3414aa352553177681045540f5ceb436038aaad Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 2 Feb 2024 12:00:35 +0100 Subject: [PATCH 17/17] chore: fix lint issues --- src/lib/constants.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 2bcc60366..e58e30f82 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -237,7 +237,8 @@ export const scopes: { }, { scope: 'subscribers.write', - description: "Access to create, update, and delete your project's messaging topic subscribers", + description: + "Access to create, update, and delete your project's messaging topic subscribers", category: 'Messaging' }, {