Поправил сохранения токенов для пушей
This commit is contained in:
gofnnp 2022-09-30 13:02:57 +04:00
parent 2ca121cbac
commit 4414480d6e
2 changed files with 19 additions and 5 deletions

View File

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { AngularFireMessaging } from '@angular/fire/compat/messaging'; import { AngularFireMessaging } from '@angular/fire/compat/messaging';
import { MessageService } from 'primeng/api'; import { MessageService } from 'primeng/api';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject, lastValueFrom } from 'rxjs';
import { JsonrpcService, RpcService } from './jsonrpc.service'; import { JsonrpcService, RpcService } from './jsonrpc.service';
@Injectable() @Injectable()
@ -19,15 +19,29 @@ export class MessagingService {
}); });
} }
updateToken(token: string | null) { async updateToken(token: string | null) {
if (!token) return; 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 this.jsonRpcService
.rpc( .rpc(
{ {
method: 'updateAdditionalInfo', method: 'updateAdditionalInfo',
params: [ params: [
{ {
'fmc-token': token, 'fmc-token': tokens,
}, },
], ],
}, },

View File

@ -1,5 +1,5 @@
importScripts('https://www.gstatic.com/firebasejs/7.4.1/firebase-app.js'); importScripts('https://www.gstatic.com/firebasejs/3.6.9/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-messaging.js');
firebase.initializeApp({ firebase.initializeApp({
apiKey: "AIzaSyCnKvln5itnrBj62POCPHxshAN_Vmd0zds", apiKey: "AIzaSyCnKvln5itnrBj62POCPHxshAN_Vmd0zds",