From f8b87ab71d7c252a3a7ae3c5d96d09d73b349f28 Mon Sep 17 00:00:00 2001
From: Eero Ruohola <eero@skoleapp.com>
Date: Sun, 11 Apr 2021 17:39:18 +0300
Subject: [PATCH] Add support for having multiple registered FCM devices for a
 user

---
 __generated__/src/graphql/common.graphql.tsx | 8 ++++----
 cypress/fixtures/userMe.json                 | 2 +-
 src/context/auth.tsx                         | 6 +++---
 src/graphql/common.graphql                   | 2 +-
 src/graphql/common.graphql.d.ts              | 6 +++---
 src/hocs/withUserMe.tsx                      | 6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/__generated__/src/graphql/common.graphql.tsx b/__generated__/src/graphql/common.graphql.tsx
index ab14998bb..3b608d628 100644
--- a/__generated__/src/graphql/common.graphql.tsx
+++ b/__generated__/src/graphql/common.graphql.tsx
@@ -1,4 +1,4 @@
-/* da882a947048069baa3b360345f35376f463fd53
+/* 27e6bf64aeb0aeadb9f56a1015f354733dfd6b81
  * This file is automatically generated by graphql-let. */
 
 import { gql } from '@apollo/client';
@@ -237,7 +237,7 @@ export type UserObjectType = {
   rank?: Maybe<Scalars['String']>;
   badges?: Maybe<Array<Maybe<BadgeObjectType>>>;
   unreadActivityCount?: Maybe<Scalars['Int']>;
-  fcmToken?: Maybe<Scalars['String']>;
+  fcmTokens?: Maybe<Array<Scalars['String']>>;
 };
 
 /**
@@ -1462,7 +1462,7 @@ export type BadgeProgressFieldsFragment = (
 
 export type UserFieldsFragment = (
   { __typename?: 'UserObjectType' }
-  & Pick<UserObjectType, 'id' | 'slug' | 'username' | 'email' | 'backupEmail' | 'title' | 'bio' | 'avatar' | 'avatarThumbnail' | 'score' | 'rank' | 'verified' | 'verifiedBackupEmail' | 'unreadActivityCount' | 'threadCount' | 'commentCount' | 'created' | 'modified' | 'fcmToken' | 'commentReplyEmailPermission' | 'threadCommentEmailPermission' | 'newBadgeEmailPermission' | 'commentReplyPushPermission' | 'threadCommentPushPermission' | 'newBadgePushPermission'>
+  & Pick<UserObjectType, 'id' | 'slug' | 'username' | 'email' | 'backupEmail' | 'title' | 'bio' | 'avatar' | 'avatarThumbnail' | 'score' | 'rank' | 'verified' | 'verifiedBackupEmail' | 'unreadActivityCount' | 'threadCount' | 'commentCount' | 'created' | 'modified' | 'fcmTokens' | 'commentReplyEmailPermission' | 'threadCommentEmailPermission' | 'newBadgeEmailPermission' | 'commentReplyPushPermission' | 'threadCommentPushPermission' | 'newBadgePushPermission'>
   & { badges?: Maybe<Array<Maybe<(
     { __typename?: 'BadgeObjectType' }
     & BadgeFieldsFragment
@@ -2013,7 +2013,7 @@ export const UserFieldsFragmentDoc = gql`
   commentCount
   created
   modified
-  fcmToken
+  fcmTokens
   commentReplyEmailPermission
   threadCommentEmailPermission
   newBadgeEmailPermission
diff --git a/cypress/fixtures/userMe.json b/cypress/fixtures/userMe.json
index 58ea37146..43e4a1428 100644
--- a/cypress/fixtures/userMe.json
+++ b/cypress/fixtures/userMe.json
@@ -13,7 +13,7 @@
       "created": "2020-01-01T12:00:00+00:00",
       "verified": true,
       "unreadActivityCount": 3,
-      "fcmToken": null,
+      "fcmTokens": [],
       "rank": "Freshman",
       "commentReplyEmailPermission": false,
       "threadCommentEmailPermission": false,
diff --git a/src/context/auth.tsx b/src/context/auth.tsx
index 36becb287..4957f3c84 100644
--- 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
index 651bc899a..274c60a03 100644
--- 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
index 4c870f5d4..3cb6121ad 100644
--- a/src/graphql/common.graphql.d.ts
+++ b/src/graphql/common.graphql.d.ts
@@ -1,4 +1,4 @@
-/* da882a947048069baa3b360345f35376f463fd53
+/* 27e6bf64aeb0aeadb9f56a1015f354733dfd6b81
  * This file is automatically generated by graphql-let. */
 
 import * as Apollo from '@apollo/client';
@@ -226,7 +226,7 @@ export declare type UserObjectType = {
     rank?: Maybe<Scalars['String']>;
     badges?: Maybe<Array<Maybe<BadgeObjectType>>>;
     unreadActivityCount?: Maybe<Scalars['Int']>;
-    fcmToken?: Maybe<Scalars['String']>;
+    fcmTokens?: Maybe<Array<Scalars['String']>>;
 };
 /**
  * Models the progress of a user's single badge.
@@ -1296,7 +1296,7 @@ export declare type BadgeProgressFieldsFragment = ({
 });
 export declare type UserFieldsFragment = ({
     __typename?: 'UserObjectType';
-} & Pick<UserObjectType, 'id' | 'slug' | 'username' | 'email' | 'backupEmail' | 'title' | 'bio' | 'avatar' | 'avatarThumbnail' | 'score' | 'rank' | 'verified' | 'verifiedBackupEmail' | 'unreadActivityCount' | 'threadCount' | 'commentCount' | 'created' | 'modified' | 'fcmToken' | 'commentReplyEmailPermission' | 'threadCommentEmailPermission' | 'newBadgeEmailPermission' | 'commentReplyPushPermission' | 'threadCommentPushPermission' | 'newBadgePushPermission'> & {
+} & Pick<UserObjectType, 'id' | 'slug' | 'username' | 'email' | 'backupEmail' | 'title' | 'bio' | 'avatar' | 'avatarThumbnail' | 'score' | 'rank' | 'verified' | 'verifiedBackupEmail' | 'unreadActivityCount' | 'threadCount' | 'commentCount' | 'created' | 'modified' | 'fcmTokens' | 'commentReplyEmailPermission' | 'threadCommentEmailPermission' | 'newBadgeEmailPermission' | 'commentReplyPushPermission' | 'threadCommentPushPermission' | 'newBadgePushPermission'> & {
     badges?: Maybe<Array<Maybe<({
         __typename?: 'BadgeObjectType';
     } & BadgeFieldsFragment)>>>;
diff --git a/src/hocs/withUserMe.tsx b/src/hocs/withUserMe.tsx
index e44f24a61..3718f1f18 100644
--- 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(() => {