@progressive-development/pd-spa-helper 0.8.1-a → 0.8.1-c

package/dist/PdSpaHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PdSpaHelper.d.ts","sourceRoot":"","sources":["../src/PdSpaHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAEV,cAAc,EACd,cAAc,EAEf,MAAM,KAAK,CAAC;AAGb,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,0CAA0C,CAAC;AAClD,OAAO,4CAA4C,CAAC;AACpD,OAAO,qDAAqD,CAAC;AAC7D,OAAO,8CAA8C,CAAC;AAUtD,OAAO,EACL,gBAAgB,EAChB,MAAM,EAGN,cAAc,EACf,MAAM,8CAA8C,CAAC;AAItD,OAAO,EAAkB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpE,OAAO,gCAAgC,CAAC;AAExC,OAAO,sBAAsB,CAAC;AAC9B,OAAO,8BAA8B,CAAC;AAOtC,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAgD3D;;;;;;;GAOG;AACH,eAAO,MAAM,SAAS,GAAI,QAAQ,gBAAgB,SAmCjD,CAAC;AAIF;;GAEG;AACH,8BAAsB,WAAY,SAAQ,UAAU;IAGlD,KAAK,SAAe;IAEpB;;OAEG;IAEH,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IAG3B,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC;IAG1B,aAAa,EAAE,YAAY,EAAE,CAAM;IAEnC;;;OAGG;IAEH,SAAS,CAAC,MAAM,SAAM;IAEtB;;OAEG;IAEH,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE/C;;OAEG;IAEH,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE9C;;OAEG;IAEH,OAAO,CAAC,aAAa,CAAS;IAG9B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAErC,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAS;IAG7C,aAAa,CAAC,EAAE,YAAY,CAAC;IAE7B,MAAM,CAAC,MAAM,EA+EN,cAAc,CAAC;;IA0CtB,iBAAiB,IAAI,IAAI;IAmBzB,oBAAoB,IAAI,IAAI;IAM5B,gBAAgB,CAAC,KAAK,EAAE,KAAK;IAS7B;;OAEG;IAGH;;;OAGG;IACH,oBAAoB;IAepB,MAAM;IAsCN,OAAO,CAAC,aAAa;IAerB,WAAW,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO;IAqB3D,cAAc,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO;IAsB9D,aAAa,IAAI,cAAc,GAAG,MAAM;IAkBxC,aAAa;IAcb,SAAS,CAAC,QAAQ,CAAC,iBAAiB,IAAI,KAAK,CAAC,cAAc,CAAC;IAE7D,SAAS,CAAC,QAAQ,CAAC,UAAU,IAAI,MAAM;IAEvC,SAAS,CAAC,QAAQ,CAAC,WAAW,IAAI,cAAc;IAEhD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,IAAI,GAAG;IAE3C,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAEnD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,IAAI,GAAG;IAE9C,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;IAE9D,SAAS,CAAC,aAAa,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI;IAoB7C,aAAa,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI;IASnC,qBAAqB,CAAC,CAAC,EAAE,GAAG;IAW5B,uBAAuB,CAAC,CAAC,EAAE,WAAW;IAYtC,iBAAiB,CAAC,CAAC,EAAE,GAAG;IAexB,qBAAqB,CAAC,CAAC,EAAE,GAAG;IAgB5B,MAAM,CAAC,YAAY;IAUnB,gBAAgB,CAAC,EAAE,EAAE,WAAW;CAYjC"}
+{"version":3,"file":"PdSpaHelper.d.ts","sourceRoot":"","sources":["../src/PdSpaHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAEV,cAAc,EACd,cAAc,EAEf,MAAM,KAAK,CAAC;AAGb,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,0CAA0C,CAAC;AAClD,OAAO,4CAA4C,CAAC;AACpD,OAAO,qDAAqD,CAAC;AAC7D,OAAO,8CAA8C,CAAC;AAStD,OAAO,EACL,gBAAgB,EAChB,MAAM,EAGN,cAAc,EACf,MAAM,8CAA8C,CAAC;AAItD,OAAO,EAAkB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpE,OAAO,gCAAgC,CAAC;AAExC,OAAO,sBAAsB,CAAC;AAC9B,OAAO,8BAA8B,CAAC;AAQtC,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAkD3D;;;;;;;GAOG;AACH,eAAO,MAAM,SAAS,GAAI,QAAQ,gBAAgB,SAgCjD,CAAC;AAIF;;GAEG;AACH,8BAAsB,WAAY,SAAQ,UAAU;IAGlD,KAAK,SAAe;IAEpB;;OAEG;IAEH,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IAG3B,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC;IAG1B,aAAa,EAAE,YAAY,EAAE,CAAM;IAEnC;;;OAGG;IAEH,SAAS,CAAC,MAAM,SAAM;IAEtB;;OAEG;IAEH,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE/C;;OAEG;IAEH,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE9C;;OAEG;IAEH,OAAO,CAAC,aAAa,CAAS;IAG9B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAErC,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAS;IAG7C,aAAa,CAAC,EAAE,YAAY,CAAC;IAE7B,MAAM,CAAC,MAAM,EA+EN,cAAc,CAAC;;IA0CtB,iBAAiB,IAAI,IAAI;IAmBzB,oBAAoB,IAAI,IAAI;IAM5B,gBAAgB,CAAC,KAAK,EAAE,KAAK;IAS7B;;OAEG;IAGH;;;OAGG;IACH,oBAAoB;IA8CpB,MAAM;IAsCN,OAAO,CAAC,aAAa;IAerB,WAAW,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO;IAqB3D,cAAc,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO;IAsB9D,aAAa,IAAI,cAAc,GAAG,MAAM;IAkBxC,aAAa;IAcb,SAAS,CAAC,QAAQ,CAAC,iBAAiB,IAAI,KAAK,CAAC,cAAc,CAAC;IAE7D,SAAS,CAAC,QAAQ,CAAC,UAAU,IAAI,MAAM;IAEvC,SAAS,CAAC,QAAQ,CAAC,WAAW,IAAI,cAAc;IAEhD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,IAAI,GAAG;IAE3C,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAEnD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,IAAI,GAAG;IAE9C,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;IAE9D,SAAS,CAAC,aAAa,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI;IAkB7C,aAAa,CAAC,CAAC,EAAE,WAAW,GAAG,IAAI;IASnC,qBAAqB,CAAC,CAAC,EAAE,GAAG;IAW5B,uBAAuB,CAAC,CAAC,EAAE,WAAW;IAYtC,iBAAiB,CAAC,CAAC,EAAE,GAAG;IAexB,qBAAqB,CAAC,CAAC,EAAE,GAAG;IAgB5B,MAAM,CAAC,YAAY;IAUnB,gBAAgB,CAAC,EAAE,EAAE,WAAW;CAYjC"}

package/dist/PdSpaHelper.js

@@ -6,7 +6,7 @@ import "@progressive-development/pd-page/pd-footer";
 import "@progressive-development/pd-content/pd-panel-viewer";
 import "@progressive-development/pd-content/pd-panel";
 import { pdStore, initializeStore } from "./store/mini-rx.store.js";
-import { authStateChangedImpl, setServiceProvider, initAppImpl, isAuthenticatedWithSessionRedirect } from "./service-provider/service-provider-impl.js";
+import { authStateChangedImpl, setServiceProvider, initAppImpl } from "./service-provider/service-provider-impl.js";
 import { getLoadingSelector } from "./store/spa-app-selector.js";
 import { setRouteElement } from "./store/spa-app-effects.js";
 import { APP_CONF_EVENT } from "./model/spa-model.js";
@@ -25,7 +25,6 @@ var __decorateClass = (decorators, target, key, kind) => {
   if (result) __defProp(target, key, result);
   return result;
 };
-const POST_LOGIN_REDIRECT_KEY = "postLoginRedirect";
 const MADE_BY = {
   txt: "made by PD Progressive Development",
   email: "info@progressive-development.com"
@@ -46,11 +45,6 @@ const transformRoutes = () => {
     };
     routeDefs.push(routeDef);
   });
-  routeDefs.push({
-    name: "not-found",
-    pattern: "/:path(.*)",
-    auth: false
-  });
   return routeDefs;
 };
 const startInit = (config) => {
@@ -64,13 +58,12 @@ const startInit = (config) => {
     config.navigationConfigParam.pages.push({
       name: "login",
       menu: [{ key: "login", name: "Login" }],
-      pattern: ["login"],
+      pattern: ["/login"],
       auth: false
     });
   }
   navigationConfig = config.navigationConfigParam;
   transformedRoutes = transformRoutes();
-  pdRouterService.isAuthenticatedWithSessionRedirect = isAuthenticatedWithSessionRedirect;
   pdRouterService.configureRoutes(transformedRoutes);
   document.dispatchEvent(new CustomEvent("init-app-event"));
   console.log("Init done, Event created");
@@ -152,12 +145,21 @@ const _PdSpaHelper = (_a = class extends LitElement {
    */
   activateLoginHandler() {
     console.log("Activate Login Handler");
-    const callback = (user) => {
+    const callback = async (user) => {
+      var _a2;
       console.log("My callback user:", user);
-      this._user = user;
-      if (this._user) {
-        pdStore().dispatch(loginSucess());
-        this._loginSuccess(new CustomEvent("login-success"));
+      if (user) {
+        const tokenResult = await user.getIdTokenResult();
+        const claims = tokenResult.claims;
+        pdStore().dispatch(
+          loginSucess({
+            uid: user.uid,
+            email: user.email,
+            emailVerified: user.emailVerified,
+            claims,
+            providerId: ((_a2 = user.providerData[0]) == null ? void 0 : _a2.providerId) ?? "firebase"
+          })
+        );
       } else {
         pdStore().dispatch(nologin());
       }
@@ -185,7 +187,7 @@ const _PdSpaHelper = (_a = class extends LitElement {
       (ls) => html`<pd-loading-state .loadingState="${ls}"></pd-loading-state>`
     )}
         ${this._renderRoutePages()}
-        ${navigationConfig.includeLogin ? html`<default-login
+        ${this._route === "login" ? html` <default-login
               ?active="${this._route === "login"}"
             ></default-login>` : ""}
       </main>
@@ -269,17 +271,19 @@ const _PdSpaHelper = (_a = class extends LitElement {
     `;
   }
   _loginSuccess(e) {
-    const redirectRoute = sessionStorage.getItem(POST_LOGIN_REDIRECT_KEY);
+    const redirectRoute = sessionStorage.getItem("postLoginRedirect");
+    if (redirectRoute) {
+      const routeToNavigate = redirectRoute && redirectRoute !== "/login" ? redirectRoute : "";
+      sessionStorage.removeItem("postLoginRedirect");
+      this.dispatchEvent(
+        new CustomEvent("route-event", {
+          detail: { route: routeToNavigate },
+          bubbles: true,
+          composed: true
+        })
+      );
+    }
     console.debug("Login Event: ", e, window.location.href, redirectRoute);
-    const routeToNavigate = redirectRoute && redirectRoute !== "/login" ? redirectRoute : navigationConfig.defaultPostLoginRoute || "";
-    sessionStorage.removeItem(POST_LOGIN_REDIRECT_KEY);
-    this.dispatchEvent(
-      new CustomEvent("route-event", {
-        detail: { route: routeToNavigate },
-        bubbles: true,
-        composed: true
-      })
-    );
   }
   _localeChange(e) {
     const newLocale = e.detail;
@@ -461,7 +465,6 @@ __decorateClass([
 ], _PdSpaHelper.prototype, "_selectedLocale");
 let PdSpaHelper = _PdSpaHelper;
 export {
-  POST_LOGIN_REDIRECT_KEY,
   PdSpaHelper,
   startInit
 };

package/dist/model/spa-model.d.ts

@@ -1,6 +1,13 @@
 export declare const APP_CONF_EVENT = "get-app-conf";
 export declare const RUNNING_WIZARD_STORAGE_ELEMENTS = "pd.spa.local.wizard.storage";
 export declare const UNDEF = "UNDEF";
+export interface AppUser {
+    uid: string;
+    email: string | null;
+    emailVerified: boolean;
+    providerId: string;
+    claims: Record<string, any>;
+}
 export interface LoadingSubTask {
     actionKey: string;
     completed: boolean;

package/dist/model/spa-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spa-model.d.ts","sourceRoot":"","sources":["../../src/model/spa-model.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,iBAAiB,CAAC;AAE7C,eAAO,MAAM,+BAA+B,gCAAgC,CAAC;AAE7E,eAAO,MAAM,KAAK,UAAU,CAAC;AAE7B,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;CAC5B"}
+{"version":3,"file":"spa-model.d.ts","sourceRoot":"","sources":["../../src/model/spa-model.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,iBAAiB,CAAC;AAE7C,eAAO,MAAM,+BAA+B,gCAAgC,CAAC;AAE7E,eAAO,MAAM,KAAK,UAAU,CAAC;AAE7B,MAAM,WAAW,OAAO;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;CAC5B"}

package/dist/router/PdRouterService.d.ts

@@ -5,7 +5,6 @@ declare class PdRouterService {
     private onChangeHandlers;
     private currentRoute;
     constructor();
-    isAuthenticatedWithSessionRedirect: (routeName: string) => Promise<boolean>;
     /**
      * Setzt die Routen-Konfiguration. Muss vor Verwendung von navigate() aufgerufen werden.
      */

package/dist/router/PdRouterService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PdRouterService.d.ts","sourceRoot":"","sources":["../../src/router/PdRouterService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEnE,KAAK,kBAAkB,GAAG,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;AAE1D,cAAM,eAAe;IACnB,OAAO,CAAC,MAAM,CAAqC;IAEnD,OAAO,CAAC,gBAAgB,CAA4B;IAEpD,OAAO,CAAC,YAAY,CAAc;;IAS3B,kCAAkC,EAAE,CACzC,SAAS,EAAE,MAAM,KACd,OAAO,CAAC,OAAO,CAAC,CAAoB;IAEzC;;OAEG;IACI,eAAe,CAAC,WAAW,EAAE,eAAe,EAAE;IAuDrD;;OAEG;IACU,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,UAAQ;IAejD;;OAEG;IACI,aAAa,CAAC,OAAO,EAAE,kBAAkB;IAIhD;;OAEG;YACW,OAAO;CA2CtB;AAED,eAAO,MAAM,eAAe,iBAAwB,CAAC"}
+{"version":3,"file":"PdRouterService.d.ts","sourceRoot":"","sources":["../../src/router/PdRouterService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAMnE,KAAK,kBAAkB,GAAG,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;AAE1D,cAAM,eAAe;IACnB,OAAO,CAAC,MAAM,CAAqC;IAEnD,OAAO,CAAC,gBAAgB,CAA4B;IAEpD,OAAO,CAAC,YAAY,CAAc;;IAQlC;;OAEG;IACI,eAAe,CAAC,WAAW,EAAE,eAAe,EAAE;IA0ErD;;OAEG;IACU,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,UAAQ;IAejD;;OAEG;IACI,aAAa,CAAC,OAAO,EAAE,kBAAkB;IAIhD;;OAEG;YACW,OAAO;CAwDtB;AAaD,eAAO,MAAM,eAAe,iBAAwB,CAAC"}

package/dist/router/PdRouterService.js

@@ -1,15 +1,16 @@
 import UniversalRouter from "universal-router";
+import { selectAuthUser } from "../store/spa-app-selector.js";
+import { pdStore } from "../store/mini-rx.store.js";
+import { firstValueFrom, first, filter } from "rxjs";
 class PdRouterService {
   constructor() {
     this.router = null;
     this.onChangeHandlers = [];
     this.currentRoute = "";
-    this.isAuthenticatedWithSessionRedirect = async () => true;
     window.addEventListener("popstate", () => {
       this.resolve(location.pathname + location.search);
     });
   }
-  // Default-Fallback, falls nicht überschrieben
   /**
    * Setzt die Routen-Konfiguration. Muss vor Verwendung von navigate() aufgerufen werden.
    */
@@ -33,9 +34,25 @@ class PdRouterService {
       return patterns.map((pattern) => ({
         path: pattern,
         action: async (context) => {
-          if (def.auth && !await this.isAuthenticatedWithSessionRedirect(def.name)) {
-            const fallbackRoute = def.authFallback ?? "login";
-            return { route: fallbackRoute };
+          var _a, _b;
+          if (def.auth) {
+            let authResult;
+            if (!((_a = context.userCheck) == null ? void 0 : _a.loginCheckFinish)) {
+              authResult = await waitForFinalAuthState();
+              context.userCheck = authResult;
+            }
+            if (!((_b = context.userCheck) == null ? void 0 : _b.user)) {
+              const fallbackRoute = def.authFallback ?? "/login";
+              return { redirect: fallbackRoute };
+            }
+          }
+          if (def.roles && !def.roles.some(
+            (role) => {
+              var _a2;
+              return ((_a2 = context.userCheck.user.claims) == null ? void 0 : _a2[role]) === true;
+            }
+          )) {
+            return { redirect: "/unauthorized" };
           }
           if (def.action) {
             const result = await def.action();
@@ -50,6 +67,7 @@ class PdRouterService {
         }
       }));
     });
+    console.log("######### Universal routes: ", universalRoutes);
     this.router = new UniversalRouter(universalRoutes);
     this.resolve(location.pathname + location.search);
   }
@@ -88,7 +106,18 @@ class PdRouterService {
         "[PdRouter] bevore resolve Current location:",
         location.pathname
       );
-      const result = await this.router.resolve({ pathname });
+      const userCheck = await firstValueFrom(
+        pdStore().select(selectAuthUser).pipe(first())
+      );
+      const result = await this.router.resolve({
+        pathname,
+        userCheck
+      });
+      if (result.redirect) {
+        history.replaceState({}, "", result.redirect);
+        await this.resolve(result.redirect);
+        return;
+      }
       if (!result || typeof result !== "object" || !result.route) {
         console.warn("[PdRouter] Invalid route result:", result);
         return;
@@ -106,6 +135,14 @@ class PdRouterService {
     }
   }
 }
+async function waitForFinalAuthState() {
+  return await firstValueFrom(
+    pdStore().select(selectAuthUser).pipe(
+      filter((res) => res.loginCheckFinish === true),
+      first()
+    )
+  );
+}
 const pdRouterService = new PdRouterService();
 export {
   pdRouterService

package/dist/router/rout-types.d.ts

@@ -2,6 +2,7 @@ export interface RouteDefinition {
     name: string;
     pattern: string | string[];
     auth?: boolean;
+    roles?: string[];
     authFallback?: string;
     action?: () => Promise<{
         route: string;

package/dist/router/rout-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rout-types.d.ts","sourceRoot":"","sources":["../../src/router/rout-types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACjD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B"}
+{"version":3,"file":"rout-types.d.ts","sourceRoot":"","sources":["../../src/router/rout-types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACjD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B"}

package/dist/service-provider/firebase/auth.js

@@ -44,7 +44,7 @@ const authStateChanged = (callback) => {
   if (!auth) {
     throw new Error("authStateChanged: Auth was not initialized");
   }
-  onAuthStateChanged(auth, (user) => callback(user));
+  onAuthStateChanged(auth, callback);
 };
 const authIdTokenStateChanged = (callback) => {
   onIdTokenChanged(auth, (user) => callback(user));

package/dist/service-provider/service-provider-impl.js

@@ -7,7 +7,7 @@ import { initMockResponse, callFunctionMock } from "./mock/function-client.js";
 import { initFirestorage, uploadFirestorageFile, getFirestorageFileList, getFirestorageFile, downloadFileFirestorage, deleteFirestorageDocument, getFirestorageConf } from "./firebase/firestorage-client.js";
 import { initStorageMock, uploadStorageFileMock, getMockFileList, downloadFileMock } from "./mock/storage-client.js";
 import { prepareMessaging, activateTokenChangeHandler, registerDevice, getFirebaseMessaging } from "./firebase/messagingFirebaseClient.js";
-import { POST_LOGIN_REDIRECT_KEY } from "../PdSpaHelper.js";
+import "../PdSpaHelper.js";
 let provider;
 let app;
 const throwUndefinedProviderError = () => {
@@ -82,13 +82,6 @@ const isAuthenticatedImpl = () => {
   }
   return throwUndefinedProviderError();
 };
-const isAuthenticatedWithSessionRedirect = (routeName) => {
-  const isAuth = isAuthenticatedImpl();
-  if (!isAuth && routeName !== "login") {
-    sessionStorage.setItem(POST_LOGIN_REDIRECT_KEY, routeName);
-  }
-  return Promise.resolve(isAuth);
-};
 const loginImpl = (user, sec) => {
   if (!user) {
     const returnError = new Error("empty user");
@@ -236,7 +229,6 @@ export {
   getUserIdToken,
   initAppImpl,
   isAuthenticatedImpl,
-  isAuthenticatedWithSessionRedirect,
   loginImpl,
   logoutImpl,
   registerAppDeviceForNotification,

package/dist/store/spa-app-actions.d.ts

@@ -1,11 +1,18 @@
 import { TemplateResult } from 'lit';
-import { LoadingState, LoadingSubTask } from '../model/spa-model.js';
+import { AppUser, LoadingState, LoadingSubTask } from '../model/spa-model.js';
 export declare const initIndexDBSucess: (() => {
     type: "SPA_INIT_INDEX_DB_SUCCESS";
 }) & {
     type: "SPA_INIT_INDEX_DB_SUCCESS";
 };
-export declare const loginSucess: (() => {
+export declare const loginSucess: ((payload: AppUser) => {
+    payload: AppUser;
+} & {
+    type: "SPA_LOGIN_SUCCESS";
+}) & {
+    type: "SPA_LOGIN_SUCCESS";
+};
+export declare const logoutSucess: (() => {
     type: "SPA_LOGIN_SUCCESS";
 }) & {
     type: "SPA_LOGIN_SUCCESS";

package/dist/store/spa-app-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spa-app-actions.d.ts","sourceRoot":"","sources":["../../src/store/spa-app-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAGrC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAErE,eAAO,MAAM,iBAAiB;;;;CAAsC,CAAC;AACrE,eAAO,MAAM,WAAW;;;;CAA8B,CAAC;AACvD,eAAO,MAAM,OAAO;;;;CAAyB,CAAC;AAE9C,eAAO,MAAM,WAAW;;;;;;CAA6C,CAAC;AAEtE,eAAO,MAAM,WAAW;SAGf,MAAM,GAAG,cAAc;aACnB,OAAO;eACL,OAAO;eACP,MAAM;;;aAHZ,MAAM,GAAG,cAAc;iBACnB,OAAO;mBACL,OAAO;mBACP,MAAM;;;;;;CAEpB,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;CAGjC,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;CAG3B,CAAC;AACF,eAAO,MAAM,aAAa;qBAGL,MAAM;kBACT,cAAc;;;yBADX,MAAM;sBACT,cAAc;;;;;;CAE/B,CAAC;AACF,eAAO,MAAM,kBAAkB;;;;;;CAG9B,CAAC;AAEF,eAAO,MAAM,0BAA0B;oBAGnB,MAAM;;;wBAAN,MAAM;;;;;;CAEzB,CAAC;AACF,eAAO,MAAM,iCAAiC;oBAG1B,MAAM;;;wBAAN,MAAM;;;;;;CAEzB,CAAC;AACF,eAAO,MAAM,8BAA8B;;;;;;CAG1C,CAAC"}
+{"version":3,"file":"spa-app-actions.d.ts","sourceRoot":"","sources":["../../src/store/spa-app-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAGrC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE9E,eAAO,MAAM,iBAAiB;;;;CAAsC,CAAC;AACrE,eAAO,MAAM,WAAW;;;;;;CAAkD,CAAC;AAC3E,eAAO,MAAM,YAAY;;;;CAA8B,CAAC;AACxD,eAAO,MAAM,OAAO;;;;CAAyB,CAAC;AAE9C,eAAO,MAAM,WAAW;;;;;;CAA6C,CAAC;AAEtE,eAAO,MAAM,WAAW;SAGf,MAAM,GAAG,cAAc;aACnB,OAAO;eACL,OAAO;eACP,MAAM;;;aAHZ,MAAM,GAAG,cAAc;iBACnB,OAAO;mBACL,OAAO;mBACP,MAAM;;;;;;CAEpB,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;CAGjC,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;CAG3B,CAAC;AACF,eAAO,MAAM,aAAa;qBAGL,MAAM;kBACT,cAAc;;;yBADX,MAAM;sBACT,cAAc;;;;;;CAE/B,CAAC;AACF,eAAO,MAAM,kBAAkB;;;;;;CAG9B,CAAC;AAEF,eAAO,MAAM,0BAA0B;oBAGnB,MAAM;;;wBAAN,MAAM;;;;;;CAEzB,CAAC;AACF,eAAO,MAAM,iCAAiC;oBAG1B,MAAM;;;wBAAN,MAAM;;;;;;CAEzB,CAAC;AACF,eAAO,MAAM,8BAA8B;;;;;;CAG1C,CAAC"}

package/dist/store/spa-app-actions.js

@@ -1,6 +1,7 @@
 import { action, payload } from "ts-action";
 const initIndexDBSucess = action("SPA_INIT_INDEX_DB_SUCCESS");
-const loginSucess = action("SPA_LOGIN_SUCCESS");
+const loginSucess = action("SPA_LOGIN_SUCCESS", payload());
+const logoutSucess = action("SPA_LOGIN_SUCCESS");
 const nologin = action("SPA_NO_LOGIN");
 const routeAction = action("SPA_APP_ROUTE", payload());
 const toastAction = action(
@@ -40,6 +41,7 @@ export {
   changeSubTask,
   initIndexDBSucess,
   loginSucess,
+  logoutSucess,
   nologin,
   removeLoadingState,
   routeAction,

package/dist/store/spa-app-reducer.d.ts

@@ -1,10 +1,18 @@
-import { LoadingState } from '../model/spa-model.js';
+import { AppUser, LoadingState } from '../model/spa-model.js';
 export interface SpaAppState {
     offline?: boolean;
     loadingState: LoadingState[];
     lastRoutes?: any[];
     initIndexDB?: boolean;
-    userLogin?: boolean;
+    userLoginDone: boolean;
+    user: AppUser | undefined;
 }
-export declare const spaAppReducer: import('ts-action').Reducer<SpaAppState>;
+export declare const spaAppReducer: import('ts-action').Reducer<{
+    userLoginDone: boolean;
+    offline?: boolean;
+    loadingState: LoadingState[];
+    lastRoutes?: any[];
+    initIndexDB?: boolean;
+    user: AppUser | undefined;
+}>;
 //# sourceMappingURL=spa-app-reducer.d.ts.map

package/dist/store/spa-app-reducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spa-app-reducer.d.ts","sourceRoot":"","sources":["../../src/store/spa-app-reducer.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAMD,eAAO,MAAM,aAAa,0CAkDzB,CAAC"}
+{"version":3,"file":"spa-app-reducer.d.ts","sourceRoot":"","sources":["../../src/store/spa-app-reducer.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;CAC3B;AAQD,eAAO,MAAM,aAAa;;cAdd,OAAO;kBACH,YAAY,EAAE;iBACf,GAAG,EAAE;kBACJ,OAAO;UAEf,OAAO,GAAG,SAAS;EAoE1B,CAAC"}

package/dist/store/spa-app-reducer.js

@@ -1,7 +1,9 @@
 import { reducer, on } from "ts-action";
-import { updateInternetOffline, addLoadingState, changeSubTask, removeLoadingState, routeAction, initIndexDBSucess, loginSucess } from "./spa-app-actions.js";
+import { updateInternetOffline, addLoadingState, changeSubTask, removeLoadingState, routeAction, initIndexDBSucess, loginSucess, nologin, logoutSucess } from "./spa-app-actions.js";
 const initialState = {
-  loadingState: []
+  loadingState: [],
+  userLoginDone: false,
+  user: void 0
 };
 const spaAppReducer = reducer(
   initialState,
@@ -43,9 +45,18 @@ const spaAppReducer = reducer(
     ...state,
     initIndexDB: true
   })),
-  on(loginSucess, (state) => ({
+  on(loginSucess, (state, { payload }) => ({
     ...state,
-    userLogin: true
+    userLoginDone: true,
+    user: payload
+  })),
+  on(nologin, (state) => ({
+    ...state,
+    userLoginDone: true
+  })),
+  on(logoutSucess, () => ({
+    ...initialState,
+    userLoginDone: true
   }))
 );
 export {

package/dist/store/spa-app-selector.d.ts

@@ -1,7 +1,11 @@
 export declare const getLoadingSelector: import('mini-rx-store/lib/selector.js').Selector<object, import('../model/spa-model.js').LoadingState[]>;
 export declare const getOfflineSelector: import('mini-rx-store/lib/selector.js').Selector<object, boolean>;
 export declare const getInitStatusSelector: import('mini-rx-store/lib/selector.js').Selector<object, {
-    login: boolean | undefined;
+    login: boolean;
     indexedDB: boolean | undefined;
 }>;
+export declare const selectAuthUser: import('mini-rx-store/lib/selector.js').Selector<object, {
+    user: import('../model/spa-model.js').AppUser | undefined;
+    loginCheckFinish: boolean;
+}>;
 //# sourceMappingURL=spa-app-selector.d.ts.map

package/dist/store/spa-app-selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spa-app-selector.d.ts","sourceRoot":"","sources":["../../src/store/spa-app-selector.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,kBAAkB,0GAuB9B,CAAC;AAEF,eAAO,MAAM,kBAAkB,mEAG9B,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;EAMjC,CAAC"}
+{"version":3,"file":"spa-app-selector.d.ts","sourceRoot":"","sources":["../../src/store/spa-app-selector.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,kBAAkB,0GAuB9B,CAAC;AAEF,eAAO,MAAM,kBAAkB,mEAG9B,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;EAMjC,CAAC;AAEF,eAAO,MAAM,cAAc;;;EAM1B,CAAC"}

package/dist/store/spa-app-selector.js

@@ -28,12 +28,20 @@ const getOfflineSelector = createSelector(
 const getInitStatusSelector = createSelector(
   getSpaAppFeatureState,
   (state) => ({
-    login: state.userLogin,
+    login: state.user !== void 0,
     indexedDB: state.initIndexDB
   })
 );
+const selectAuthUser = createSelector(
+  getSpaAppFeatureState,
+  (state) => ({
+    user: state.user,
+    loginCheckFinish: state.userLoginDone
+  })
+);
 export {
   getInitStatusSelector,
   getLoadingSelector,
-  getOfflineSelector
+  getOfflineSelector,
+  selectAuthUser
 };

package/dist/stories/routing.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.stories.d.ts","sourceRoot":"","sources":["../../src/stories/routing.stories.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAE5E,OAAO,+BAA+B,CAAC;AAGvC,eAAO,MAAM,SAAS,EAAE,cAAc,EA4CrC,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;CAe5B,CAAC;;;;AASF,wBAEE;AAEF,eAAO,MAAM,YAAY,4CAcxB,CAAC"}
+{"version":3,"file":"routing.stories.d.ts","sourceRoot":"","sources":["../../src/stories/routing.stories.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAE5E,OAAO,+BAA+B,CAAC;AAGvC,eAAO,MAAM,SAAS,EAAE,cAAc,EA4CrC,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;CAe5B,CAAC;;;;AAOF,wBAEE;AAEF,eAAO,MAAM,YAAY,4CAcxB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@progressive-development/pd-spa-helper",
-  "version": "0.8.1-a",
+  "version": "0.8.1-c",
   "description": "Webcomponent pd-spa-helper following open-wc recommendations",
   "author": "PD Progressive Development",
   "license": "SEE LICENSE IN LICENSE",