Merge pull request #440 from skoleapp/multiple-fcm-devices

skoleapp · Apr 11, 2021 · 77ca90e · 77ca90e
2 parents daac4c8 + f8b87ab
commit 77ca90e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/__generated__/src/graphql/common.graphql.tsx b/__generated__/src/graphql/common.graphql.tsx
diff --git a/cypress/fixtures/userMe.json b/cypress/fixtures/userMe.json
diff --git a/src/context/auth.tsx b/src/context/auth.tsx
@@ -17,7 +17,7 @@ interface UseAuthContext extends AuthContextType {
   verified: boolean | null;
   verifiedBackupEmail: boolean;
   unreadActivityCount: number;
-  fcmToken: string;
+  fcmTokens: string[];
   username: string;
   email: string;
   backupEmail: string;
@@ -47,7 +47,7 @@ export const useAuthContext = (): UseAuthContext => {
   const unreadActivityCount = R.propOr(0, 'unreadActivityCount', userMe);
   const id = R.prop('id', userMe);
   const slug = R.prop('slug', userMe);
-  const fcmToken = R.prop('fcmToken', userMe);
+  const fcmTokens = R.prop('fcmTokens', userMe);
   const username = R.prop('username', userMe);
   const email = R.prop('email', userMe);
   const backupEmail = R.prop('backupEmail', userMe);
@@ -77,7 +77,7 @@ export const useAuthContext = (): UseAuthContext => {
     verified,
     verifiedBackupEmail,
     unreadActivityCount,
-    fcmToken,
+    fcmTokens,
     username,
     email,
     backupEmail,

diff --git a/src/graphql/common.graphql b/src/graphql/common.graphql
@@ -264,7 +264,7 @@ fragment userFields on UserObjectType {
   commentCount
   created
   modified
-  fcmToken
+  fcmTokens
   commentReplyEmailPermission
   threadCommentEmailPermission
   newBadgeEmailPermission

diff --git a/src/graphql/common.graphql.d.ts b/src/graphql/common.graphql.d.ts
diff --git a/src/hocs/withUserMe.tsx b/src/hocs/withUserMe.tsx
@@ -14,7 +14,7 @@ export const withUserMe = <T extends Record<string, unknown>>(
 ): NextPage<T> => {
   const WithUserMe: NextPage<T> = (pageProps: T) => {
     const { authLoading, authNetworkError } = useUserMe();
-    const { fcmToken } = useAuthContext();
+    const { fcmTokens } = useAuthContext();
     const context = useLanguageHeaderContext();
     const [registerFcmToken] = useRegisterFcmTokenMutation({ context });
     const [markSingleActivityRead] = useMarkActivityAsReadMutation({ context });
@@ -35,7 +35,7 @@ export const withUserMe = <T extends Record<string, unknown>>(
           case 'REGISTER_FCM_TOKEN': {
             const { token } = json;
 
-            if (token !== fcmToken) {
+            if (!!fcmTokens && !fcmTokens.includes(token)) {
               await registerFcmToken({ variables: { token } });
             }
 
@@ -77,7 +77,7 @@ export const withUserMe = <T extends Record<string, unknown>>(
           }
         }
       },
-      [fcmToken, registerFcmToken, markSingleActivityRead],
+      [fcmTokens, registerFcmToken, markSingleActivityRead],
     );
 
     useEffect(() => {