@social-mail/social-mail-client 1.8.360 → 1.8.361

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.8.360",
+  "version": "1.8.361",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/services/LoginService.ts

@@ -28,23 +28,6 @@ export default class LoginService {
         if (this.user?.userID) {
             // let start syncing...
             // this.app.resolve(LocalDbService).syncAll(this.user.userID).catch(console.error);
-            if (PositronInBrowser.isAvailable) {
-                const deviceToken = await PositronInBrowser.run(function () {
-
-                    // this runs inside App's Internal JavaScript Engine
-                    const NSPositronAssembly = this.clr
-                        .assembly("NeuroSpeech.Positron");
-
-                    const Positron = NSPositronAssembly
-                        .NeuroSpeech.Positron.Positron;
-
-                    return Positron.instance.deviceToken;
-                });
-
-                if (deviceToken) {
-                    await this.entityService.invoke(LoginSession, "updateDeviceToken", session, "fcm", deviceToken);
-                }
-            }
         }
         return this.user;
     }

package/src/services/WebPushService.ts

@@ -5,6 +5,7 @@ import EntityService from "./EntityService";
 import { LoginSession } from "../model/model";
 import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
 import { apiPath } from "../common/apiPath";
+import PositronInBrowser from "@positron-js/context/dist/PositronInBrowser";
 
 @DITransient()
 export default class WebPushService {
@@ -14,7 +15,26 @@ export default class WebPushService {
 
     async register() {
         try {
-                    // ask for push...
+
+             if (PositronInBrowser.isAvailable) {
+                const deviceToken = await PositronInBrowser.run(function () {
+
+                    // this runs inside App's Internal JavaScript Engine
+                    const NSPositronAssembly = this.clr
+                        .assembly("NeuroSpeech.Positron");
+
+                    const Positron = NSPositronAssembly
+                        .NeuroSpeech.Positron.Positron;
+
+                    return Positron.instance.deviceToken;
+                });
+
+                if (deviceToken) {
+                    const session = await this.entityService.query(LoginSession, "currentUser").firstOrDefault();
+                    await this.entityService.invoke(LoginSession, "updateDeviceToken", session, "fcm", deviceToken);
+                }
+            }
+            // ask for push...
             if (!("serviceWorker" in navigator)) {
                 return;
             }