From 9877ecaed235e18e2a39fffbd954940b1b80952e Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Wed, 24 Jan 2024 15:46:59 +1300
Subject: [PATCH] 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 5cae6700ce..b619c04ec7 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 1349d56328..d6a703e2e2 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 68e518b744..d14286d6ee 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: [
-                            '<b>How to get the FCM server key?</b>',
+                            '<b>How to get the FCM service account JSON?</b>',
                             'Head to <b>Project settings -> Service accounts -> Generate new private key.</b>',
                             '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 42b1dfcfd5..4b09e1d063 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 97b7ca2d54..49133c4258 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 4e8aed06f7..52458d7f97 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 & {