From 699db43b3987072462fb4fba8589b76933a671ca Mon Sep 17 00:00:00 2001 From: gofnnp Date: Wed, 8 Mar 2023 01:11:58 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#13882=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- angular/src/app/services/messaging.service.ts | 12 ++++++++---- angular/src/firebase-messaging-sw.js | 7 ++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/angular/src/app/services/messaging.service.ts b/angular/src/app/services/messaging.service.ts index 0e905b9..33db477 100644 --- a/angular/src/app/services/messaging.service.ts +++ b/angular/src/app/services/messaging.service.ts @@ -84,11 +84,15 @@ export class MessagingService { receiveMessage() { this.angularFireMessaging.messages.subscribe((payload: any) => { console.log('new message received. ', payload); + const NotificationOptions = { + body: payload.notification.body, + data: payload.data, + icon: payload.notification.icon + } + navigator.serviceWorker.getRegistration('/firebase-cloud-messaging-push-scope').then((registration: any) => { + registration.showNotification(payload.notification.title, NotificationOptions); + }); this.currentMessage.next(payload); }); - this.angularFireMessaging.onMessage((res) => { - console.log('@@@@: ', res); - - }) } } diff --git a/angular/src/firebase-messaging-sw.js b/angular/src/firebase-messaging-sw.js index 3468516..7277699 100644 --- a/angular/src/firebase-messaging-sw.js +++ b/angular/src/firebase-messaging-sw.js @@ -11,4 +11,9 @@ firebase.initializeApp({ measurementId: "G-RQF97ZK7R1" }); -const messaging = firebase.messaging(); \ No newline at end of file +const messaging = firebase.messaging(); + +self.addEventListener('notificationclick', function(event) { + event.notification.close(); + event.waitUntil(self.clients.openWindow(event.notification.data.url)); +}); \ No newline at end of file