From 4414480d6ee31f7bc23c1efc362823859776024c Mon Sep 17 00:00:00 2001
From: gofnnp <fbicha1234@gmail.com>
Date: Fri, 30 Sep 2022 13:02:57 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#12425=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=82=D0=BE=D0=BA=D0=B5=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=83=D1=88=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/services/messaging.service.ts | 20 +++++++++++++++++---
 src/firebase-messaging-sw.js          |  4 ++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/app/services/messaging.service.ts b/src/app/services/messaging.service.ts
index 6c5edea..bd6f9b9 100644
--- a/src/app/services/messaging.service.ts
+++ b/src/app/services/messaging.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { AngularFireMessaging } from '@angular/fire/compat/messaging';
 import { MessageService } from 'primeng/api';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, lastValueFrom } from 'rxjs';
 import { JsonrpcService, RpcService } from './jsonrpc.service';
 
 @Injectable()
@@ -19,15 +19,29 @@ export class MessagingService {
     });
   }
 
-  updateToken(token: string | null) {
+  async updateToken(token: string | null) {
     if (!token) return;
+    const additionalInfo = (await lastValueFrom(
+      this.jsonRpcService.rpc({
+        method: 'getAdditionalInfo',
+        params: []
+      }, RpcService.authService, true)
+      )).data
+      let tokens: string[] = []
+      if (typeof additionalInfo['fmc-token'] === 'string') {
+        tokens.push(additionalInfo['fmc-token'], token)
+      } else if (typeof additionalInfo['fmc-token'] === 'object') {
+        tokens = [...additionalInfo['fmc-token'], token]
+      } else {
+        tokens = [token]
+      }
     this.jsonRpcService
       .rpc(
         {
           method: 'updateAdditionalInfo',
           params: [
             {
-              'fmc-token': token,
+              'fmc-token': tokens,
             },
           ],
         },
diff --git a/src/firebase-messaging-sw.js b/src/firebase-messaging-sw.js
index 29cfaf4..3468516 100644
--- a/src/firebase-messaging-sw.js
+++ b/src/firebase-messaging-sw.js
@@ -1,5 +1,5 @@
-importScripts('https://www.gstatic.com/firebasejs/7.4.1/firebase-app.js');
-importScripts('https://www.gstatic.com/firebasejs/7.4.1/firebase-messaging.js');
+importScripts('https://www.gstatic.com/firebasejs/3.6.9/firebase-app.js');
+importScripts('https://www.gstatic.com/firebasejs/3.6.9/firebase-messaging.js');
 
 firebase.initializeApp({
     apiKey: "AIzaSyCnKvln5itnrBj62POCPHxshAN_Vmd0zds",