From 8659ba1fc254f839b36a9470062a9caeee275f01 Mon Sep 17 00:00:00 2001
From: gofnnp <fbicha1234@gmail.com>
Date: Sat, 17 Sep 2022 19:46:36 +0400
Subject: [PATCH] dev #12425

---
 src/app/pages/main/main.component.ts  |  1 +
 src/app/services/messaging.service.ts | 27 ++++++++++++++++++++-------
 src/assets/firebase-messaging-sw.js   | 13 -------------
 3 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 src/assets/firebase-messaging-sw.js

diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index 1e4163f..5c2e527 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -64,6 +64,7 @@ export class MainComponent implements OnInit {
   }
 
   requestPermission() {
+    console.log('####: ')
     this.messagingService.requestPermission()
     this.messagingService.receiveMessage()
     this.message = this.messagingService.currentMessage
diff --git a/src/app/services/messaging.service.ts b/src/app/services/messaging.service.ts
index d6d9857..3aef5cf 100644
--- a/src/app/services/messaging.service.ts
+++ b/src/app/services/messaging.service.ts
@@ -52,19 +52,32 @@ export class MessagingService {
   }
 
   requestPermission() {
-    this.angularFireMessaging.requestToken.subscribe({
-      next: (token) => {
-        this.updateToken(token);
-        console.log(token);
-      },
-      error: (e) => console.error(e),
-    });
+    try {
+      console.log('1');
+      
+      this.angularFireMessaging.getToken.subscribe({
+        next: (val) => {
+          console.log('VAL: ', val)
+        }
+      })
+      this.angularFireMessaging.requestToken.subscribe({
+        next: (token) => {
+          console.log('#: ')
+          this.updateToken(token);
+          console.log('####TOKEN: ', token);
+        },
+        error: (e) => console.error(e),
+      });
+    } catch (error) {
+      console.error(error)
+    }
   }
 
   /**
    * hook method when new notification received in foreground
    */
   receiveMessage() {
+    console.log('#REC')
     this.angularFireMessaging.messages.subscribe((payload: any) => {
       console.log('new message received. ', payload);
       this.currentMessage.next(payload);
diff --git a/src/assets/firebase-messaging-sw.js b/src/assets/firebase-messaging-sw.js
deleted file mode 100644
index 9fecb49..0000000
--- a/src/assets/firebase-messaging-sw.js
+++ /dev/null
@@ -1,13 +0,0 @@
-importScripts('https://www.gstatic.com/firebasejs/3.6.8/firebase-app.js');
-importScripts('https://www.gstatic.com/firebasejs/3.6.8/firebase-messaging.js');
-
-firebase.initializeApp({
-    apiKey: "AIzaSyCujHg9GtN8Uxi-JcCN8zggvXlfNQRKc04",
-    authDomain: "push-notification-test2-56dac.firebaseapp.com",
-    projectId: "push-notification-test2-56dac",
-    storageBucket: "push-notification-test2-56dac.appspot.com",
-    messagingSenderId: "1004369687552",
-    appId: "1:1004369687552:web:a6cc20625e05520a37d4e5"
-});
-
-const messaging = firebase.messaging();
\ No newline at end of file