Merge branch 'master' of https://git.hlcompany.ru/git/usersite

# Conflicts:
#	src/app/pages/main/main.component.ts

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);

src/assets/firebase-messaging-sw.js

@@ -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();