@messenger-box/platform-server 10.0.3-alpha.7 → 10.0.3-alpha.72

package/lib/graphql/resolvers/extended-token-account.js

@@ -1,7 +1,14 @@
-const resolver = () => ({
+const resolver = options => ({
   // UserAccount: {
-  //     async deviceToken(src:IUserAccount, args,{extendedTokenAccountService,userContext}){
-  //        return extendedTokenAccountService.getDeviceToken(src);
+  //     async deviceToken(src: IUserAccount, args, { extendedTokenAccountService, userContext }) {
+  //         options.logger.trace('(UserAccount.deviceToken) src.id [%s]', src.id);
+  //
+  //         // Check if src exists before calling service
+  //         if (!src || !src.id) {
+  //             return null;
+  //         }
+  //
+  //         return extendedTokenAccountService.getDeviceToken(src.id) as any;
   //     },
   // },
   Query: {
@@ -10,9 +17,20 @@ const resolver = () => ({
       userContext,
       accountService
     }) {
-      // const user = await accountService.findAccountById(userContext.accountId);
-      // return extendedTokenAccountService.getDeviceToken(user);
-      return extendedTokenAccountService.getDeviceToken(userContext.accountId);
+      options.logger.trace('(Query.getDeviceToken) userContext.accountId [%s]', userContext?.accountId);
+      try {
+        if (!userContext?.accountId) {
+          options.logger.warn('Missing accountId in user context');
+          return null;
+        }
+        // const user = await accountService.findAccountById(userContext.accountId);
+        // return extendedTokenAccountService.getDeviceToken(user);
+        const result = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
+        return result;
+      } catch (error) {
+        options.logger.error('Error getting device token: %o', error);
+        return null;
+      }
     },
     async getAccountByAuth0Id(_, {
       auth0Id
@@ -21,9 +39,20 @@ const resolver = () => ({
       userContext,
       accountService
     }) {
-      // const user = await accountService.findAccountById(userContext.accountId);
-      // return extendedTokenAccountService.getDeviceToken(user);
-      return extendedTokenAccountService.getAccountByAuth0Id(auth0Id);
+      options.logger.trace('(Query.getAccountByAuth0Id) auth0Id [%s]', auth0Id);
+      try {
+        if (!auth0Id) {
+          options.logger.warn('Missing auth0Id parameter');
+          return null;
+        }
+        // const user = await accountService.findAccountById(userContext.accountId);
+        // return extendedTokenAccountService.getDeviceToken(user);
+        const result = await extendedTokenAccountService.getAccountByAuth0Id(auth0Id);
+        return result;
+      } catch (error) {
+        options.logger.error('Error getting account by Auth0 ID: %o', error);
+        return null;
+      }
     }
   },
   Mutation: {
@@ -34,27 +63,65 @@ const resolver = () => ({
       userContext,
       accountService
     }) {
-      const user = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
-      const expoTokens = user?.tokens?.filter(t => t?.type === 'EXPO_NOTIFICATION_TOKEN' && t?.token != deviceToken);
-      if (expoTokens && expoTokens?.length > 0) {
-        expoTokens.forEach(async t => {
-          await extendedTokenAccountService.removeDeviceToken(t?.token, userContext.accountId);
-        });
-      }
-      const checkUserToken = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
-      let expoNotificationToken = checkUserToken?.tokens?.filter(t => t?.type === 'EXPO_NOTIFICATION_TOKEN' && t?.token == deviceToken);
-      if (expoNotificationToken && expoNotificationToken?.length > 0) return checkUserToken;else {
-        await extendedTokenAccountService.setDeviceToken(deviceToken, userContext.accountId);
-        return extendedTokenAccountService.getDeviceToken(userContext.accountId);
+      options.logger.trace('(Mutation.setDeviceToken) deviceToken [%s], accountId [%s]', deviceToken ? '***' : 'null', userContext?.accountId);
+      try {
+        if (!deviceToken) {
+          options.logger.warn('Missing deviceToken parameter');
+          throw new Error('Device token is required');
+        }
+        if (!userContext?.accountId) {
+          options.logger.warn('Missing accountId in user context');
+          throw new Error('User not authenticated');
+        }
+        const user = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
+        // Filter out existing EXPO_NOTIFICATION_TOKEN that are different from the new one
+        const expoTokens = user?.tokens?.filter(t => t?.type === 'EXPO_NOTIFICATION_TOKEN' && t?.token != deviceToken);
+        // Remove existing different expo tokens
+        if (expoTokens && expoTokens?.length > 0) {
+          options.logger.debug('Removing %d existing expo tokens', expoTokens.length);
+          for (const t of expoTokens) {
+            await extendedTokenAccountService.removeDeviceToken(t?.token, userContext.accountId);
+          }
+        }
+        // Check if the token already exists
+        const checkUserToken = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
+        let expoNotificationToken = checkUserToken?.tokens?.filter(t => t?.type === 'EXPO_NOTIFICATION_TOKEN' && t?.token == deviceToken);
+        if (expoNotificationToken && expoNotificationToken?.length > 0) {
+          options.logger.debug('Device token already exists for user');
+          return checkUserToken;
+        } else {
+          options.logger.debug('Adding new device token for user');
+          await extendedTokenAccountService.setDeviceToken(deviceToken, userContext.accountId);
+          const result = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
+          return result;
+        }
+      } catch (error) {
+        options.logger.error('Error setting device token: %o', error);
+        throw error;
       }
     },
-    removeDeviceToken(_, {
+    async removeDeviceToken(_, {
       deviceToken
     }, {
       extendedTokenAccountService,
       userContext
     }) {
-      return extendedTokenAccountService.removeDeviceToken(deviceToken, userContext.accountId);
+      options.logger.trace('(Mutation.removeDeviceToken) deviceToken [%s], accountId [%s]', deviceToken ? '***' : 'null', userContext?.accountId);
+      try {
+        if (!deviceToken) {
+          options.logger.warn('Missing deviceToken parameter');
+          throw new Error('Device token is required');
+        }
+        if (!userContext?.accountId) {
+          options.logger.warn('Missing accountId in user context');
+          throw new Error('User not authenticated');
+        }
+        const result = await extendedTokenAccountService.removeDeviceToken(deviceToken, userContext.accountId);
+        return result;
+      } catch (error) {
+        options.logger.error('Error removing device token: %o', error);
+        throw error;
+      }
     }
   }
 });export{resolver};//# sourceMappingURL=extended-token-account.js.map

package/lib/graphql/resolvers/extended-token-account.js.map

@@ -1 +1 @@
-{"version":3,"file":"extended-token-account.js","sources":["../../../src/graphql/resolvers/extended-token-account.ts"],"sourcesContent":[null],"names":[],"mappings":"AAEa,MAAA,QAAQ,GAAG,OAAmB;;;;;;AAMvC,EAAA,KAAA,EAAK;AACD,IAAA,MAAA,cAAM,CAAA,GAAc,EAAC,IAAmB,EAAA;iCACwC;iBACjB;;;AAG/D;;aAE+D,2BAAA,CAAA,cAAA,CAAA,WAAA,CAAA,SAAA,CAAA;AAC3D,KAAA;UACH,mBAAA,CAAA,CAAA,EAAA;AACJ,MAAA;AACD,KAAA,EAAA;AACI,MAAA,2BAA0B;iBAChB;;;AAKF;AACI;AACJ,MAAA,OAAA,2BAAG,CAAA,mBAAA,CAAA,OAAA,CAAA;;;YAGP;AAGA,IAAA,MAAA;AAAgE,MAAA;;iCAEtD;iBACC;;;YAGE,IAAA,GAAA,MAAA,2BAAuB,CAAA,cAAA,CAAA,WAA6B,CAAA,SAAa,CAAA;YAC9E,UAAO,GAAA,IAAA,EAAA,MAAA,EAAA,MAAA,CAA2B,CAAC,IAAA,CAAA,EAAA,IAAA,KAAA,yBAA0C,IAAU,CAAA,EAAA,KAAC,IAAC,WAAA,CAAA;UAC5F,UAAA,IAAA,UAAA,EAAA,MAAA,GAAA,CAAA,EAAA;AACJ,QAAA,UAAA,CAAA,OAAA,CAAA,MAAA,CAAA,IAAA;AACJ,UAAE,MAAA,2BAAA,CAAA,iBAAA,CAAA,CAAA,EAAA,KAAA,EAAA,WAAA,CAAA,SAAA,CAAA;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"extended-token-account.js","sources":["../../../src/graphql/resolvers/extended-token-account.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/graphql/resolvers/index.d.ts

@@ -1 +1 @@
-export declare const messengerResolvers: (((options: import("@common-stack/server-core").IResolverOptions) => import("common").IResolvers<import("../..").IContext>) | ((options: import("@common-stack/server-core").IResolverOptions) => import("common").IResolvers))[];
+export declare const messengerResolvers: ((options: import("@common-stack/server-core").IResolverOptions) => import("common").IResolvers)[];

package/lib/graphql/resolvers/post-thread.d.ts

@@ -1,3 +1,3 @@
-import { IResolvers } from 'common';
+import { IResolvers } from 'common/server';
 import { IResolverOptions } from '@common-stack/server-core';
 export declare const postThreadResolvers: (options: IResolverOptions) => IResolvers;