@progressive-development/pd-spa-helper 0.3.44 → 0.3.46

package/package.json

@@ -3,7 +3,7 @@
   "description": "Webcomponent pd-spa-helper following open-wc recommendations",
   "license": "MIT",
   "author": "pd-spa-helper",
-  "version": "0.3.44",
+  "version": "0.3.46",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
   "exports": {

package/src/PdSpaHelper.ts

@@ -4,8 +4,6 @@ import { property } from 'lit/decorators.js';
 
 import { Subscription } from 'rxjs';
 
-import { FirebaseApp } from 'firebase/app';
-
 import '@progressive-development/pd-page/pd-menu.js';
 import '@progressive-development/pd-page/pd-footer.js';
 
@@ -44,7 +42,6 @@ const TOAST_DURATION = 6000;
 /**
  * Transformed routes, generated during startInit.
  */
-let app:FirebaseApp | undefined;
 let transformedRoutes:Array<any>;
 let navigationConfig:NavigationConfig;
 

package/src/service-provider/firebase/messagingFirebaseClient.ts

@@ -1,57 +1,42 @@
 import { FirebaseApp } from "firebase/app";
-import { getMessaging, getToken, Messaging, onMessage } from "firebase/messaging";
+import { getMessaging, getToken } from "firebase/messaging";
 
 import { MessagingConfig } from "../service-provider-model.js";
 
-let messagingRef: Messaging;
+import { pdStore } from "../../store/mini-rx.store.js";
+import { updateNewNotificationToken } from "../../store/spa-app-actions.js";
 
-function requestPermission() {
-  console.log('Requesting permission...');
-  Notification.requestPermission().then((permission) => {
-    if (permission === 'granted') {
-      console.log('Notification permission granted.');
-    }
-  })
+export const NOTIFICATION_TOKEN = "pd.spa.helper.notification.token";
+
+// Funktion zur Anfrage der Berechtigung
+async function ensureNotificationPermission(): Promise<"default" | "denied" | "granted"> {
+  if (Notification.permission === "default") {
+    return Notification.requestPermission();
+  }
+  return Notification.permission;
 }
 
-/**
- * During start/load application, initialize Messaging.
- *
- * @param {*} app - initialized app.
- */
-export const initFirebaseMessaging = (
+export async function registerDevice(
   app: FirebaseApp,
   messageConfig: MessagingConfig
-) => {
-
-  messagingRef = getMessaging(app);
-
-  // Add the public key generated from the console here.
-  getToken(messagingRef, 
-    {
-      vapidKey: messageConfig.apidKey
-    }
-  ).then((currentToken) => {
-    if (currentToken) {
-
-      // Send the token to your server and update the UI if necessary
-      // ...
-      console.log("My current Token")
-
+) {
+  try {
+    const messaging = getMessaging(app);
+    const permission = await ensureNotificationPermission();
+    if (permission === "granted") {
+      const currentToken = await getToken(messaging, { vapidKey: messageConfig.apidKey });
+      const storedToken = localStorage.getItem(NOTIFICATION_TOKEN);
+      if (currentToken && storedToken !== currentToken) {
+        pdStore().dispatch(updateNewNotificationToken({
+          messagingToken: currentToken
+        }));
+      } else {
+        console.warn("No token received - no new token was generated.");
+      }
     } else {
-      // Show permission request UI
-      console.log('No registration token available. Request permission to generate one.');
-      requestPermission();
+      console.warn("Notifications were either not allowed or permanently denied.");
     }
-  }).catch((err) => {
-    console.log('An error occurred while retrieving token. ', err);
-    // ...
-  });
-
-  // TODO: Invalid if above code not successfully => refcator avoid call without permissions
-  onMessage(messagingRef, (payload) => {
-    console.log('Message received. ', payload);
-    // ...
-  });
-
-}
+  } catch (error) {
+    console.error("Error during device registration:", error);
+  }
+}

package/src/service-provider/service-provider-impl.ts

@@ -12,7 +12,7 @@ import { callFunctionMock, initMockResponse } from "./mock/function-client.js";
 import { ServiceCallController } from "../service-call-controller2.js";
 import { deleteFirestorageDocument, downloadFileFirestorage, getFirestorageFile, getFirestorageFileList, initFirestorage, uploadFirestorageFile } from "./firebase/firestorage-client.js";
 import { downloadFileMock, getMockFileList, initStorageMock, uploadStorageFileMock } from "./mock/storage-client.js";
-import { initFirebaseMessaging } from "./firebase/messagingFirebaseClient.js";
+import { registerDevice } from "./firebase/messagingFirebaseClient.js";
 
 let provider: ServiceProviderConfiguration | undefined;
 let controller: ServiceCallController;
@@ -57,8 +57,9 @@ const initFirebaseApplicationServices = (
   }
 
   if (config.messagingConfig) {
-    initFirebaseMessaging(firebaseApp, config.messagingConfig);
-    console.debug("Init provider messaging");
+    registerDevice(firebaseApp, config.messagingConfig)
+      .then(() => console.debug(`complet registerDevice, right is ${Notification.permission}`));
+    
   }
 
   console.debug("Firebase initialized");  

package/src/store/mini-rx.store.ts

@@ -1,7 +1,7 @@
 import { configureStore, Store, LoggerExtension, ReduxDevtoolsExtension, ImmutableStateExtension } from 'mini-rx-store';
 import { StoreConfig } from '../service-provider/service-provider-model.js';
 import { spaAppReducer } from '../store/spa-app-reducer.js';
-import { appRouteEffect } from '../store/spa-app-effects.js';
+import { appRouteEffect, registerNotificationTokenSuccessEffect } from '../store/spa-app-effects.js';
 
 let store: Store;
 
@@ -9,7 +9,8 @@ const registerEffects = (effects: any[]) => {
   if (store) {
     // Register default app route effect
     store.effect(appRouteEffect);
-
+    store.effect(registerNotificationTokenSuccessEffect);
+    
     // Register configured effects
     effects.forEach(effect => store.effect(effect));
   } else {

package/src/store/spa-app-actions.ts

@@ -14,4 +14,13 @@ export const changeSubTask = action('SPA_APP_CHANGE_SUB_LOADING', payload<{
   loadingActionId: string,
   newTaskState: LoadingSubTask
 }>());
-export const removeLoadingState = action('SPA_APP_REMOVE_LOADING', payload<string>());
+export const removeLoadingState = action('SPA_APP_REMOVE_LOADING', payload<string>());
+
+
+export const updateNewNotificationToken = action('UPDATE_NOTIFICATION_TOKEN', payload<{
+  messagingToken: string
+}>());
+export const updateNewNotificationTokenSuccess = action('UPDATE_NOTIFICATION_TOKEN_SUCCESS', payload<{
+  messagingToken: string
+}>());
+export const updateNewNotificationTokenFail = action('UPDATE_NOTIFICATION_TOKEN_FAIL', payload<Error>());

package/src/store/spa-app-effects.ts

@@ -4,7 +4,8 @@ import { tap } from 'rxjs/operators';
 
 import { ofType } from 'ts-action-operators';
 
-import { routeAction } from './spa-app-actions.js';
+import { routeAction, updateNewNotificationTokenSuccess } from './spa-app-actions.js';
+import { NOTIFICATION_TOKEN } from '../service-provider/firebase/messagingFirebaseClient.js';
 
 
 let routeElement: HTMLElement;
@@ -34,3 +35,14 @@ export const appRouteEffect = createEffect(
     dispatch: false
   }
 );
+
+export const registerNotificationTokenSuccessEffect = createEffect(
+  actions$.pipe(
+    ofType(updateNewNotificationTokenSuccess),
+    tap((action) => {
+      localStorage.setItem(NOTIFICATION_TOKEN, action.payload.messagingToken);
+    })
+  ), {
+    dispatch: false
+  }
+);