refactor: cleanup custom logic

Signed-off-by: Sai Ranjit Tummalapalli <[email protected]>

.env.example

@@ -5,4 +5,7 @@ POSTGRES_ADMIN_USER=
 POSTGRES_ADMIN_PASSWORD=
 
 USE_PUSH_NOTIFICATIONS='true'
-NOTIFICATION_WEBHOOK_URL=
+NOTIFICATION_WEBHOOK_URL=
+
+# We need NGROK Auth token in development and you can get one from here https://dashboard.ngrok.com/get-started/your-authtoken
+NGROK_AUTH_TOKEN=

dev.ts

@@ -12,6 +12,7 @@ const port = 3000
 // TODO: have to add auth token now to use ngrok check this later
 void connect({
   port,
+  authtoken: '2TkNMfvaGeeU7o4xNy8aBGPWQOg_kFxWtNs8DsZowhFYfETY',
 }).then((app) => {
   // eslint-disable-next-line no-console
   console.log('Got ngrok url:', app.url())

package.json

@@ -29,10 +29,10 @@
     "postinstall": "npx patch-package"
   },
   "dependencies": {
-    "@credo-ts/askar": "0.5.6",
-    "@credo-ts/core": "0.5.6",
-    "@credo-ts/node": "0.5.6",
-    "@hyperledger/aries-askar-nodejs": "0.2.1",
+    "@credo-ts/askar": "^0.5.0",
+    "@credo-ts/core": "^0.5.0",
+    "@credo-ts/node": "^0.5.0",
+    "@hyperledger/aries-askar-nodejs": "^0.2.0",
     "dotenv": "^16.0.1",
     "express": "^4.18.1",
     "prettier": "^2.8.4",

src/agent.ts

@@ -1,11 +1,9 @@
 import { AskarModule, AskarMultiWalletDatabaseScheme } from '@credo-ts/askar'
 import {
   Agent,
-  CacheModule,
   ConnectionsModule,
   DidCommMimeType,
   HttpOutboundTransport,
-  InMemoryLruCache,
   MediatorModule,
   OutOfBandRole,
   OutOfBandState,

src/push-notifications/fcm/messages/PushNotificationsFcmSetDeviceInfoMessage.ts

@@ -21,7 +21,6 @@ export class PushNotificationsFcmSetDeviceInfoMessage extends AgentMessage {
       this.id = options.id ?? this.generateId()
       this.deviceToken = options.deviceToken
       this.devicePlatform = options.devicePlatform
-      this.clientCode = options.clientCode
     }
   }
 
@@ -35,11 +34,6 @@ export class PushNotificationsFcmSetDeviceInfoMessage extends AgentMessage {
   @ValidateIf((object, value) => value !== null)
   public devicePlatform!: string | null
 
-  @Expose({ name: 'client_code' })
-  @IsString()
-  @ValidateIf((object, value) => value !== null)
-  public clientCode!: string | null
-
   @IsValidMessageType(PushNotificationsFcmSetDeviceInfoMessage.type)
   public readonly type = PushNotificationsFcmSetDeviceInfoMessage.type.messageTypeUri
   public static readonly type = parseMessageType('https://didcomm.org/push-notifications-fcm/1.0/set-device-info')

src/push-notifications/fcm/models/FcmDeviceInfo.ts

@@ -1,5 +1,4 @@
 export type FcmDeviceInfo = {
   deviceToken: string | null
   devicePlatform: string | null
-  clientCode: string | null
 }

src/push-notifications/fcm/repository/PushNotificationsFcmRecord.ts

@@ -12,7 +12,6 @@ export interface PushNotificationsFcmStorageProps {
   id?: string
   deviceToken: string | null
   devicePlatform: string | null
-  clientCode: string | null
   connectionId: string
   tags?: CustomPushNotificationsFcmTags
 }
@@ -24,7 +23,6 @@ export class PushNotificationsFcmRecord extends BaseRecord<
   public deviceToken!: string | null
   public devicePlatform!: string | null
   public connectionId!: string
-  public clientCode!: string | null
 
   public static readonly type = 'PushNotificationsFcmRecord'
   public readonly type = PushNotificationsFcmRecord.type
@@ -38,7 +36,6 @@ export class PushNotificationsFcmRecord extends BaseRecord<
       this.deviceToken = props.deviceToken
       this.connectionId = props.connectionId
       this._tags = props.tags ?? {}
-      this.clientCode = props.clientCode
     }
   }
 

src/push-notifications/fcm/services/PushNotificationsFcmService.ts

@@ -35,7 +35,6 @@ export class PushNotificationsFcmService {
       threadId,
       deviceToken: deviceInfo.deviceToken,
       devicePlatform: deviceInfo.devicePlatform,
-      clientCode: deviceInfo.clientCode,
     })
   }
 
@@ -74,7 +73,6 @@ export class PushNotificationsFcmService {
         connectionId: connection.id,
         deviceToken: message.deviceToken,
         devicePlatform: message.devicePlatform,
-        clientCode: message.clientCode,
       })
 
       await this.pushNotificationsFcmRepository.save(agentContext, pushNotificationsFcmRecord)

src/storage/StorageMessageQueue.ts

@@ -18,23 +18,16 @@ import fetch from 'node-fetch'
 export interface NotificationMessage {
   messageType: string
   token: string
-  clientCode: string
 }
 
 @injectable()
 export class StorageServiceMessageQueue implements MessagePickupRepository {
   private messageRepository: MessageRepository
   private agentContext: AgentContext
-  private pushNotificationsFcmRepository: PushNotificationsFcmRepository
 
-  public constructor(
-    messageRepository: MessageRepository,
-    agentContext: AgentContext,
-    pushNotificationsFcmRepository: PushNotificationsFcmRepository
-  ) {
+  public constructor(messageRepository: MessageRepository, agentContext: AgentContext) {
     this.messageRepository = messageRepository
     this.agentContext = agentContext
-    this.pushNotificationsFcmRepository = pushNotificationsFcmRepository
   }
 
   public async getAvailableMessageCount(options: GetAvailableMessageCountOptions) {
@@ -114,8 +107,10 @@ export class StorageServiceMessageQueue implements MessagePickupRepository {
 
   private async sendNotification(agentContext: AgentContext, connectionId: string, messageType?: string) {
     try {
+      const pushNotificationsFcmRepository = agentContext.dependencyManager.resolve(PushNotificationsFcmRepository)
+
       // Get the device token for the connection
-      const pushNotificationFcmRecord = await this.pushNotificationsFcmRepository.findSingleByQuery(agentContext, {
+      const pushNotificationFcmRecord = await pushNotificationsFcmRepository.findSingleByQuery(agentContext, {
         connectionId,
       })
 
@@ -127,8 +122,7 @@ export class StorageServiceMessageQueue implements MessagePickupRepository {
       // Prepare a message to be sent to the device
       const message: NotificationMessage = {
         messageType: messageType || 'default',
-        token: pushNotificationFcmRecord?.deviceToken || '',
-        clientCode: pushNotificationFcmRecord?.clientCode || '',
+        token: pushNotificationFcmRecord?.deviceToken,
       }
 
       this.agentContext.config.logger.info(`Sending notification to ${pushNotificationFcmRecord?.connectionId}`)
@@ -144,9 +138,8 @@ export class StorageServiceMessageQueue implements MessagePickupRepository {
   private async processNotification(message: NotificationMessage) {
     try {
       const body = {
-        fcmToken: message.token || 'abc',
+        fcmToken: message.token,
         messageType: message.messageType,
-        clientCode: message.clientCode || '5b4d6bc6-362e-4f53-bdad-ee2742bc0de3',
       }
       const requestOptions = {
         method: 'POST',