@nakedcreativity/membrs-angular-helper 0.1.3 → 0.1.5

package/esm2020/lib/auth.interceptor.mjs

@@ -1,25 +1,63 @@
-import { Injectable } from '@angular/core';
-//import { NgBusyService } from '@nakedcreativity/ng-busy';
-import { finalize } from 'rxjs/operators';
+import { Injectable } from "@angular/core";
+import { from, throwError } from "rxjs";
+import { switchMap, catchError, finalize, tap } from "rxjs/operators";
 import * as i0 from "@angular/core";
+import * as i1 from "@auth0/angular-jwt";
+import * as i2 from "./membrs.service";
+import * as i3 from "@uirouter/angular";
 export class TokenInterceptor {
-    constructor() { }
+    constructor(jwtHelper, membrsService, stateService) {
+        this.jwtHelper = jwtHelper;
+        this.membrsService = membrsService;
+        this.stateService = stateService;
+    }
     intercept(request, next) {
-        console.log('intercept request', localStorage.getItem('membrs'));
-        //this.busyService.busy()
-        request = request.clone({
-            setHeaders: {
-                Authorization: localStorage.getItem('membrs')
+        const token = localStorage.getItem("membrs");
+        if (token && this.jwtHelper.isTokenExpired(token)) {
+            console.log("Token expired. Attempting to reissue.");
+            return from(this.membrsService.reissue()).pipe(switchMap(() => {
+                const refreshedToken = localStorage.getItem("membrs");
+                if (refreshedToken && !this.jwtHelper.isTokenExpired(refreshedToken)) {
+                    console.log("Token successfully reissued.");
+                    request = request.clone({
+                        setHeaders: {
+                            Authorization: refreshedToken,
+                        },
+                    });
+                }
+                return next.handle(request);
+            }), catchError((err) => {
+                console.warn("Token refresh failed. Logging out.");
+                this.membrsService.logout();
+                this.stateService.go("");
+                return throwError(() => err);
+            }), finalize(() => {
+                // this.busyService.finished()
+            }));
+        }
+        if (token && !this.jwtHelper.isTokenExpired(token)) {
+            request = request.clone({
+                setHeaders: {
+                    Authorization: token,
+                },
+            });
+        }
+        return next.handle(request).pipe(tap((event) => {
+            // If this is an HttpResponse, check for x-new-token header
+            if (event && event.type === 4 && event.headers) {
+                const newToken = event.headers.get('x-new-token');
+                if (newToken) {
+                    localStorage.setItem('membrs', newToken);
+                }
             }
-        });
-        return next.handle(request).pipe(finalize(() => {
-            //this.busyService.finished()
+        }), finalize(() => {
+            // this.busyService.finished()
         }));
     }
 }
-TokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TokenInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-TokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TokenInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TokenInterceptor, decorators: [{
+TokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenInterceptor, deps: [{ token: i1.JwtHelperService }, { token: i2.MembrsService }, { token: i3.StateService }], target: i0.ɵɵFactoryTarget.Injectable });
+TokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenInterceptor, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return []; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL21lbWJycy9zcmMvbGliL2F1dGguaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQVEzQywyREFBMkQ7QUFDM0QsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDOztBQUkxQyxNQUFNLE9BQU8sZ0JBQWdCO0lBQzNCLGdCQUFlLENBQUM7SUFDaEIsU0FBUyxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFFcEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsRUFBRSxZQUFZLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUE7UUFDaEUseUJBQXlCO1FBQ3pCLE9BQU8sR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO1lBQ3RCLFVBQVUsRUFBRTtnQkFDVixhQUFhLEVBQUUsWUFBWSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUM7YUFDOUM7U0FDRixDQUFDLENBQUM7UUFDSCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFFLEVBQUU7WUFDNUMsNkJBQTZCO1FBQy9CLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDTixDQUFDOzs2R0FkVSxnQkFBZ0I7aUhBQWhCLGdCQUFnQjsyRkFBaEIsZ0JBQWdCO2tCQUQ1QixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtcbiAgSHR0cFJlcXVlc3QsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBJbnRlcmNlcHRvclxufSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG4vL2ltcG9ydCB7IE5nQnVzeVNlcnZpY2UgfSBmcm9tICdAbmFrZWRjcmVhdGl2aXR5L25nLWJ1c3knO1xuaW1wb3J0IHsgZmluYWxpemUgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIFRva2VuSW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICBjb25zdHJ1Y3RvcigpIHt9XG4gIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICBcbiAgICBjb25zb2xlLmxvZygnaW50ZXJjZXB0IHJlcXVlc3QnLCBsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgnbWVtYnJzJykpXG4gICAgLy90aGlzLmJ1c3lTZXJ2aWNlLmJ1c3koKVxuICAgIHJlcXVlc3QgPSByZXF1ZXN0LmNsb25lKHtcbiAgICAgIHNldEhlYWRlcnM6IHtcbiAgICAgICAgQXV0aG9yaXphdGlvbjogbG9jYWxTdG9yYWdlLmdldEl0ZW0oJ21lbWJycycpXG4gICAgICB9XG4gICAgfSk7XG4gICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpLnBpcGUoZmluYWxpemUoKCk9PntcbiAgICAgIC8vdGhpcy5idXN5U2VydmljZS5maW5pc2hlZCgpXG4gICAgfSkpO1xuICB9XG59Il19
+        }], ctorParameters: function () { return [{ type: i1.JwtHelperService }, { type: i2.MembrsService }, { type: i3.StateService }]; } });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL21lbWJycy9zcmMvbGliL2F1dGguaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQWMsSUFBSSxFQUFFLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNwRCxPQUFPLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBS3RFLE1BQU0sT0FBTyxnQkFBZ0I7SUFDM0IsWUFBb0IsU0FBMkIsRUFBVSxhQUE0QixFQUFVLFlBQTBCO1FBQXJHLGNBQVMsR0FBVCxTQUFTLENBQWtCO1FBQVUsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFBVSxpQkFBWSxHQUFaLFlBQVksQ0FBYztJQUFHLENBQUM7SUFFN0gsU0FBUyxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDcEQsTUFBTSxLQUFLLEdBQUcsWUFBWSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUU3QyxJQUFJLEtBQUssSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNqRCxPQUFPLENBQUMsR0FBRyxDQUFDLHVDQUF1QyxDQUFDLENBQUM7WUFDckQsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FDNUMsU0FBUyxDQUFDLEdBQUcsRUFBRTtnQkFDYixNQUFNLGNBQWMsR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO2dCQUN0RCxJQUFJLGNBQWMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxFQUFFO29CQUNwRSxPQUFPLENBQUMsR0FBRyxDQUFDLDhCQUE4QixDQUFDLENBQUM7b0JBQzVDLE9BQU8sR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO3dCQUN0QixVQUFVLEVBQUU7NEJBQ1YsYUFBYSxFQUFFLGNBQWM7eUJBQzlCO3FCQUNGLENBQUMsQ0FBQztpQkFDSjtnQkFDRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDOUIsQ0FBQyxDQUFDLEVBQ0YsVUFBVSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7Z0JBQ2pCLE9BQU8sQ0FBQyxJQUFJLENBQUMsb0NBQW9DLENBQUMsQ0FBQztnQkFDbkQsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFDNUIsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ3pCLE9BQU8sVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQy9CLENBQUMsQ0FBQyxFQUNGLFFBQVEsQ0FBQyxHQUFHLEVBQUU7Z0JBQ1osOEJBQThCO1lBQ2hDLENBQUMsQ0FBQyxDQUNILENBQUM7U0FDSDtRQUVELElBQUksS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDbEQsT0FBTyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUM7Z0JBQ3RCLFVBQVUsRUFBRTtvQkFDVixhQUFhLEVBQUUsS0FBSztpQkFDckI7YUFDRixDQUFDLENBQUM7U0FDSjtRQUVELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQzlCLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ1osMkRBQTJEO1lBQzNELElBQUksS0FBSyxJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssQ0FBQyxPQUFPLEVBQUU7Z0JBQzlDLE1BQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO2dCQUNsRCxJQUFJLFFBQVEsRUFBRTtvQkFDWixZQUFZLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztpQkFDMUM7YUFDRjtRQUNILENBQUMsQ0FBQyxFQUNGLFFBQVEsQ0FBQyxHQUFHLEVBQUU7WUFDWiw4QkFBOEI7UUFDaEMsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7OzhHQXZEVSxnQkFBZ0I7a0hBQWhCLGdCQUFnQjs0RkFBaEIsZ0JBQWdCO2tCQUQ1QixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSnd0SGVscGVyU2VydmljZSB9IGZyb20gXCJAYXV0aDAvYW5ndWxhci1qd3RcIjtcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tIFwiQGFuZ3VsYXIvY29yZVwiO1xuaW1wb3J0IHsgSHR0cFJlcXVlc3QsIEh0dHBIYW5kbGVyLCBIdHRwRXZlbnQsIEh0dHBJbnRlcmNlcHRvciB9IGZyb20gXCJAYW5ndWxhci9jb21tb24vaHR0cFwiO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgZnJvbSwgdGhyb3dFcnJvciB9IGZyb20gXCJyeGpzXCI7XG5pbXBvcnQgeyBzd2l0Y2hNYXAsIGNhdGNoRXJyb3IsIGZpbmFsaXplLCB0YXAgfSBmcm9tIFwicnhqcy9vcGVyYXRvcnNcIjtcbmltcG9ydCB7IE1lbWJyc1NlcnZpY2UgfSBmcm9tIFwiLi9tZW1icnMuc2VydmljZVwiO1xuaW1wb3J0IHsgU3RhdGVTZXJ2aWNlIH0gZnJvbSBcIkB1aXJvdXRlci9hbmd1bGFyXCI7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBUb2tlbkludGVyY2VwdG9yIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBqd3RIZWxwZXI6IEp3dEhlbHBlclNlcnZpY2UsIHByaXZhdGUgbWVtYnJzU2VydmljZTogTWVtYnJzU2VydmljZSwgcHJpdmF0ZSBzdGF0ZVNlcnZpY2U6IFN0YXRlU2VydmljZSkge31cblxuICBpbnRlcmNlcHQocmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XG4gICAgY29uc3QgdG9rZW4gPSBsb2NhbFN0b3JhZ2UuZ2V0SXRlbShcIm1lbWJyc1wiKTtcblxuICAgIGlmICh0b2tlbiAmJiB0aGlzLmp3dEhlbHBlci5pc1Rva2VuRXhwaXJlZCh0b2tlbikpIHtcbiAgICAgIGNvbnNvbGUubG9nKFwiVG9rZW4gZXhwaXJlZC4gQXR0ZW1wdGluZyB0byByZWlzc3VlLlwiKTtcbiAgICAgIHJldHVybiBmcm9tKHRoaXMubWVtYnJzU2VydmljZS5yZWlzc3VlKCkpLnBpcGUoXG4gICAgICAgIHN3aXRjaE1hcCgoKSA9PiB7XG4gICAgICAgICAgY29uc3QgcmVmcmVzaGVkVG9rZW4gPSBsb2NhbFN0b3JhZ2UuZ2V0SXRlbShcIm1lbWJyc1wiKTtcbiAgICAgICAgICBpZiAocmVmcmVzaGVkVG9rZW4gJiYgIXRoaXMuand0SGVscGVyLmlzVG9rZW5FeHBpcmVkKHJlZnJlc2hlZFRva2VuKSkge1xuICAgICAgICAgICAgY29uc29sZS5sb2coXCJUb2tlbiBzdWNjZXNzZnVsbHkgcmVpc3N1ZWQuXCIpO1xuICAgICAgICAgICAgcmVxdWVzdCA9IHJlcXVlc3QuY2xvbmUoe1xuICAgICAgICAgICAgICBzZXRIZWFkZXJzOiB7XG4gICAgICAgICAgICAgICAgQXV0aG9yaXphdGlvbjogcmVmcmVzaGVkVG9rZW4sXG4gICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICB9KTtcbiAgICAgICAgICB9XG4gICAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpO1xuICAgICAgICB9KSxcbiAgICAgICAgY2F0Y2hFcnJvcigoZXJyKSA9PiB7XG4gICAgICAgICAgY29uc29sZS53YXJuKFwiVG9rZW4gcmVmcmVzaCBmYWlsZWQuIExvZ2dpbmcgb3V0LlwiKTtcbiAgICAgICAgICB0aGlzLm1lbWJyc1NlcnZpY2UubG9nb3V0KCk7XG4gICAgICAgICAgdGhpcy5zdGF0ZVNlcnZpY2UuZ28oXCJcIik7XG4gICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoKCkgPT4gZXJyKTtcbiAgICAgICAgfSksXG4gICAgICAgIGZpbmFsaXplKCgpID0+IHtcbiAgICAgICAgICAvLyB0aGlzLmJ1c3lTZXJ2aWNlLmZpbmlzaGVkKClcbiAgICAgICAgfSlcbiAgICAgICk7XG4gICAgfVxuXG4gICAgaWYgKHRva2VuICYmICF0aGlzLmp3dEhlbHBlci5pc1Rva2VuRXhwaXJlZCh0b2tlbikpIHtcbiAgICAgIHJlcXVlc3QgPSByZXF1ZXN0LmNsb25lKHtcbiAgICAgICAgc2V0SGVhZGVyczoge1xuICAgICAgICAgIEF1dGhvcml6YXRpb246IHRva2VuLFxuICAgICAgICB9LFxuICAgICAgfSk7XG4gICAgfVxuXG4gICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpLnBpcGUoXG4gICAgICB0YXAoKGV2ZW50KSA9PiB7XG4gICAgICAgIC8vIElmIHRoaXMgaXMgYW4gSHR0cFJlc3BvbnNlLCBjaGVjayBmb3IgeC1uZXctdG9rZW4gaGVhZGVyXG4gICAgICAgIGlmIChldmVudCAmJiBldmVudC50eXBlID09PSA0ICYmIGV2ZW50LmhlYWRlcnMpIHtcbiAgICAgICAgICBjb25zdCBuZXdUb2tlbiA9IGV2ZW50LmhlYWRlcnMuZ2V0KCd4LW5ldy10b2tlbicpO1xuICAgICAgICAgIGlmIChuZXdUb2tlbikge1xuICAgICAgICAgICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0oJ21lbWJycycsIG5ld1Rva2VuKTtcbiAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgIH0pLFxuICAgICAgZmluYWxpemUoKCkgPT4ge1xuICAgICAgICAvLyB0aGlzLmJ1c3lTZXJ2aWNlLmZpbmlzaGVkKClcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxufVxuIl19

package/esm2020/lib/membrs.module.mjs

@@ -36,7 +36,7 @@ export function reissueResolveFn(transition, router, membrsService, membrsConfig
             if (localStorage.getItem('redirectUrlAfterLogin')) {
                 const redirect = localStorage.getItem('redirectUrlAfterLogin');
                 localStorage.removeItem('redirectUrlAfterLogin');
-                window.location.href = redirect;
+                window.location.pathname = redirect;
             }
             else {
                 router.stateService.go(membrsConfig.defaultState, {}, { inherit: false });
@@ -55,6 +55,11 @@ export function validateResolveFn(transition, router, membrsService, membrsConfi
     return new Promise((resolve, reject) => {
         // console.log('validate promise resolve')
         membrsService.reissue().then((response) => {
+            if (localStorage.getItem('redirectUrlAfterLogin')) {
+                const redirect = localStorage.getItem('redirectUrlAfterLogin');
+                localStorage.removeItem('redirectUrlAfterLogin');
+                window.location.pathname = redirect;
+            }
             resolve(null);
         }).catch(error => {
             localStorage.setItem('redirectUrlAfterLogin', window.location.pathname);
@@ -98,8 +103,8 @@ export class MembrsModule {
         };
     }
 }
-MembrsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, imports: [CommonModule,
+MembrsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, imports: [CommonModule,
         HttpClientModule,
         JwtModule
         // JwtModule.forRoot({
@@ -113,7 +118,7 @@ MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "
         // }),
         // JwtModule.forRoot({})
     ] });
-MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, imports: [CommonModule,
+MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, imports: [CommonModule,
         HttpClientModule,
         JwtModule
         // JwtModule.forRoot({
@@ -127,7 +132,7 @@ MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "
         // }),
         // JwtModule.forRoot({})
     ] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
@@ -147,4 +152,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
                     ]
                 }]
         }] });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"membrs.module.js","sourceRoot":"","sources":["../../../../projects/membrs/src/lib/membrs.module.ts"],"names":[],"mappings":"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","sourcesContent":["import { NgModule, ModuleWithProviders, Injector } from '@angular/core';\nimport { CommonModule } from '@angular/common';\nimport { MembrsService } from './membrs.service';\nimport { JwtModule, JWT_OPTIONS } from \"@auth0/angular-jwt\";\nimport { HttpClientModule } from \"@angular/common/http\";\nimport { UIRouterModule } from '@uirouter/angular'\n\nimport { Ng2StateDeclaration } from '@uirouter/angular';\nimport { Transition, UIRouter } from '@uirouter/angular'\n\nimport { routerConfigFn } from './router.config';\nimport { MembrsConfig } from './config.interface';\nimport { MembrsConfigService } from './config.service';\nimport { retrieveToken } from './token';\n\nexport const validateResolve = {\n    token: 'reissue',\n    deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n    resolveFn: validateResolveFn\n}\n\nexport const reissueResolve = {\n  token: 'reissue',\n  deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n  resolveFn: reissueResolveFn\n}\n\nexport const reissueState:Ng2StateDeclaration = {\n\tname: 'reissue', \n\turl: '/reissue?token',\n\tviews: { },\n\tresolve: [\n    reissueResolve\n\t]\n}\n\nexport function reissueResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n    \n    //console.log(membrsService)\n    return new Promise((resolve, reject) => {\n      // console.log('reissue promise resolve')\n      // console.log(transition.params().token)\n      membrsService.reissue(transition.params().token).then((response)=>{\n          if(localStorage.getItem('redirectUrlAfterLogin')){\n            const redirect = localStorage.getItem('redirectUrlAfterLogin')\n            localStorage.removeItem('redirectUrlAfterLogin')\n            window.location.href = redirect\n          }else {\n            router.stateService.go(membrsConfig.defaultState, {}, {inherit:false})\n          }\n          reject()\n      }).catch(error=>{\n          //console.log('error in reissue resolve')\n          //console.log(error)\n          //window.location.href = environment.login\n          reject(error)\n      })\n\n\t})\n}\n\nexport function validateResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n  \n  //console.log(membrsService)\n  return new Promise((resolve, reject) => {\n    // console.log('validate promise resolve')\n    \n    membrsService.reissue().then((response)=>{\n      resolve(null)\n    }).catch(error=>{\n      localStorage.setItem('redirectUrlAfterLogin', window.location.pathname)\n      window.location.href = membrsConfig.login\n      reject(error)\n    })\n\n})\n}\n\nexport function jwtOptionsFactory(config) {\n  // console.log('jwt options factory')\n  // console.log(config)\n  return {\n    tokenGetter: () => {\n      console.log('token getter',  localStorage.getItem('membrs'))\n      return localStorage.getItem('membrs');\n    },\n    allowedDomains: [config.api]\n  }\n}\n\n\n/** The top level state(s) */\nexport const STATES = [\n    reissueState\n]\n\n\n@NgModule({\n  imports: [\n    CommonModule,\n    HttpClientModule,\n    JwtModule\n    // JwtModule.forRoot({\n    //   config: {\n    //     tokenGetter: retrieveToken\n    //   }\n    // })\n    // UIRouterModule.forChild({\n    //   states: STATES,\n    //   config: routerConfigFn,\n    // }),\n    // JwtModule.forRoot({})\n  ]\n})\n\n\n\nexport class MembrsModule { \n  static forRoot(config: MembrsConfig): ModuleWithProviders<MembrsModule> {\n\n\n    const moduleProviders = UIRouterModule.forChild({\n      states: STATES,\n      config: routerConfigFn\n    }).providers\n\n    moduleProviders.push(JwtModule.forRoot({\n      config: {\n        tokenGetter: retrieveToken,\n        allowedDomains: []\n      }\n    }).providers)\n      \n    moduleProviders.push(MembrsService)\n    moduleProviders.push({provide: MembrsConfigService,useValue: config});\n    \n   \n    return {\n      ngModule: MembrsModule, \n      providers: moduleProviders //[{provide: MembrsConfigService,useValue: config}]\n    };\n    \n  }\n\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"membrs.module.js","sourceRoot":"","sources":["../../../../projects/membrs/src/lib/membrs.module.ts"],"names":[],"mappings":"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","sourcesContent":["import { NgModule, ModuleWithProviders, Injector } from '@angular/core';\nimport { CommonModule } from '@angular/common';\nimport { MembrsService } from './membrs.service';\nimport { JwtModule, JWT_OPTIONS } from \"@auth0/angular-jwt\";\nimport { HttpClientModule } from \"@angular/common/http\";\nimport { UIRouterModule } from '@uirouter/angular'\n\nimport { Ng2StateDeclaration } from '@uirouter/angular';\nimport { Transition, UIRouter } from '@uirouter/angular'\n\nimport { routerConfigFn } from './router.config';\nimport { MembrsConfig } from './config.interface';\nimport { MembrsConfigService } from './config.service';\nimport { retrieveToken } from './token';\n\nexport const validateResolve = {\n    token: 'reissue',\n    deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n    resolveFn: validateResolveFn\n}\n\nexport const reissueResolve = {\n  token: 'reissue',\n  deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n  resolveFn: reissueResolveFn\n}\n\nexport const reissueState:Ng2StateDeclaration = {\n\tname: 'reissue', \n\turl: '/reissue?token',\n\tviews: { },\n\tresolve: [\n    reissueResolve\n\t]\n}\n\nexport function reissueResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n    \n    //console.log(membrsService)\n    return new Promise((resolve, reject) => {\n      // console.log('reissue promise resolve')\n      // console.log(transition.params().token)\n      membrsService.reissue(transition.params().token).then((response)=>{\n          if(localStorage.getItem('redirectUrlAfterLogin')){\n            const redirect = localStorage.getItem('redirectUrlAfterLogin')\n            localStorage.removeItem('redirectUrlAfterLogin')\n            window.location.pathname = redirect\n          }else {\n            router.stateService.go(membrsConfig.defaultState, {}, {inherit:false})\n          }\n          reject()\n      }).catch(error=>{\n          //console.log('error in reissue resolve')\n          //console.log(error)\n          //window.location.href = environment.login\n          reject(error)\n      })\n\n\t})\n}\n\nexport function validateResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n  \n  //console.log(membrsService)\n  return new Promise((resolve, reject) => {\n    // console.log('validate promise resolve')\n    \n    membrsService.reissue().then((response)=>{\n      if(localStorage.getItem('redirectUrlAfterLogin')){\n        const redirect = localStorage.getItem('redirectUrlAfterLogin')\n        localStorage.removeItem('redirectUrlAfterLogin')\n        window.location.pathname = redirect\n      }\n      resolve(null)\n    }).catch(error=>{\n      localStorage.setItem('redirectUrlAfterLogin', window.location.pathname)\n      window.location.href = membrsConfig.login\n      reject(error)\n    })\n\n})\n}\n\nexport function jwtOptionsFactory(config) {\n  // console.log('jwt options factory')\n  // console.log(config)\n  return {\n    tokenGetter: () => {\n      console.log('token getter',  localStorage.getItem('membrs'))\n      return localStorage.getItem('membrs');\n    },\n    allowedDomains: [config.api]\n  }\n}\n\n\n/** The top level state(s) */\nexport const STATES = [\n    reissueState\n]\n\n\n@NgModule({\n  imports: [\n    CommonModule,\n    HttpClientModule,\n    JwtModule\n    // JwtModule.forRoot({\n    //   config: {\n    //     tokenGetter: retrieveToken\n    //   }\n    // })\n    // UIRouterModule.forChild({\n    //   states: STATES,\n    //   config: routerConfigFn,\n    // }),\n    // JwtModule.forRoot({})\n  ]\n})\n\n\n\nexport class MembrsModule { \n  static forRoot(config: MembrsConfig): ModuleWithProviders<MembrsModule> {\n\n\n    const moduleProviders = UIRouterModule.forChild({\n      states: STATES,\n      config: routerConfigFn\n    }).providers\n\n    moduleProviders.push(JwtModule.forRoot({\n      config: {\n        tokenGetter: retrieveToken,\n        allowedDomains: []\n      }\n    }).providers)\n      \n    moduleProviders.push(MembrsService)\n    moduleProviders.push({provide: MembrsConfigService,useValue: config});\n    \n   \n    return {\n      ngModule: MembrsModule, \n      providers: moduleProviders //[{provide: MembrsConfigService,useValue: config}]\n    };\n    \n  }\n\n}\n"]}

package/esm2020/lib/membrs.service.mjs

@@ -9,6 +9,7 @@ export class MembrsService {
     constructor(http, config) {
         this.http = http;
         this.config = config;
+        this.decodedReady = new BehaviorSubject(null);
         this._lsKey = 'membrs';
         this._loggedInObservable = new BehaviorSubject(false);
         // console.log('membrs constructor')
@@ -18,41 +19,52 @@ export class MembrsService {
         }
     }
     reissue(token) {
+        console.log('Reissuing token...'); // Log function entry
         return new Promise((resolve, reject) => {
             if (!token && !this._token) {
+                console.log('No token provided and no token found.'); // Log missing token
                 reject('NOT_LOGGED_IN');
             }
-            if (token)
+            if (token) {
+                console.log(`Token provided: ${token}`); // Log provided token
                 this.token = token;
+            }
             // check stored token has not expired, or needs to be reissued soon
             var reissueIn = this._decoded.exp - Math.floor(Date.now() / 1000);
             // token has expired
             if (reissueIn < 0) {
+                console.log('Token has expired.'); // Log expired token
                 reject('NOT_LOGGED_IN');
             }
             // token expiring soon
             if (reissueIn < 300) {
+                console.log('Token expiring soon. Reissuing...'); // Log imminent expiration
                 this.http.post(this.config.apiProtocol + this.config.api + '/token/' + this._token, {}).subscribe((response) => {
                     if (response.token) {
                         this.token = response.token;
                         this._loggedInObservable.next(true);
+                        console.log('Token successfully reissued.'); // Log success
                         resolve(this._token);
                     }
                     else {
+                        console.log('Failed to reissue token.'); // Log failure
                         reject('NOT_LOGGED_IN');
                     }
-                }, error => {
+                }, (error) => {
+                    console.log('Error reissuing token:', error); // Log error details
                     reject('NOT_LOGGED_IN');
                 });
             }
             else {
                 this._loggedInObservable.next(true);
+                console.log('Token is valid. No need to reissue.'); // Log valid token
                 resolve(this._token);
             }
         });
     }
     set token(token) {
         this._token = token;
+        console.log('Token set.');
         localStorage.setItem(this._lsKey, token);
         this._decoded = jwtService.decodeToken(this._token);
     }
@@ -65,6 +77,14 @@ export class MembrsService {
     get profile() {
         return this._decoded;
     }
+    setProfile(decodedData) {
+        this._decoded = decodedData;
+        this.decodedReady.next(decodedData); // Emit the new value when profile is set
+        console.log(this.decodedReady);
+    }
+    get decodedReady$() {
+        return this.decodedReady.asObservable();
+    }
     get token() {
         return this._token;
     }
@@ -80,16 +100,19 @@ export class MembrsService {
                 this._token = null;
                 localStorage.removeItem(this._lsKey);
                 resolve(this.config.login);
-                //this.router.stateService.go('dashboard')
             }, error => {
-                reject(error);
+                // If the API call fails (e.g. token already invalid/expired), still clear local state
+                console.warn('Logout API call failed, clearing local token anyway', error);
+                this._token = null;
+                localStorage.removeItem(this._lsKey);
+                resolve(this.config.login);
             });
         });
     }
 }
-MembrsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsService, deps: [{ token: i1.HttpClient }, { token: MembrsConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
-MembrsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsService, decorators: [{
+MembrsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsService, deps: [{ token: i1.HttpClient }, { token: MembrsConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
+MembrsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -98,4 +121,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
                     type: Inject,
                     args: [MembrsConfigService]
                 }] }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtYnJzLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9tZW1icnMvc3JjL2xpYi9tZW1icnMuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV0RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUV0RCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sTUFBTSxDQUFDOzs7QUFDdkMsTUFBTSxVQUFVLEdBQUcsSUFBSSxnQkFBZ0IsRUFBRSxDQUFBO0FBT3pDLE1BQU0sT0FBTyxhQUFhO0lBT3hCLFlBQW9CLElBQWdCLEVBQXVDLE1BQW9CO1FBQTNFLFNBQUksR0FBSixJQUFJLENBQVk7UUFBdUMsV0FBTSxHQUFOLE1BQU0sQ0FBYztRQUgvRixXQUFNLEdBQVcsUUFBUSxDQUFDO1FBQzFCLHdCQUFtQixHQUE2QixJQUFJLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUl4RSxvQ0FBb0M7UUFDcEMsd0VBQXdFO1FBQ3hFLElBQUcsWUFBWSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUM7WUFDbkMsSUFBSSxDQUFDLEtBQUssR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQTtTQUMvQztJQUVILENBQUM7SUFFRCxPQUFPLENBQUMsS0FBYTtRQUVuQixPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBQyxFQUFFO1lBRXBDLElBQUcsQ0FBQyxLQUFLLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFDO2dCQUN4QixNQUFNLENBQUMsZUFBZSxDQUFDLENBQUE7YUFDeEI7WUFFRCxJQUFHLEtBQUs7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QyxVQUFVLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFBO2dCQUNwQyxPQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQTtnQkFDMUIsMENBQTBDO1lBQzVDLENBQUMsRUFBRSxLQUFLLENBQUEsRUFBRTtnQkFDUixNQUFNLENBQUMsS0FBSyxDQUFDLENBQUE7WUFDZixDQUFDLENBQUMsQ0FBQTtRQUNKLENBQUMsQ0FBQyxDQUFBO0lBRUosQ0FBQzs7MEdBeEdVLGFBQWEsNENBT3NCLG1CQUFtQjs4R0FQdEQsYUFBYSxjQUpaLE1BQU07MkZBSVAsYUFBYTtrQkFMekIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkI7OzBCQVV3QyxNQUFNOzJCQUFDLG1CQUFtQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUsIEluamVjdCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgSnd0SGVscGVyU2VydmljZSB9IGZyb20gJ0BhdXRoMC9hbmd1bGFyLWp3dCc7XG5pbXBvcnQgeyBIdHRwQ2xpZW50IH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnXG5pbXBvcnQgeyBNZW1icnNDb25maWdTZXJ2aWNlIH0gZnJvbSAnLi9jb25maWcuc2VydmljZSdcbmltcG9ydCB7IE1lbWJyc0NvbmZpZyB9IGZyb20gJy4vY29uZmlnLmludGVyZmFjZSc7XG5pbXBvcnQgeyBCZWhhdmlvclN1YmplY3QgfSBmcm9tICdyeGpzJztcbmNvbnN0IGp3dFNlcnZpY2UgPSBuZXcgSnd0SGVscGVyU2VydmljZSgpXG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuXG5cbmV4cG9ydCBjbGFzcyBNZW1icnNTZXJ2aWNlIHtcblxuICBfdG9rZW46IHN0cmluZztcbiAgX2RlY29kZWQ6IGFueTtcbiAgX2xzS2V5OiBzdHJpbmcgPSAnbWVtYnJzJztcbiAgX2xvZ2dlZEluT2JzZXJ2YWJsZTogQmVoYXZpb3JTdWJqZWN0PEJvb2xlYW4+ID0gbmV3IEJlaGF2aW9yU3ViamVjdChmYWxzZSlcblxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIGh0dHA6IEh0dHBDbGllbnQsIEBJbmplY3QoTWVtYnJzQ29uZmlnU2VydmljZSkgcHJpdmF0ZSBjb25maWc6IE1lbWJyc0NvbmZpZykge1xuXG4gICAgLy8gY29uc29sZS5sb2coJ21lbWJycyBjb25zdHJ1Y3RvcicpXG4gICAgLy8gaWYgdGhlIHRva2VuIGV4aXN0cyBpbiBsb2NhbCBzdG9yYWdlLCByZXRyaWV2ZSBpdCBiYWNrIHRvIHRoZSBzZXJ2aWNlXG4gICAgaWYobG9jYWxTdG9yYWdlLmdldEl0ZW0odGhpcy5fbHNLZXkpKXtcbiAgICAgIHRoaXMudG9rZW4gPSBsb2NhbFN0b3JhZ2UuZ2V0SXRlbSh0aGlzLl9sc0tleSlcbiAgICB9XG4gIFxuICB9XG5cbiAgcmVpc3N1ZSh0b2tlbj86c3RyaW5nKXtcblxuICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KT0+e1xuXG4gICAgICBpZighdG9rZW4gJiYgIXRoaXMuX3Rva2VuKXtcbiAgICAgICAgcmVqZWN0KCdOT1RfTE9HR0VEX0lOJylcbiAgICAgIH1cblxuICAgICAgaWYodG9rZW4pXG4gICAgICAgIHRoaXMudG9rZW4gPSB0b2tlblxuXG4gICAgICAvLyBjaGVjayBzdG9yZWQgdG9rZW4gaGFzIG5vdCBleHBpcmVkLCBvciBuZWVkcyB0byBiZSByZWlzc3VlZCBzb29uXG4gICAgICB2YXIgcmVpc3N1ZUluID0gdGhpcy5fZGVjb2RlZC5leHAgLSBNYXRoLmZsb29yKERhdGUubm93KCkvMTAwMClcblxuICAgICAgLy8gdG9rZW4gaGFzIGV4cGlyZWRcbiAgICAgIGlmKHJlaXNzdWVJbiA8IDApe1xuICAgICAgICByZWplY3QoJ05PVF9MT0dHRURfSU4nKVxuICAgICAgfVxuICAgICAgXG4gICAgICAvLyB0b2tlbiBleHBpcmluZyBzb29uXG4gICAgICBpZihyZWlzc3VlSW4gPCAzMDApe1xuXG4gICAgICAgIHRoaXMuaHR0cC5wb3N0KHRoaXMuY29uZmlnLmFwaVByb3RvY29sICsgdGhpcy5jb25maWcuYXBpKycvdG9rZW4vJyt0aGlzLl90b2tlbiwge30pLnN1YnNjcmliZSgocmVzcG9uc2U6YW55KT0+e1xuXG4gICAgICAgICAgaWYocmVzcG9uc2UudG9rZW4pe1xuICAgICAgICAgICAgdGhpcy50b2tlbiA9IHJlc3BvbnNlLnRva2VuXG4gICAgICAgICAgICB0aGlzLl9sb2dnZWRJbk9ic2VydmFibGUubmV4dCh0cnVlKVxuICAgICAgICAgICAgcmVzb2x2ZSh0aGlzLl90b2tlbilcbiAgICAgICAgICB9ZWxzZSB7XG4gICAgICAgICAgICByZWplY3QoJ05PVF9MT0dHRURfSU4nKVxuICAgICAgICAgIH1cbiAgICAgICAgICBcbiAgICAgICAgfSwgZXJyb3I9PntcbiAgICAgICAgICByZWplY3QoJ05PVF9MT0dHRURfSU4nKVxuICAgICAgICB9KVxuXG4gICAgICB9ZWxzZSB7XG4gICAgICAgIHRoaXMuX2xvZ2dlZEluT2JzZXJ2YWJsZS5uZXh0KHRydWUpXG4gICAgICAgIHJlc29sdmUodGhpcy5fdG9rZW4pXG4gICAgICB9XG4gICAgICBcbiAgICB9KVxuICAgIFxuICB9XG5cbiAgc2V0IHRva2VuKHRva2VuKXtcbiAgICB0aGlzLl90b2tlbiA9IHRva2VuXG4gICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0odGhpcy5fbHNLZXksIHRva2VuKVxuICAgIHRoaXMuX2RlY29kZWQgPSBqd3RTZXJ2aWNlLmRlY29kZVRva2VuKHRoaXMuX3Rva2VuKVxuICB9XG5cbiAgZGVsZXRlVG9rZW4oKXtcbiAgICBsb2NhbFN0b3JhZ2UucmVtb3ZlSXRlbSh0aGlzLl9sc0tleSlcbiAgfVxuXG4gIGlzTG9nZ2VkSW4oKXtcbiAgICByZXR1cm4gdGhpcy50b2tlbiA/IHRydWUgOiBmYWxzZVxuICB9XG5cbiAgZ2V0IHByb2ZpbGUoKXtcbiAgICByZXR1cm4gdGhpcy5fZGVjb2RlZFxuICB9XG5cbiAgZ2V0IHRva2VuKCl7XG4gICAgcmV0dXJuIHRoaXMuX3Rva2VuXG4gIH1cblxuICBnZXQgYWRtaW4gKCl7XG4gICAgcmV0dXJuIHRoaXMucHJvZmlsZS5wZXJtaXNzaW9uID09IDFcbiAgfVxuXG4gIGdldCBpc0xvZ2dlZEluT2JzZXJ2YWJsZSgpe1xuICAgIHJldHVybiB0aGlzLl9sb2dnZWRJbk9ic2VydmFibGVcbiAgfVxuICBcbiAgbG9nb3V0KCl7XG4gICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpPT57XG4gICAgICB0aGlzLmh0dHAuZGVsZXRlKHRoaXMuY29uZmlnLmFwaVByb3RvY29sK3RoaXMuY29uZmlnLmFwaSsnL3Rva2VuLycrdGhpcy5fdG9rZW4pLnN1YnNjcmliZSgocmVzcG9uc2U6YW55KT0+e1xuICAgICAgICB0aGlzLl90b2tlbiA9IG51bGw7XG4gICAgICAgIGxvY2FsU3RvcmFnZS5yZW1vdmVJdGVtKHRoaXMuX2xzS2V5KVxuICAgICAgICByZXNvbHZlKHRoaXMuY29uZmlnLmxvZ2luKVxuICAgICAgICAvL3RoaXMucm91dGVyLnN0YXRlU2VydmljZS5nbygnZGFzaGJvYXJkJylcbiAgICAgIH0sIGVycm9yPT57XG4gICAgICAgIHJlamVjdChlcnJvcilcbiAgICAgIH0pXG4gICAgfSlcbiAgICBcbiAgfVxuXG5cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"membrs.service.js","sourceRoot":"","sources":["../../../../projects/membrs/src/lib/membrs.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Inject } from '@angular/core';\nimport { JwtHelperService } from '@auth0/angular-jwt';\nimport { HttpClient } from '@angular/common/http'\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\nimport { BehaviorSubject } from 'rxjs';\nconst jwtService = new JwtHelperService()\n\n@Injectable({\n  providedIn: 'root'\n})\n\n\nexport class MembrsService {\n\n  _token: string;\n  _decoded: any;\n\n  public decodedReady = new BehaviorSubject<any>(null);\n\n  _lsKey: string = 'membrs';\n  _loggedInObservable: BehaviorSubject<Boolean> = new BehaviorSubject(false)\n\n  constructor(private http: HttpClient, @Inject(MembrsConfigService) private config: MembrsConfig) {\n\n    // console.log('membrs constructor')\n    // if the token exists in local storage, retrieve it back to the service\n    if(localStorage.getItem(this._lsKey)){\n      this.token = localStorage.getItem(this._lsKey)\n    }\n  \n  }\n\n  reissue(token?: string) {\n    console.log('Reissuing token...'); // Log function entry\n    \n    return new Promise((resolve, reject) => {\n      if (!token && !this._token) {\n        console.log('No token provided and no token found.'); // Log missing token\n        reject('NOT_LOGGED_IN');\n      }\n  \n      if (token) {\n        console.log(`Token provided: ${token}`); // Log provided token\n        this.token = token;\n      }\n  \n      // check stored token has not expired, or needs to be reissued soon\n      var reissueIn = this._decoded.exp - Math.floor(Date.now() / 1000);\n  \n      // token has expired\n      if (reissueIn < 0) {\n        console.log('Token has expired.'); // Log expired token\n        reject('NOT_LOGGED_IN');\n      }\n  \n      // token expiring soon\n      if (reissueIn < 300) {\n        console.log('Token expiring soon. Reissuing...'); // Log imminent expiration\n        this.http.post(this.config.apiProtocol + this.config.api + '/token/' + this._token, {}).subscribe(\n          (response: any) => {\n            if (response.token) {\n              this.token = response.token;\n              this._loggedInObservable.next(true);\n              console.log('Token successfully reissued.'); // Log success\n              resolve(this._token);\n            } else {\n              console.log('Failed to reissue token.'); // Log failure\n              reject('NOT_LOGGED_IN');\n            }\n          },\n          (error) => {\n            console.log('Error reissuing token:', error); // Log error details\n            reject('NOT_LOGGED_IN');\n          }\n        );\n      } else {\n        this._loggedInObservable.next(true);\n        console.log('Token is valid. No need to reissue.'); // Log valid token\n        resolve(this._token);\n      }\n    });\n  }\n  \n\n  set token(token){\n    this._token = token\n    console.log('Token set.');\n    localStorage.setItem(this._lsKey, token)\n    this._decoded = jwtService.decodeToken(this._token)\n  }\n\n  deleteToken(){\n    localStorage.removeItem(this._lsKey)\n  }\n\n  isLoggedIn(){\n    return this.token ? true : false\n  }\n\n  get profile(){\n    return this._decoded\n  }\n\n  setProfile(decodedData) {\n    this._decoded = decodedData;\n    this.decodedReady.next(decodedData); // Emit the new value when profile is set\n    console.log(this.decodedReady);\n  }\n\n  get decodedReady$() {\n    return this.decodedReady.asObservable();\n  }\n\n  get token(){\n    return this._token\n  }\n\n  get admin (){\n    return this.profile.permission == 1\n  }\n\n  get isLoggedInObservable(){\n    return this._loggedInObservable\n  }\n  \n  logout(){\n    return new Promise((resolve, reject)=>{\n      this.http.delete(this.config.apiProtocol + this.config.api + '/token/' + this._token).subscribe((response:any)=>{\n        this._token = null;\n        localStorage.removeItem(this._lsKey);\n        resolve(this.config.login);\n      }, error => {\n        // If the API call fails (e.g. token already invalid/expired), still clear local state\n        console.warn('Logout API call failed, clearing local token anyway', error);\n        this._token = null;\n        localStorage.removeItem(this._lsKey);\n        resolve(this.config.login);\n      });\n    });\n  }\n\n\n}\n"]}

package/esm2020/lib/router.config.mjs

@@ -6,8 +6,6 @@ export function routerConfigFn(router, injector) {
     const config = injector.get(MembrsConfigService);
     const membrsService = injector.get(MembrsService);
     stateService.defaultErrorHandler(function (error) {
-        console.log('Default error handler - Membrs Angular Helper');
-        console.log(error);
         if (error.detail == 'NOT_LOGGED_IN') {
             membrsService.deleteToken();
             window.location.href = config.login;
@@ -16,4 +14,4 @@ export function routerConfigFn(router, injector) {
             stateService.go(config.defaultState);
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL21lbWJycy9zcmMvbGliL3JvdXRlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFHdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRWpELE1BQU0sVUFBVSxjQUFjLENBQUMsTUFBZ0IsRUFBRSxRQUFrQjtJQUVqRSxNQUFNLGlCQUFpQixHQUFHLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQztJQUNuRCxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFBO0lBQ3hDLE1BQU0sTUFBTSxHQUFnQixRQUFRLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLENBQUE7SUFDN0QsTUFBTSxhQUFhLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUVqRCxZQUFZLENBQUMsbUJBQW1CLENBQUMsVUFBUyxLQUFLO1FBRS9DLE9BQU8sQ0FBQyxHQUFHLENBQUMsK0NBQStDLENBQUMsQ0FBQTtRQUM1RCxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBRWxCLElBQUcsS0FBSyxDQUFDLE1BQU0sSUFBSSxlQUFlLEVBQUM7WUFDbEMsYUFBYSxDQUFDLFdBQVcsRUFBRSxDQUFBO1lBQzNCLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUM7U0FDcEM7UUFFRCxJQUFHLEtBQUssQ0FBQyxNQUFNLElBQUksMEJBQTBCO1lBQzVDLFlBQVksQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBRXRDLENBQUMsQ0FBQyxDQUFDO0FBRUosQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFVJUm91dGVyIH0gZnJvbSAnQHVpcm91dGVyL2NvcmUnO1xuaW1wb3J0IHsgTWVtYnJzQ29uZmlnU2VydmljZSB9IGZyb20gJy4vY29uZmlnLnNlcnZpY2UnXG5pbXBvcnQgeyBNZW1icnNDb25maWcgfSBmcm9tICcuL2NvbmZpZy5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgSW5qZWN0b3IgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE1lbWJyc1NlcnZpY2UgfSBmcm9tICcuL21lbWJycy5zZXJ2aWNlJztcblxuZXhwb3J0IGZ1bmN0aW9uIHJvdXRlckNvbmZpZ0ZuKHJvdXRlcjogVUlSb3V0ZXIsIGluamVjdG9yOiBJbmplY3Rvcikge1xuXG4gIGNvbnN0IHRyYW5zaXRpb25TZXJ2aWNlID0gcm91dGVyLnRyYW5zaXRpb25TZXJ2aWNlO1xuICBjb25zdCBzdGF0ZVNlcnZpY2UgPSByb3V0ZXIuc3RhdGVTZXJ2aWNlXG4gIGNvbnN0IGNvbmZpZzpNZW1icnNDb25maWcgPSBpbmplY3Rvci5nZXQoTWVtYnJzQ29uZmlnU2VydmljZSlcbiAgY29uc3QgbWVtYnJzU2VydmljZSA9IGluamVjdG9yLmdldChNZW1icnNTZXJ2aWNlKVxuXG4gXHRzdGF0ZVNlcnZpY2UuZGVmYXVsdEVycm9ySGFuZGxlcihmdW5jdGlvbihlcnJvcikge1xuXHRcdCBcblx0XHRjb25zb2xlLmxvZygnRGVmYXVsdCBlcnJvciBoYW5kbGVyIC0gTWVtYnJzIEFuZ3VsYXIgSGVscGVyJylcblx0XHRjb25zb2xlLmxvZyhlcnJvcilcblx0XHRcdFxuXHRcdGlmKGVycm9yLmRldGFpbCA9PSAnTk9UX0xPR0dFRF9JTicpe1xuXHRcdFx0bWVtYnJzU2VydmljZS5kZWxldGVUb2tlbigpXG5cdFx0XHR3aW5kb3cubG9jYXRpb24uaHJlZiA9IGNvbmZpZy5sb2dpbjtcblx0XHR9XG5cblx0XHRpZihlcnJvci5kZXRhaWwgPT0gJ0lOU1VGRklDSUVOVF9QRVJNSVNTSU9OUycpXG5cdFx0XHRzdGF0ZVNlcnZpY2UuZ28oY29uZmlnLmRlZmF1bHRTdGF0ZSlcblxuXHR9KTtcblx0XG59Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL21lbWJycy9zcmMvbGliL3JvdXRlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFHdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRWpELE1BQU0sVUFBVSxjQUFjLENBQUMsTUFBZ0IsRUFBRSxRQUFrQjtJQUVqRSxNQUFNLGlCQUFpQixHQUFHLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQztJQUNuRCxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFBO0lBQ3hDLE1BQU0sTUFBTSxHQUFnQixRQUFRLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLENBQUE7SUFDN0QsTUFBTSxhQUFhLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUVqRCxZQUFZLENBQUMsbUJBQW1CLENBQUMsVUFBUyxLQUFLO1FBRS9DLElBQUcsS0FBSyxDQUFDLE1BQU0sSUFBSSxlQUFlLEVBQUM7WUFDbEMsYUFBYSxDQUFDLFdBQVcsRUFBRSxDQUFBO1lBQzNCLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUM7U0FDcEM7UUFFRCxJQUFHLEtBQUssQ0FBQyxNQUFNLElBQUksMEJBQTBCO1lBQzVDLFlBQVksQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBRXRDLENBQUMsQ0FBQyxDQUFDO0FBRUosQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFVJUm91dGVyIH0gZnJvbSAnQHVpcm91dGVyL2NvcmUnO1xuaW1wb3J0IHsgTWVtYnJzQ29uZmlnU2VydmljZSB9IGZyb20gJy4vY29uZmlnLnNlcnZpY2UnXG5pbXBvcnQgeyBNZW1icnNDb25maWcgfSBmcm9tICcuL2NvbmZpZy5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgSW5qZWN0b3IgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE1lbWJyc1NlcnZpY2UgfSBmcm9tICcuL21lbWJycy5zZXJ2aWNlJztcblxuZXhwb3J0IGZ1bmN0aW9uIHJvdXRlckNvbmZpZ0ZuKHJvdXRlcjogVUlSb3V0ZXIsIGluamVjdG9yOiBJbmplY3Rvcikge1xuXG4gIGNvbnN0IHRyYW5zaXRpb25TZXJ2aWNlID0gcm91dGVyLnRyYW5zaXRpb25TZXJ2aWNlO1xuICBjb25zdCBzdGF0ZVNlcnZpY2UgPSByb3V0ZXIuc3RhdGVTZXJ2aWNlXG4gIGNvbnN0IGNvbmZpZzpNZW1icnNDb25maWcgPSBpbmplY3Rvci5nZXQoTWVtYnJzQ29uZmlnU2VydmljZSlcbiAgY29uc3QgbWVtYnJzU2VydmljZSA9IGluamVjdG9yLmdldChNZW1icnNTZXJ2aWNlKVxuXG4gXHRzdGF0ZVNlcnZpY2UuZGVmYXVsdEVycm9ySGFuZGxlcihmdW5jdGlvbihlcnJvcikge1xuXHRcdCBcdFxuXHRcdGlmKGVycm9yLmRldGFpbCA9PSAnTk9UX0xPR0dFRF9JTicpe1xuXHRcdFx0bWVtYnJzU2VydmljZS5kZWxldGVUb2tlbigpXG5cdFx0XHR3aW5kb3cubG9jYXRpb24uaHJlZiA9IGNvbmZpZy5sb2dpbjtcblx0XHR9XG5cblx0XHRpZihlcnJvci5kZXRhaWwgPT0gJ0lOU1VGRklDSUVOVF9QRVJNSVNTSU9OUycpXG5cdFx0XHRzdGF0ZVNlcnZpY2UuZ28oY29uZmlnLmRlZmF1bHRTdGF0ZSlcblxuXHR9KTtcblx0XG59Il19

package/fesm2015/nakedcreativity-membrs-angular-helper.mjs

@@ -1,12 +1,14 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject, NgModule } from '@angular/core';
+import * as i1$1 from '@auth0/angular-jwt';
 import { JwtHelperService, JwtModule } from '@auth0/angular-jwt';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, from, throwError } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpClientModule } from '@angular/common/http';
 import { CommonModule } from '@angular/common';
+import * as i3 from '@uirouter/angular';
 import { Transition, UIRouter, UIRouterModule } from '@uirouter/angular';
-import { finalize } from 'rxjs/operators';
+import { switchMap, catchError, finalize, tap } from 'rxjs/operators';
 
 /**
  * This is not a real service, but it looks like it from the outside.
@@ -19,6 +21,7 @@ class MembrsService {
     constructor(http, config) {
         this.http = http;
         this.config = config;
+        this.decodedReady = new BehaviorSubject(null);
         this._lsKey = 'membrs';
         this._loggedInObservable = new BehaviorSubject(false);
         // console.log('membrs constructor')
@@ -28,41 +31,52 @@ class MembrsService {
         }
     }
     reissue(token) {
+        console.log('Reissuing token...'); // Log function entry
         return new Promise((resolve, reject) => {
             if (!token && !this._token) {
+                console.log('No token provided and no token found.'); // Log missing token
                 reject('NOT_LOGGED_IN');
             }
-            if (token)
+            if (token) {
+                console.log(`Token provided: ${token}`); // Log provided token
                 this.token = token;
+            }
             // check stored token has not expired, or needs to be reissued soon
             var reissueIn = this._decoded.exp - Math.floor(Date.now() / 1000);
             // token has expired
             if (reissueIn < 0) {
+                console.log('Token has expired.'); // Log expired token
                 reject('NOT_LOGGED_IN');
             }
             // token expiring soon
             if (reissueIn < 300) {
+                console.log('Token expiring soon. Reissuing...'); // Log imminent expiration
                 this.http.post(this.config.apiProtocol + this.config.api + '/token/' + this._token, {}).subscribe((response) => {
                     if (response.token) {
                         this.token = response.token;
                         this._loggedInObservable.next(true);
+                        console.log('Token successfully reissued.'); // Log success
                         resolve(this._token);
                     }
                     else {
+                        console.log('Failed to reissue token.'); // Log failure
                         reject('NOT_LOGGED_IN');
                     }
-                }, error => {
+                }, (error) => {
+                    console.log('Error reissuing token:', error); // Log error details
                     reject('NOT_LOGGED_IN');
                 });
             }
             else {
                 this._loggedInObservable.next(true);
+                console.log('Token is valid. No need to reissue.'); // Log valid token
                 resolve(this._token);
             }
         });
     }
     set token(token) {
         this._token = token;
+        console.log('Token set.');
         localStorage.setItem(this._lsKey, token);
         this._decoded = jwtService.decodeToken(this._token);
     }
@@ -75,6 +89,14 @@ class MembrsService {
     get profile() {
         return this._decoded;
     }
+    setProfile(decodedData) {
+        this._decoded = decodedData;
+        this.decodedReady.next(decodedData); // Emit the new value when profile is set
+        console.log(this.decodedReady);
+    }
+    get decodedReady$() {
+        return this.decodedReady.asObservable();
+    }
     get token() {
         return this._token;
     }
@@ -90,16 +112,19 @@ class MembrsService {
                 this._token = null;
                 localStorage.removeItem(this._lsKey);
                 resolve(this.config.login);
-                //this.router.stateService.go('dashboard')
             }, error => {
-                reject(error);
+                // If the API call fails (e.g. token already invalid/expired), still clear local state
+                console.warn('Logout API call failed, clearing local token anyway', error);
+                this._token = null;
+                localStorage.removeItem(this._lsKey);
+                resolve(this.config.login);
             });
         });
     }
 }
-MembrsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsService, deps: [{ token: i1.HttpClient }, { token: MembrsConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
-MembrsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsService, decorators: [{
+MembrsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsService, deps: [{ token: i1.HttpClient }, { token: MembrsConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
+MembrsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -117,8 +142,6 @@ function routerConfigFn(router, injector) {
     const config = injector.get(MembrsConfigService);
     const membrsService = injector.get(MembrsService);
     stateService.defaultErrorHandler(function (error) {
-        console.log('Default error handler - Membrs Angular Helper');
-        console.log(error);
         if (error.detail == 'NOT_LOGGED_IN') {
             membrsService.deleteToken();
             window.location.href = config.login;
@@ -160,7 +183,7 @@ function reissueResolveFn(transition, router, membrsService, membrsConfig) {
             if (localStorage.getItem('redirectUrlAfterLogin')) {
                 const redirect = localStorage.getItem('redirectUrlAfterLogin');
                 localStorage.removeItem('redirectUrlAfterLogin');
-                window.location.href = redirect;
+                window.location.pathname = redirect;
             }
             else {
                 router.stateService.go(membrsConfig.defaultState, {}, { inherit: false });
@@ -179,6 +202,11 @@ function validateResolveFn(transition, router, membrsService, membrsConfig) {
     return new Promise((resolve, reject) => {
         // console.log('validate promise resolve')
         membrsService.reissue().then((response) => {
+            if (localStorage.getItem('redirectUrlAfterLogin')) {
+                const redirect = localStorage.getItem('redirectUrlAfterLogin');
+                localStorage.removeItem('redirectUrlAfterLogin');
+                window.location.pathname = redirect;
+            }
             resolve(null);
         }).catch(error => {
             localStorage.setItem('redirectUrlAfterLogin', window.location.pathname);
@@ -222,8 +250,8 @@ class MembrsModule {
         };
     }
 }
-MembrsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, imports: [CommonModule,
+MembrsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, imports: [CommonModule,
         HttpClientModule,
         JwtModule
         // JwtModule.forRoot({
@@ -237,7 +265,7 @@ MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "
         // }),
         // JwtModule.forRoot({})
     ] });
-MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, imports: [CommonModule,
+MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, imports: [CommonModule,
         HttpClientModule,
         JwtModule
         // JwtModule.forRoot({
@@ -251,7 +279,7 @@ MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "
         // }),
         // JwtModule.forRoot({})
     ] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
@@ -273,25 +301,60 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
         }] });
 
 class TokenInterceptor {
-    constructor() { }
+    constructor(jwtHelper, membrsService, stateService) {
+        this.jwtHelper = jwtHelper;
+        this.membrsService = membrsService;
+        this.stateService = stateService;
+    }
     intercept(request, next) {
-        console.log('intercept request', localStorage.getItem('membrs'));
-        //this.busyService.busy()
-        request = request.clone({
-            setHeaders: {
-                Authorization: localStorage.getItem('membrs')
+        const token = localStorage.getItem("membrs");
+        if (token && this.jwtHelper.isTokenExpired(token)) {
+            console.log("Token expired. Attempting to reissue.");
+            return from(this.membrsService.reissue()).pipe(switchMap(() => {
+                const refreshedToken = localStorage.getItem("membrs");
+                if (refreshedToken && !this.jwtHelper.isTokenExpired(refreshedToken)) {
+                    console.log("Token successfully reissued.");
+                    request = request.clone({
+                        setHeaders: {
+                            Authorization: refreshedToken,
+                        },
+                    });
+                }
+                return next.handle(request);
+            }), catchError((err) => {
+                console.warn("Token refresh failed. Logging out.");
+                this.membrsService.logout();
+                this.stateService.go("");
+                return throwError(() => err);
+            }), finalize(() => {
+                // this.busyService.finished()
+            }));
+        }
+        if (token && !this.jwtHelper.isTokenExpired(token)) {
+            request = request.clone({
+                setHeaders: {
+                    Authorization: token,
+                },
+            });
+        }
+        return next.handle(request).pipe(tap((event) => {
+            // If this is an HttpResponse, check for x-new-token header
+            if (event && event.type === 4 && event.headers) {
+                const newToken = event.headers.get('x-new-token');
+                if (newToken) {
+                    localStorage.setItem('membrs', newToken);
+                }
             }
-        });
-        return next.handle(request).pipe(finalize(() => {
-            //this.busyService.finished()
+        }), finalize(() => {
+            // this.busyService.finished()
         }));
     }
 }
-TokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TokenInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-TokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TokenInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TokenInterceptor, decorators: [{
+TokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenInterceptor, deps: [{ token: i1$1.JwtHelperService }, { token: MembrsService }, { token: i3.StateService }], target: i0.ɵɵFactoryTarget.Injectable });
+TokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenInterceptor, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return []; } });
+        }], ctorParameters: function () { return [{ type: i1$1.JwtHelperService }, { type: MembrsService }, { type: i3.StateService }]; } });
 
 /**
  * Generated bundle index. Do not edit.

package/fesm2015/nakedcreativity-membrs-angular-helper.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"nakedcreativity-membrs-angular-helper.mjs","sources":["../../../projects/membrs/src/lib/config.service.ts","../../../projects/membrs/src/lib/membrs.service.ts","../../../projects/membrs/src/lib/router.config.ts","../../../projects/membrs/src/lib/token.ts","../../../projects/membrs/src/lib/membrs.module.ts","../../../projects/membrs/src/lib/auth.interceptor.ts","../../../projects/membrs/src/nakedcreativity-membrs-angular-helper.ts"],"sourcesContent":["import { InjectionToken } from '@angular/core';\nimport { MembrsConfig } from './config.interface';\n\n/**\n * This is not a real service, but it looks like it from the outside.\n * It's just an InjectionTToken used to import the config object, provided from the outside\n */\nexport const MembrsConfigService = new InjectionToken<MembrsConfig>(\"MembrsConfig\");\n","import { Injectable, Inject } from '@angular/core';\nimport { JwtHelperService } from '@auth0/angular-jwt';\nimport { HttpClient } from '@angular/common/http'\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\nimport { BehaviorSubject } from 'rxjs';\nconst jwtService = new JwtHelperService()\n\n@Injectable({\n  providedIn: 'root'\n})\n\n\nexport class MembrsService {\n\n  _token: string;\n  _decoded: any;\n  _lsKey: string = 'membrs';\n  _loggedInObservable: BehaviorSubject<Boolean> = new BehaviorSubject(false)\n\n  constructor(private http: HttpClient, @Inject(MembrsConfigService) private config: MembrsConfig) {\n\n    // console.log('membrs constructor')\n    // if the token exists in local storage, retrieve it back to the service\n    if(localStorage.getItem(this._lsKey)){\n      this.token = localStorage.getItem(this._lsKey)\n    }\n  \n  }\n\n  reissue(token?:string){\n\n    return new Promise((resolve, reject)=>{\n\n      if(!token && !this._token){\n        reject('NOT_LOGGED_IN')\n      }\n\n      if(token)\n        this.token = token\n\n      // check stored token has not expired, or needs to be reissued soon\n      var reissueIn = this._decoded.exp - Math.floor(Date.now()/1000)\n\n      // token has expired\n      if(reissueIn < 0){\n        reject('NOT_LOGGED_IN')\n      }\n      \n      // token expiring soon\n      if(reissueIn < 300){\n\n        this.http.post(this.config.apiProtocol + this.config.api+'/token/'+this._token, {}).subscribe((response:any)=>{\n\n          if(response.token){\n            this.token = response.token\n            this._loggedInObservable.next(true)\n            resolve(this._token)\n          }else {\n            reject('NOT_LOGGED_IN')\n          }\n          \n        }, error=>{\n          reject('NOT_LOGGED_IN')\n        })\n\n      }else {\n        this._loggedInObservable.next(true)\n        resolve(this._token)\n      }\n      \n    })\n    \n  }\n\n  set token(token){\n    this._token = token\n    localStorage.setItem(this._lsKey, token)\n    this._decoded = jwtService.decodeToken(this._token)\n  }\n\n  deleteToken(){\n    localStorage.removeItem(this._lsKey)\n  }\n\n  isLoggedIn(){\n    return this.token ? true : false\n  }\n\n  get profile(){\n    return this._decoded\n  }\n\n  get token(){\n    return this._token\n  }\n\n  get admin (){\n    return this.profile.permission == 1\n  }\n\n  get isLoggedInObservable(){\n    return this._loggedInObservable\n  }\n  \n  logout(){\n    return new Promise((resolve, reject)=>{\n      this.http.delete(this.config.apiProtocol+this.config.api+'/token/'+this._token).subscribe((response:any)=>{\n        this._token = null;\n        localStorage.removeItem(this._lsKey)\n        resolve(this.config.login)\n        //this.router.stateService.go('dashboard')\n      }, error=>{\n        reject(error)\n      })\n    })\n    \n  }\n\n\n}\n","import { UIRouter } from '@uirouter/core';\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\nimport { Injector } from '@angular/core';\nimport { MembrsService } from './membrs.service';\n\nexport function routerConfigFn(router: UIRouter, injector: Injector) {\n\n  const transitionService = router.transitionService;\n  const stateService = router.stateService\n  const config:MembrsConfig = injector.get(MembrsConfigService)\n  const membrsService = injector.get(MembrsService)\n\n \tstateService.defaultErrorHandler(function(error) {\n\t\t \n\t\tconsole.log('Default error handler - Membrs Angular Helper')\n\t\tconsole.log(error)\n\t\t\t\n\t\tif(error.detail == 'NOT_LOGGED_IN'){\n\t\t\tmembrsService.deleteToken()\n\t\t\twindow.location.href = config.login;\n\t\t}\n\n\t\tif(error.detail == 'INSUFFICIENT_PERMISSIONS')\n\t\t\tstateService.go(config.defaultState)\n\n\t});\n\t\n}","export function retrieveToken() {\n    // console.log('retrieve from ls')\n    return localStorage.getItem('membrs');\n}","import { NgModule, ModuleWithProviders, Injector } from '@angular/core';\nimport { CommonModule } from '@angular/common';\nimport { MembrsService } from './membrs.service';\nimport { JwtModule, JWT_OPTIONS } from \"@auth0/angular-jwt\";\nimport { HttpClientModule } from \"@angular/common/http\";\nimport { UIRouterModule } from '@uirouter/angular'\n\nimport { Ng2StateDeclaration } from '@uirouter/angular';\nimport { Transition, UIRouter } from '@uirouter/angular'\n\nimport { routerConfigFn } from './router.config';\nimport { MembrsConfig } from './config.interface';\nimport { MembrsConfigService } from './config.service';\nimport { retrieveToken } from './token';\n\nexport const validateResolve = {\n    token: 'reissue',\n    deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n    resolveFn: validateResolveFn\n}\n\nexport const reissueResolve = {\n  token: 'reissue',\n  deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n  resolveFn: reissueResolveFn\n}\n\nexport const reissueState:Ng2StateDeclaration = {\n\tname: 'reissue', \n\turl: '/reissue?token',\n\tviews: { },\n\tresolve: [\n    reissueResolve\n\t]\n}\n\nexport function reissueResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n    \n    //console.log(membrsService)\n    return new Promise((resolve, reject) => {\n      // console.log('reissue promise resolve')\n      // console.log(transition.params().token)\n      membrsService.reissue(transition.params().token).then((response)=>{\n          if(localStorage.getItem('redirectUrlAfterLogin')){\n            const redirect = localStorage.getItem('redirectUrlAfterLogin')\n            localStorage.removeItem('redirectUrlAfterLogin')\n            window.location.href = redirect\n          }else {\n            router.stateService.go(membrsConfig.defaultState, {}, {inherit:false})\n          }\n          reject()\n      }).catch(error=>{\n          //console.log('error in reissue resolve')\n          //console.log(error)\n          //window.location.href = environment.login\n          reject(error)\n      })\n\n\t})\n}\n\nexport function validateResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n  \n  //console.log(membrsService)\n  return new Promise((resolve, reject) => {\n    // console.log('validate promise resolve')\n    \n    membrsService.reissue().then((response)=>{\n      resolve(null)\n    }).catch(error=>{\n      localStorage.setItem('redirectUrlAfterLogin', window.location.pathname)\n      window.location.href = membrsConfig.login\n      reject(error)\n    })\n\n})\n}\n\nexport function jwtOptionsFactory(config) {\n  // console.log('jwt options factory')\n  // console.log(config)\n  return {\n    tokenGetter: () => {\n      console.log('token getter',  localStorage.getItem('membrs'))\n      return localStorage.getItem('membrs');\n    },\n    allowedDomains: [config.api]\n  }\n}\n\n\n/** The top level state(s) */\nexport const STATES = [\n    reissueState\n]\n\n\n@NgModule({\n  imports: [\n    CommonModule,\n    HttpClientModule,\n    JwtModule\n    // JwtModule.forRoot({\n    //   config: {\n    //     tokenGetter: retrieveToken\n    //   }\n    // })\n    // UIRouterModule.forChild({\n    //   states: STATES,\n    //   config: routerConfigFn,\n    // }),\n    // JwtModule.forRoot({})\n  ]\n})\n\n\n\nexport class MembrsModule { \n  static forRoot(config: MembrsConfig): ModuleWithProviders<MembrsModule> {\n\n\n    const moduleProviders = UIRouterModule.forChild({\n      states: STATES,\n      config: routerConfigFn\n    }).providers\n\n    moduleProviders.push(JwtModule.forRoot({\n      config: {\n        tokenGetter: retrieveToken,\n        allowedDomains: []\n      }\n    }).providers)\n      \n    moduleProviders.push(MembrsService)\n    moduleProviders.push({provide: MembrsConfigService,useValue: config});\n    \n   \n    return {\n      ngModule: MembrsModule, \n      providers: moduleProviders //[{provide: MembrsConfigService,useValue: config}]\n    };\n    \n  }\n\n}\n","import { Injectable } from '@angular/core';\nimport {\n  HttpRequest,\n  HttpHandler,\n  HttpEvent,\n  HttpInterceptor\n} from '@angular/common/http';\nimport { Observable } from 'rxjs';\n//import { NgBusyService } from '@nakedcreativity/ng-busy';\nimport { finalize } from 'rxjs/operators';\n\n\n@Injectable()\nexport class TokenInterceptor implements HttpInterceptor {\n  constructor() {}\n  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n    \n    console.log('intercept request', localStorage.getItem('membrs'))\n    //this.busyService.busy()\n    request = request.clone({\n      setHeaders: {\n        Authorization: localStorage.getItem('membrs')\n      }\n    });\n    return next.handle(request).pipe(finalize(()=>{\n      //this.busyService.finished()\n    }));\n  }\n}","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":";;;;;;;;;;AAGA;;;AAGG;AACI,MAAM,mBAAmB,GAAG,IAAI,cAAc,CAAe,cAAc,CAAC;;ACDnF,MAAM,UAAU,GAAG,IAAI,gBAAgB,EAAE,CAAA;MAO5B,aAAa,CAAA;IAOxB,WAAoB,CAAA,IAAgB,EAAuC,MAAoB,EAAA;AAA3E,QAAA,IAAI,CAAA,IAAA,GAAJ,IAAI,CAAY;AAAuC,QAAA,IAAM,CAAA,MAAA,GAAN,MAAM,CAAc;AAH/F,QAAA,IAAM,CAAA,MAAA,GAAW,QAAQ,CAAC;QAC1B,IAAA,CAAA,mBAAmB,GAA6B,IAAI,eAAe,CAAC,KAAK,CAAC,CAAA;;;QAMxE,IAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAC;YACnC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AAC/C,SAAA;KAEF;AAED,IAAA,OAAO,CAAC,KAAa,EAAA;QAEnB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAG;AAEpC,YAAA,IAAG,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,EAAC;gBACxB,MAAM,CAAC,eAAe,CAAC,CAAA;AACxB,aAAA;AAED,YAAA,IAAG,KAAK;AACN,gBAAA,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;;AAGpB,YAAA,IAAI,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAC,IAAI,CAAC,CAAA;;YAG/D,IAAG,SAAS,GAAG,CAAC,EAAC;gBACf,MAAM,CAAC,eAAe,CAAC,CAAA;AACxB,aAAA;;YAGD,IAAG,SAAS,GAAG,GAAG,EAAC;AAEjB,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,GAAC,SAAS,GAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,QAAY,KAAG;oBAE5G,IAAG,QAAQ,CAAC,KAAK,EAAC;AAChB,wBAAA,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;AAC3B,wBAAA,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACnC,wBAAA,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AACrB,qBAAA;AAAK,yBAAA;wBACJ,MAAM,CAAC,eAAe,CAAC,CAAA;AACxB,qBAAA;iBAEF,EAAE,KAAK,IAAE;oBACR,MAAM,CAAC,eAAe,CAAC,CAAA;AACzB,iBAAC,CAAC,CAAA;AAEH,aAAA;AAAK,iBAAA;AACJ,gBAAA,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACnC,gBAAA,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AACrB,aAAA;AAEH,SAAC,CAAC,CAAA;KAEH;IAED,IAAI,KAAK,CAAC,KAAK,EAAA;AACb,QAAA,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACxC,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACpD;IAED,WAAW,GAAA;AACT,QAAA,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrC;IAED,UAAU,GAAA;QACR,OAAO,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK,CAAA;KACjC;AAED,IAAA,IAAI,OAAO,GAAA;QACT,OAAO,IAAI,CAAC,QAAQ,CAAA;KACrB;AAED,IAAA,IAAI,KAAK,GAAA;QACP,OAAO,IAAI,CAAC,MAAM,CAAA;KACnB;AAED,IAAA,IAAI,KAAK,GAAA;AACP,QAAA,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,CAAA;KACpC;AAED,IAAA,IAAI,oBAAoB,GAAA;QACtB,OAAO,IAAI,CAAC,mBAAmB,CAAA;KAChC;IAED,MAAM,GAAA;QACJ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAG;AACpC,YAAA,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,GAAC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAC,SAAS,GAAC,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAY,KAAG;AACxG,gBAAA,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;AACnB,gBAAA,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AACpC,gBAAA,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;;aAE3B,EAAE,KAAK,IAAE;gBACR,MAAM,CAAC,KAAK,CAAC,CAAA;AACf,aAAC,CAAC,CAAA;AACJ,SAAC,CAAC,CAAA;KAEH;;AAxGU,aAAA,CAAA,IAAA,GAAA,EAAA,CAAA,kBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,aAAa,4CAOsB,mBAAmB,EAAA,CAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAPtD,aAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,aAAa,cAJZ,MAAM,EAAA,CAAA,CAAA;2FAIP,aAAa,EAAA,UAAA,EAAA,CAAA;kBALzB,UAAU;AAAC,YAAA,IAAA,EAAA,CAAA;AACV,oBAAA,UAAU,EAAE,MAAM;iBACnB,CAAA;;;8BAUwC,MAAM;+BAAC,mBAAmB,CAAA;;;;ACdnD,SAAA,cAAc,CAAC,MAAgB,EAAE,QAAkB,EAAA;AAEjE,IAAA,MAAM,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;AACnD,IAAA,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;IACxC,MAAM,MAAM,GAAgB,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC7D,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;AAEjD,IAAA,YAAY,CAAC,mBAAmB,CAAC,UAAS,KAAK,EAAA;AAE/C,QAAA,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAA;AAC5D,QAAA,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;AAElB,QAAA,IAAG,KAAK,CAAC,MAAM,IAAI,eAAe,EAAC;YAClC,aAAa,CAAC,WAAW,EAAE,CAAA;YAC3B,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;AACpC,SAAA;AAED,QAAA,IAAG,KAAK,CAAC,MAAM,IAAI,0BAA0B;AAC5C,YAAA,YAAY,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;AAEtC,KAAC,CAAC,CAAC;AAEJ;;SC5BgB,aAAa,GAAA;;AAEzB,IAAA,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC1C;;ACYa,MAAA,eAAe,GAAG;AAC3B,IAAA,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,CAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,mBAAmB,CAAE;AAClE,IAAA,SAAS,EAAE,iBAAiB;EAC/B;AAEY,MAAA,cAAc,GAAG;AAC5B,IAAA,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,CAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,mBAAmB,CAAE;AAClE,IAAA,SAAS,EAAE,gBAAgB;EAC5B;AAEY,MAAA,YAAY,GAAuB;AAC/C,IAAA,IAAI,EAAE,SAAS;AACf,IAAA,GAAG,EAAE,gBAAgB;AACrB,IAAA,KAAK,EAAE,EAAG;AACV,IAAA,OAAO,EAAE;QACN,cAAc;AAChB,KAAA;EACD;AAEK,SAAU,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,YAAyB,EAAA;;IAGzF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAI;;;AAGrC,QAAA,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAG;AAC9D,YAAA,IAAG,YAAY,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAC;gBAC/C,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAC9D,gBAAA,YAAY,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAA;AAChD,gBAAA,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAA;AAChC,aAAA;AAAK,iBAAA;AACJ,gBAAA,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,EAAE,EAAC,OAAO,EAAC,KAAK,EAAC,CAAC,CAAA;AACvE,aAAA;AACD,YAAA,MAAM,EAAE,CAAA;AACZ,SAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAE;;;;YAIZ,MAAM,CAAC,KAAK,CAAC,CAAA;AACjB,SAAC,CAAC,CAAA;AAEP,KAAC,CAAC,CAAA;AACH,CAAC;AAEK,SAAU,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,YAAyB,EAAA;;IAG5F,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAI;;QAGrC,aAAa,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAG;YACvC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,SAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAE;YACd,YAAY,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YACvE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAA;YACzC,MAAM,CAAC,KAAK,CAAC,CAAA;AACf,SAAC,CAAC,CAAA;AAEN,KAAC,CAAC,CAAA;AACF,CAAC;AAEK,SAAU,iBAAiB,CAAC,MAAM,EAAA;;;IAGtC,OAAO;QACL,WAAW,EAAE,MAAK;AAChB,YAAA,OAAO,CAAC,GAAG,CAAC,cAAc,EAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;AAC5D,YAAA,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SACvC;AACD,QAAA,cAAc,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;KAC7B,CAAA;AACH,CAAC;AAGD;AACa,MAAA,MAAM,GAAG;IAClB,YAAY;EACf;MAuBY,YAAY,CAAA;IACvB,OAAO,OAAO,CAAC,MAAoB,EAAA;AAGjC,QAAA,MAAM,eAAe,GAAG,cAAc,CAAC,QAAQ,CAAC;AAC9C,YAAA,MAAM,EAAE,MAAM;AACd,YAAA,MAAM,EAAE,cAAc;SACvB,CAAC,CAAC,SAAS,CAAA;AAEZ,QAAA,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;AACrC,YAAA,MAAM,EAAE;AACN,gBAAA,WAAW,EAAE,aAAa;AAC1B,gBAAA,cAAc,EAAE,EAAE;AACnB,aAAA;SACF,CAAC,CAAC,SAAS,CAAC,CAAA;AAEb,QAAA,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;AACnC,QAAA,eAAe,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,mBAAmB,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;QAGtE,OAAO;AACL,YAAA,QAAQ,EAAE,YAAY;YACtB,SAAS,EAAE,eAAe;SAC3B,CAAC;KAEH;;yGAzBU,YAAY,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,QAAA,EAAA,CAAA,CAAA;AAAZ,YAAA,CAAA,IAAA,GAAA,EAAA,CAAA,mBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,YAAY,YAlBrB,YAAY;QACZ,gBAAgB;QAChB,SAAS;;;;;;;;;;;;AAgBA,YAAA,CAAA,IAAA,GAAA,EAAA,CAAA,mBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,QAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,YAAY,YAlBrB,YAAY;QACZ,gBAAgB;QAChB,SAAS;;;;;;;;;;;;2FAgBA,YAAY,EAAA,UAAA,EAAA,CAAA;kBApBxB,QAAQ;AAAC,YAAA,IAAA,EAAA,CAAA;AACR,oBAAA,OAAO,EAAE;wBACP,YAAY;wBACZ,gBAAgB;wBAChB,SAAS;;;;;;;;;;;AAWV,qBAAA;iBACF,CAAA;;;MCpGY,gBAAgB,CAAA;AAC3B,IAAA,WAAA,GAAA,GAAgB;IAChB,SAAS,CAAC,OAAyB,EAAE,IAAiB,EAAA;AAEpD,QAAA,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;;AAEhE,QAAA,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;AACtB,YAAA,UAAU,EAAE;AACV,gBAAA,aAAa,EAAE,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC;AAC9C,aAAA;AACF,SAAA,CAAC,CAAC;AACH,QAAA,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAI;;SAE7C,CAAC,CAAC,CAAC;KACL;;6GAdU,gBAAgB,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;iHAAhB,gBAAgB,EAAA,CAAA,CAAA;2FAAhB,gBAAgB,EAAA,UAAA,EAAA,CAAA;kBAD5B,UAAU;;;ACZX;;AAEG;;;;"}
+{"version":3,"file":"nakedcreativity-membrs-angular-helper.mjs","sources":["../../../projects/membrs/src/lib/config.service.ts","../../../projects/membrs/src/lib/membrs.service.ts","../../../projects/membrs/src/lib/router.config.ts","../../../projects/membrs/src/lib/token.ts","../../../projects/membrs/src/lib/membrs.module.ts","../../../projects/membrs/src/lib/auth.interceptor.ts","../../../projects/membrs/src/nakedcreativity-membrs-angular-helper.ts"],"sourcesContent":["import { InjectionToken } from '@angular/core';\nimport { MembrsConfig } from './config.interface';\n\n/**\n * This is not a real service, but it looks like it from the outside.\n * It's just an InjectionTToken used to import the config object, provided from the outside\n */\nexport const MembrsConfigService = new InjectionToken<MembrsConfig>(\"MembrsConfig\");\n","import { Injectable, Inject } from '@angular/core';\nimport { JwtHelperService } from '@auth0/angular-jwt';\nimport { HttpClient } from '@angular/common/http'\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\nimport { BehaviorSubject } from 'rxjs';\nconst jwtService = new JwtHelperService()\n\n@Injectable({\n  providedIn: 'root'\n})\n\n\nexport class MembrsService {\n\n  _token: string;\n  _decoded: any;\n\n  public decodedReady = new BehaviorSubject<any>(null);\n\n  _lsKey: string = 'membrs';\n  _loggedInObservable: BehaviorSubject<Boolean> = new BehaviorSubject(false)\n\n  constructor(private http: HttpClient, @Inject(MembrsConfigService) private config: MembrsConfig) {\n\n    // console.log('membrs constructor')\n    // if the token exists in local storage, retrieve it back to the service\n    if(localStorage.getItem(this._lsKey)){\n      this.token = localStorage.getItem(this._lsKey)\n    }\n  \n  }\n\n  reissue(token?: string) {\n    console.log('Reissuing token...'); // Log function entry\n    \n    return new Promise((resolve, reject) => {\n      if (!token && !this._token) {\n        console.log('No token provided and no token found.'); // Log missing token\n        reject('NOT_LOGGED_IN');\n      }\n  \n      if (token) {\n        console.log(`Token provided: ${token}`); // Log provided token\n        this.token = token;\n      }\n  \n      // check stored token has not expired, or needs to be reissued soon\n      var reissueIn = this._decoded.exp - Math.floor(Date.now() / 1000);\n  \n      // token has expired\n      if (reissueIn < 0) {\n        console.log('Token has expired.'); // Log expired token\n        reject('NOT_LOGGED_IN');\n      }\n  \n      // token expiring soon\n      if (reissueIn < 300) {\n        console.log('Token expiring soon. Reissuing...'); // Log imminent expiration\n        this.http.post(this.config.apiProtocol + this.config.api + '/token/' + this._token, {}).subscribe(\n          (response: any) => {\n            if (response.token) {\n              this.token = response.token;\n              this._loggedInObservable.next(true);\n              console.log('Token successfully reissued.'); // Log success\n              resolve(this._token);\n            } else {\n              console.log('Failed to reissue token.'); // Log failure\n              reject('NOT_LOGGED_IN');\n            }\n          },\n          (error) => {\n            console.log('Error reissuing token:', error); // Log error details\n            reject('NOT_LOGGED_IN');\n          }\n        );\n      } else {\n        this._loggedInObservable.next(true);\n        console.log('Token is valid. No need to reissue.'); // Log valid token\n        resolve(this._token);\n      }\n    });\n  }\n  \n\n  set token(token){\n    this._token = token\n    console.log('Token set.');\n    localStorage.setItem(this._lsKey, token)\n    this._decoded = jwtService.decodeToken(this._token)\n  }\n\n  deleteToken(){\n    localStorage.removeItem(this._lsKey)\n  }\n\n  isLoggedIn(){\n    return this.token ? true : false\n  }\n\n  get profile(){\n    return this._decoded\n  }\n\n  setProfile(decodedData) {\n    this._decoded = decodedData;\n    this.decodedReady.next(decodedData); // Emit the new value when profile is set\n    console.log(this.decodedReady);\n  }\n\n  get decodedReady$() {\n    return this.decodedReady.asObservable();\n  }\n\n  get token(){\n    return this._token\n  }\n\n  get admin (){\n    return this.profile.permission == 1\n  }\n\n  get isLoggedInObservable(){\n    return this._loggedInObservable\n  }\n  \n  logout(){\n    return new Promise((resolve, reject)=>{\n      this.http.delete(this.config.apiProtocol + this.config.api + '/token/' + this._token).subscribe((response:any)=>{\n        this._token = null;\n        localStorage.removeItem(this._lsKey);\n        resolve(this.config.login);\n      }, error => {\n        // If the API call fails (e.g. token already invalid/expired), still clear local state\n        console.warn('Logout API call failed, clearing local token anyway', error);\n        this._token = null;\n        localStorage.removeItem(this._lsKey);\n        resolve(this.config.login);\n      });\n    });\n  }\n\n\n}\n","import { UIRouter } from '@uirouter/core';\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\nimport { Injector } from '@angular/core';\nimport { MembrsService } from './membrs.service';\n\nexport function routerConfigFn(router: UIRouter, injector: Injector) {\n\n  const transitionService = router.transitionService;\n  const stateService = router.stateService\n  const config:MembrsConfig = injector.get(MembrsConfigService)\n  const membrsService = injector.get(MembrsService)\n\n \tstateService.defaultErrorHandler(function(error) {\n\t\t \t\n\t\tif(error.detail == 'NOT_LOGGED_IN'){\n\t\t\tmembrsService.deleteToken()\n\t\t\twindow.location.href = config.login;\n\t\t}\n\n\t\tif(error.detail == 'INSUFFICIENT_PERMISSIONS')\n\t\t\tstateService.go(config.defaultState)\n\n\t});\n\t\n}","export function retrieveToken() {\n    // console.log('retrieve from ls')\n    return localStorage.getItem('membrs');\n}","import { NgModule, ModuleWithProviders, Injector } from '@angular/core';\nimport { CommonModule } from '@angular/common';\nimport { MembrsService } from './membrs.service';\nimport { JwtModule, JWT_OPTIONS } from \"@auth0/angular-jwt\";\nimport { HttpClientModule } from \"@angular/common/http\";\nimport { UIRouterModule } from '@uirouter/angular'\n\nimport { Ng2StateDeclaration } from '@uirouter/angular';\nimport { Transition, UIRouter } from '@uirouter/angular'\n\nimport { routerConfigFn } from './router.config';\nimport { MembrsConfig } from './config.interface';\nimport { MembrsConfigService } from './config.service';\nimport { retrieveToken } from './token';\n\nexport const validateResolve = {\n    token: 'reissue',\n    deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n    resolveFn: validateResolveFn\n}\n\nexport const reissueResolve = {\n  token: 'reissue',\n  deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n  resolveFn: reissueResolveFn\n}\n\nexport const reissueState:Ng2StateDeclaration = {\n\tname: 'reissue', \n\turl: '/reissue?token',\n\tviews: { },\n\tresolve: [\n    reissueResolve\n\t]\n}\n\nexport function reissueResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n    \n    //console.log(membrsService)\n    return new Promise((resolve, reject) => {\n      // console.log('reissue promise resolve')\n      // console.log(transition.params().token)\n      membrsService.reissue(transition.params().token).then((response)=>{\n          if(localStorage.getItem('redirectUrlAfterLogin')){\n            const redirect = localStorage.getItem('redirectUrlAfterLogin')\n            localStorage.removeItem('redirectUrlAfterLogin')\n            window.location.pathname = redirect\n          }else {\n            router.stateService.go(membrsConfig.defaultState, {}, {inherit:false})\n          }\n          reject()\n      }).catch(error=>{\n          //console.log('error in reissue resolve')\n          //console.log(error)\n          //window.location.href = environment.login\n          reject(error)\n      })\n\n\t})\n}\n\nexport function validateResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n  \n  //console.log(membrsService)\n  return new Promise((resolve, reject) => {\n    // console.log('validate promise resolve')\n    \n    membrsService.reissue().then((response)=>{\n      if(localStorage.getItem('redirectUrlAfterLogin')){\n        const redirect = localStorage.getItem('redirectUrlAfterLogin')\n        localStorage.removeItem('redirectUrlAfterLogin')\n        window.location.pathname = redirect\n      }\n      resolve(null)\n    }).catch(error=>{\n      localStorage.setItem('redirectUrlAfterLogin', window.location.pathname)\n      window.location.href = membrsConfig.login\n      reject(error)\n    })\n\n})\n}\n\nexport function jwtOptionsFactory(config) {\n  // console.log('jwt options factory')\n  // console.log(config)\n  return {\n    tokenGetter: () => {\n      console.log('token getter',  localStorage.getItem('membrs'))\n      return localStorage.getItem('membrs');\n    },\n    allowedDomains: [config.api]\n  }\n}\n\n\n/** The top level state(s) */\nexport const STATES = [\n    reissueState\n]\n\n\n@NgModule({\n  imports: [\n    CommonModule,\n    HttpClientModule,\n    JwtModule\n    // JwtModule.forRoot({\n    //   config: {\n    //     tokenGetter: retrieveToken\n    //   }\n    // })\n    // UIRouterModule.forChild({\n    //   states: STATES,\n    //   config: routerConfigFn,\n    // }),\n    // JwtModule.forRoot({})\n  ]\n})\n\n\n\nexport class MembrsModule { \n  static forRoot(config: MembrsConfig): ModuleWithProviders<MembrsModule> {\n\n\n    const moduleProviders = UIRouterModule.forChild({\n      states: STATES,\n      config: routerConfigFn\n    }).providers\n\n    moduleProviders.push(JwtModule.forRoot({\n      config: {\n        tokenGetter: retrieveToken,\n        allowedDomains: []\n      }\n    }).providers)\n      \n    moduleProviders.push(MembrsService)\n    moduleProviders.push({provide: MembrsConfigService,useValue: config});\n    \n   \n    return {\n      ngModule: MembrsModule, \n      providers: moduleProviders //[{provide: MembrsConfigService,useValue: config}]\n    };\n    \n  }\n\n}\n","import { JwtHelperService } from \"@auth0/angular-jwt\";\nimport { Injectable } from \"@angular/core\";\nimport { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from \"@angular/common/http\";\nimport { Observable, from, throwError } from \"rxjs\";\nimport { switchMap, catchError, finalize, tap } from \"rxjs/operators\";\nimport { MembrsService } from \"./membrs.service\";\nimport { StateService } from \"@uirouter/angular\";\n\n@Injectable()\nexport class TokenInterceptor implements HttpInterceptor {\n  constructor(private jwtHelper: JwtHelperService, private membrsService: MembrsService, private stateService: StateService) {}\n\n  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n    const token = localStorage.getItem(\"membrs\");\n\n    if (token && this.jwtHelper.isTokenExpired(token)) {\n      console.log(\"Token expired. Attempting to reissue.\");\n      return from(this.membrsService.reissue()).pipe(\n        switchMap(() => {\n          const refreshedToken = localStorage.getItem(\"membrs\");\n          if (refreshedToken && !this.jwtHelper.isTokenExpired(refreshedToken)) {\n            console.log(\"Token successfully reissued.\");\n            request = request.clone({\n              setHeaders: {\n                Authorization: refreshedToken,\n              },\n            });\n          }\n          return next.handle(request);\n        }),\n        catchError((err) => {\n          console.warn(\"Token refresh failed. Logging out.\");\n          this.membrsService.logout();\n          this.stateService.go(\"\");\n          return throwError(() => err);\n        }),\n        finalize(() => {\n          // this.busyService.finished()\n        })\n      );\n    }\n\n    if (token && !this.jwtHelper.isTokenExpired(token)) {\n      request = request.clone({\n        setHeaders: {\n          Authorization: token,\n        },\n      });\n    }\n\n    return next.handle(request).pipe(\n      tap((event) => {\n        // If this is an HttpResponse, check for x-new-token header\n        if (event && event.type === 4 && event.headers) {\n          const newToken = event.headers.get('x-new-token');\n          if (newToken) {\n            localStorage.setItem('membrs', newToken);\n          }\n        }\n      }),\n      finalize(() => {\n        // this.busyService.finished()\n      })\n    );\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":["i1","i2.MembrsService"],"mappings":";;;;;;;;;;;;AAGA;;;AAGG;AACI,MAAM,mBAAmB,GAAG,IAAI,cAAc,CAAe,cAAc,CAAC;;ACDnF,MAAM,UAAU,GAAG,IAAI,gBAAgB,EAAE,CAAA;MAO5B,aAAa,CAAA;IAUxB,WAAoB,CAAA,IAAgB,EAAuC,MAAoB,EAAA;AAA3E,QAAA,IAAI,CAAA,IAAA,GAAJ,IAAI,CAAY;AAAuC,QAAA,IAAM,CAAA,MAAA,GAAN,MAAM,CAAc;QALxF,IAAA,CAAA,YAAY,GAAG,IAAI,eAAe,CAAM,IAAI,CAAC,CAAC;AAErD,QAAA,IAAM,CAAA,MAAA,GAAW,QAAQ,CAAC;QAC1B,IAAA,CAAA,mBAAmB,GAA6B,IAAI,eAAe,CAAC,KAAK,CAAC,CAAA;;;QAMxE,IAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAC;YACnC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AAC/C,SAAA;KAEF;AAED,IAAA,OAAO,CAAC,KAAc,EAAA;AACpB,QAAA,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAElC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAI;AACrC,YAAA,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;AAC1B,gBAAA,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;gBACrD,MAAM,CAAC,eAAe,CAAC,CAAC;AACzB,aAAA;AAED,YAAA,IAAI,KAAK,EAAE;gBACT,OAAO,CAAC,GAAG,CAAC,CAAA,gBAAA,EAAmB,KAAK,CAAE,CAAA,CAAC,CAAC;AACxC,gBAAA,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;AACpB,aAAA;;AAGD,YAAA,IAAI,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;;YAGlE,IAAI,SAAS,GAAG,CAAC,EAAE;AACjB,gBAAA,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;gBAClC,MAAM,CAAC,eAAe,CAAC,CAAC;AACzB,aAAA;;YAGD,IAAI,SAAS,GAAG,GAAG,EAAE;AACnB,gBAAA,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;AACjD,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,SAAS,CAC/F,CAAC,QAAa,KAAI;oBAChB,IAAI,QAAQ,CAAC,KAAK,EAAE;AAClB,wBAAA,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;AAC5B,wBAAA,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACpC,wBAAA,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;AAC5C,wBAAA,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACtB,qBAAA;AAAM,yBAAA;AACL,wBAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;wBACxC,MAAM,CAAC,eAAe,CAAC,CAAC;AACzB,qBAAA;AACH,iBAAC,EACD,CAAC,KAAK,KAAI;oBACR,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;oBAC7C,MAAM,CAAC,eAAe,CAAC,CAAC;AAC1B,iBAAC,CACF,CAAC;AACH,aAAA;AAAM,iBAAA;AACL,gBAAA,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACpC,gBAAA,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;AACnD,gBAAA,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACtB,aAAA;AACH,SAAC,CAAC,CAAC;KACJ;IAGD,IAAI,KAAK,CAAC,KAAK,EAAA;AACb,QAAA,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;AACnB,QAAA,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC1B,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACxC,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACpD;IAED,WAAW,GAAA;AACT,QAAA,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrC;IAED,UAAU,GAAA;QACR,OAAO,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK,CAAA;KACjC;AAED,IAAA,IAAI,OAAO,GAAA;QACT,OAAO,IAAI,CAAC,QAAQ,CAAA;KACrB;AAED,IAAA,UAAU,CAAC,WAAW,EAAA;AACpB,QAAA,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC;QAC5B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACpC,QAAA,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;KAChC;AAED,IAAA,IAAI,aAAa,GAAA;AACf,QAAA,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;KACzC;AAED,IAAA,IAAI,KAAK,GAAA;QACP,OAAO,IAAI,CAAC,MAAM,CAAA;KACnB;AAED,IAAA,IAAI,KAAK,GAAA;AACP,QAAA,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,CAAA;KACpC;AAED,IAAA,IAAI,oBAAoB,GAAA;QACtB,OAAO,IAAI,CAAC,mBAAmB,CAAA;KAChC;IAED,MAAM,GAAA;QACJ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAG;AACpC,YAAA,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAY,KAAG;AAC9G,gBAAA,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;AACnB,gBAAA,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACrC,gBAAA,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC5B,EAAE,KAAK,IAAG;;AAET,gBAAA,OAAO,CAAC,IAAI,CAAC,qDAAqD,EAAE,KAAK,CAAC,CAAC;AAC3E,gBAAA,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;AACnB,gBAAA,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACrC,gBAAA,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC7B,aAAC,CAAC,CAAC;AACL,SAAC,CAAC,CAAC;KACJ;;AA/HU,aAAA,CAAA,IAAA,GAAA,EAAA,CAAA,kBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,SAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,aAAa,4CAUsB,mBAAmB,EAAA,CAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;AAVtD,aAAA,CAAA,KAAA,GAAA,EAAA,CAAA,qBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,SAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,aAAa,cAJZ,MAAM,EAAA,CAAA,CAAA;4FAIP,aAAa,EAAA,UAAA,EAAA,CAAA;kBALzB,UAAU;AAAC,YAAA,IAAA,EAAA,CAAA;AACV,oBAAA,UAAU,EAAE,MAAM;iBACnB,CAAA;;;8BAawC,MAAM;+BAAC,mBAAmB,CAAA;;;;ACjBnD,SAAA,cAAc,CAAC,MAAgB,EAAE,QAAkB,EAAA;AAEjE,IAAA,MAAM,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;AACnD,IAAA,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;IACxC,MAAM,MAAM,GAAgB,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IAC7D,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;AAEjD,IAAA,YAAY,CAAC,mBAAmB,CAAC,UAAS,KAAK,EAAA;AAE/C,QAAA,IAAG,KAAK,CAAC,MAAM,IAAI,eAAe,EAAC;YAClC,aAAa,CAAC,WAAW,EAAE,CAAA;YAC3B,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;AACpC,SAAA;AAED,QAAA,IAAG,KAAK,CAAC,MAAM,IAAI,0BAA0B;AAC5C,YAAA,YAAY,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;AAEtC,KAAC,CAAC,CAAC;AAEJ;;SCzBgB,aAAa,GAAA;;AAEzB,IAAA,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC1C;;ACYa,MAAA,eAAe,GAAG;AAC3B,IAAA,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,CAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,mBAAmB,CAAE;AAClE,IAAA,SAAS,EAAE,iBAAiB;EAC/B;AAEY,MAAA,cAAc,GAAG;AAC5B,IAAA,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,CAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,mBAAmB,CAAE;AAClE,IAAA,SAAS,EAAE,gBAAgB;EAC5B;AAEY,MAAA,YAAY,GAAuB;AAC/C,IAAA,IAAI,EAAE,SAAS;AACf,IAAA,GAAG,EAAE,gBAAgB;AACrB,IAAA,KAAK,EAAE,EAAG;AACV,IAAA,OAAO,EAAE;QACN,cAAc;AAChB,KAAA;EACD;AAEK,SAAU,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,YAAyB,EAAA;;IAGzF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAI;;;AAGrC,QAAA,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAG;AAC9D,YAAA,IAAG,YAAY,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAC;gBAC/C,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAC9D,gBAAA,YAAY,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAA;AAChD,gBAAA,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAA;AACpC,aAAA;AAAK,iBAAA;AACJ,gBAAA,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,EAAE,EAAC,OAAO,EAAC,KAAK,EAAC,CAAC,CAAA;AACvE,aAAA;AACD,YAAA,MAAM,EAAE,CAAA;AACZ,SAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAE;;;;YAIZ,MAAM,CAAC,KAAK,CAAC,CAAA;AACjB,SAAC,CAAC,CAAA;AAEP,KAAC,CAAC,CAAA;AACH,CAAC;AAEK,SAAU,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,YAAyB,EAAA;;IAG5F,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAI;;QAGrC,aAAa,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,KAAG;AACvC,YAAA,IAAG,YAAY,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAC;gBAC/C,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAC9D,gBAAA,YAAY,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAA;AAChD,gBAAA,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAA;AACpC,aAAA;YACD,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,SAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAE;YACd,YAAY,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YACvE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAA;YACzC,MAAM,CAAC,KAAK,CAAC,CAAA;AACf,SAAC,CAAC,CAAA;AAEN,KAAC,CAAC,CAAA;AACF,CAAC;AAEK,SAAU,iBAAiB,CAAC,MAAM,EAAA;;;IAGtC,OAAO;QACL,WAAW,EAAE,MAAK;AAChB,YAAA,OAAO,CAAC,GAAG,CAAC,cAAc,EAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;AAC5D,YAAA,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SACvC;AACD,QAAA,cAAc,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;KAC7B,CAAA;AACH,CAAC;AAGD;AACa,MAAA,MAAM,GAAG;IAClB,YAAY;EACf;MAuBY,YAAY,CAAA;IACvB,OAAO,OAAO,CAAC,MAAoB,EAAA;AAGjC,QAAA,MAAM,eAAe,GAAG,cAAc,CAAC,QAAQ,CAAC;AAC9C,YAAA,MAAM,EAAE,MAAM;AACd,YAAA,MAAM,EAAE,cAAc;SACvB,CAAC,CAAC,SAAS,CAAA;AAEZ,QAAA,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;AACrC,YAAA,MAAM,EAAE;AACN,gBAAA,WAAW,EAAE,aAAa;AAC1B,gBAAA,cAAc,EAAE,EAAE;AACnB,aAAA;SACF,CAAC,CAAC,SAAS,CAAC,CAAA;AAEb,QAAA,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;AACnC,QAAA,eAAe,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,mBAAmB,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;QAGtE,OAAO;AACL,YAAA,QAAQ,EAAE,YAAY;YACtB,SAAS,EAAE,eAAe;SAC3B,CAAC;KAEH;;0GAzBU,YAAY,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,QAAA,EAAA,CAAA,CAAA;AAAZ,YAAA,CAAA,IAAA,GAAA,EAAA,CAAA,mBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,SAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,YAAY,YAlBrB,YAAY;QACZ,gBAAgB;QAChB,SAAS;;;;;;;;;;;;AAgBA,YAAA,CAAA,IAAA,GAAA,EAAA,CAAA,mBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,SAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,YAAY,YAlBrB,YAAY;QACZ,gBAAgB;QAChB,SAAS;;;;;;;;;;;;4FAgBA,YAAY,EAAA,UAAA,EAAA,CAAA;kBApBxB,QAAQ;AAAC,YAAA,IAAA,EAAA,CAAA;AACR,oBAAA,OAAO,EAAE;wBACP,YAAY;wBACZ,gBAAgB;wBAChB,SAAS;;;;;;;;;;;AAWV,qBAAA;iBACF,CAAA;;;MC7GY,gBAAgB,CAAA;AAC3B,IAAA,WAAA,CAAoB,SAA2B,EAAU,aAA4B,EAAU,YAA0B,EAAA;AAArG,QAAA,IAAS,CAAA,SAAA,GAAT,SAAS,CAAkB;AAAU,QAAA,IAAa,CAAA,aAAA,GAAb,aAAa,CAAe;AAAU,QAAA,IAAY,CAAA,YAAA,GAAZ,YAAY,CAAc;KAAI;IAE7H,SAAS,CAAC,OAAyB,EAAE,IAAiB,EAAA;QACpD,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAE7C,IAAI,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;AACjD,YAAA,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;AACrD,YAAA,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAC5C,SAAS,CAAC,MAAK;gBACb,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACtD,IAAI,cAAc,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE;AACpE,oBAAA,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;AAC5C,oBAAA,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;AACtB,wBAAA,UAAU,EAAE;AACV,4BAAA,aAAa,EAAE,cAAc;AAC9B,yBAAA;AACF,qBAAA,CAAC,CAAC;AACJ,iBAAA;AACD,gBAAA,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAC9B,aAAC,CAAC,EACF,UAAU,CAAC,CAAC,GAAG,KAAI;AACjB,gBAAA,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;AACnD,gBAAA,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;AAC5B,gBAAA,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AACzB,gBAAA,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;AAC/B,aAAC,CAAC,EACF,QAAQ,CAAC,MAAK;;aAEb,CAAC,CACH,CAAC;AACH,SAAA;QAED,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;AAClD,YAAA,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;AACtB,gBAAA,UAAU,EAAE;AACV,oBAAA,aAAa,EAAE,KAAK;AACrB,iBAAA;AACF,aAAA,CAAC,CAAC;AACJ,SAAA;AAED,QAAA,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAC9B,GAAG,CAAC,CAAC,KAAK,KAAI;;YAEZ,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE;gBAC9C,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAClD,gBAAA,IAAI,QAAQ,EAAE;AACZ,oBAAA,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC1C,iBAAA;AACF,aAAA;AACH,SAAC,CAAC,EACF,QAAQ,CAAC,MAAK;;SAEb,CAAC,CACH,CAAC;KACH;;8GAvDU,gBAAgB,EAAA,IAAA,EAAA,CAAA,EAAA,KAAA,EAAAA,IAAA,CAAA,gBAAA,EAAA,EAAA,EAAA,KAAA,EAAAC,aAAA,EAAA,EAAA,EAAA,KAAA,EAAA,EAAA,CAAA,YAAA,EAAA,CAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;kHAAhB,gBAAgB,EAAA,CAAA,CAAA;4FAAhB,gBAAgB,EAAA,UAAA,EAAA,CAAA;kBAD5B,UAAU;;;ACRX;;AAEG;;;;"}

package/fesm2020/nakedcreativity-membrs-angular-helper.mjs

@@ -1,12 +1,14 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject, NgModule } from '@angular/core';
+import * as i1$1 from '@auth0/angular-jwt';
 import { JwtHelperService, JwtModule } from '@auth0/angular-jwt';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, from, throwError } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpClientModule } from '@angular/common/http';
 import { CommonModule } from '@angular/common';
+import * as i3 from '@uirouter/angular';
 import { Transition, UIRouter, UIRouterModule } from '@uirouter/angular';
-import { finalize } from 'rxjs/operators';
+import { switchMap, catchError, finalize, tap } from 'rxjs/operators';
 
 /**
  * This is not a real service, but it looks like it from the outside.
@@ -19,6 +21,7 @@ class MembrsService {
     constructor(http, config) {
         this.http = http;
         this.config = config;
+        this.decodedReady = new BehaviorSubject(null);
         this._lsKey = 'membrs';
         this._loggedInObservable = new BehaviorSubject(false);
         // console.log('membrs constructor')
@@ -28,41 +31,52 @@ class MembrsService {
         }
     }
     reissue(token) {
+        console.log('Reissuing token...'); // Log function entry
         return new Promise((resolve, reject) => {
             if (!token && !this._token) {
+                console.log('No token provided and no token found.'); // Log missing token
                 reject('NOT_LOGGED_IN');
             }
-            if (token)
+            if (token) {
+                console.log(`Token provided: ${token}`); // Log provided token
                 this.token = token;
+            }
             // check stored token has not expired, or needs to be reissued soon
             var reissueIn = this._decoded.exp - Math.floor(Date.now() / 1000);
             // token has expired
             if (reissueIn < 0) {
+                console.log('Token has expired.'); // Log expired token
                 reject('NOT_LOGGED_IN');
             }
             // token expiring soon
             if (reissueIn < 300) {
+                console.log('Token expiring soon. Reissuing...'); // Log imminent expiration
                 this.http.post(this.config.apiProtocol + this.config.api + '/token/' + this._token, {}).subscribe((response) => {
                     if (response.token) {
                         this.token = response.token;
                         this._loggedInObservable.next(true);
+                        console.log('Token successfully reissued.'); // Log success
                         resolve(this._token);
                     }
                     else {
+                        console.log('Failed to reissue token.'); // Log failure
                         reject('NOT_LOGGED_IN');
                     }
-                }, error => {
+                }, (error) => {
+                    console.log('Error reissuing token:', error); // Log error details
                     reject('NOT_LOGGED_IN');
                 });
             }
             else {
                 this._loggedInObservable.next(true);
+                console.log('Token is valid. No need to reissue.'); // Log valid token
                 resolve(this._token);
             }
         });
     }
     set token(token) {
         this._token = token;
+        console.log('Token set.');
         localStorage.setItem(this._lsKey, token);
         this._decoded = jwtService.decodeToken(this._token);
     }
@@ -75,6 +89,14 @@ class MembrsService {
     get profile() {
         return this._decoded;
     }
+    setProfile(decodedData) {
+        this._decoded = decodedData;
+        this.decodedReady.next(decodedData); // Emit the new value when profile is set
+        console.log(this.decodedReady);
+    }
+    get decodedReady$() {
+        return this.decodedReady.asObservable();
+    }
     get token() {
         return this._token;
     }
@@ -90,16 +112,19 @@ class MembrsService {
                 this._token = null;
                 localStorage.removeItem(this._lsKey);
                 resolve(this.config.login);
-                //this.router.stateService.go('dashboard')
             }, error => {
-                reject(error);
+                // If the API call fails (e.g. token already invalid/expired), still clear local state
+                console.warn('Logout API call failed, clearing local token anyway', error);
+                this._token = null;
+                localStorage.removeItem(this._lsKey);
+                resolve(this.config.login);
             });
         });
     }
 }
-MembrsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsService, deps: [{ token: i1.HttpClient }, { token: MembrsConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
-MembrsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsService, decorators: [{
+MembrsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsService, deps: [{ token: i1.HttpClient }, { token: MembrsConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
+MembrsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -115,8 +140,6 @@ function routerConfigFn(router, injector) {
     const config = injector.get(MembrsConfigService);
     const membrsService = injector.get(MembrsService);
     stateService.defaultErrorHandler(function (error) {
-        console.log('Default error handler - Membrs Angular Helper');
-        console.log(error);
         if (error.detail == 'NOT_LOGGED_IN') {
             membrsService.deleteToken();
             window.location.href = config.login;
@@ -158,7 +181,7 @@ function reissueResolveFn(transition, router, membrsService, membrsConfig) {
             if (localStorage.getItem('redirectUrlAfterLogin')) {
                 const redirect = localStorage.getItem('redirectUrlAfterLogin');
                 localStorage.removeItem('redirectUrlAfterLogin');
-                window.location.href = redirect;
+                window.location.pathname = redirect;
             }
             else {
                 router.stateService.go(membrsConfig.defaultState, {}, { inherit: false });
@@ -177,6 +200,11 @@ function validateResolveFn(transition, router, membrsService, membrsConfig) {
     return new Promise((resolve, reject) => {
         // console.log('validate promise resolve')
         membrsService.reissue().then((response) => {
+            if (localStorage.getItem('redirectUrlAfterLogin')) {
+                const redirect = localStorage.getItem('redirectUrlAfterLogin');
+                localStorage.removeItem('redirectUrlAfterLogin');
+                window.location.pathname = redirect;
+            }
             resolve(null);
         }).catch(error => {
             localStorage.setItem('redirectUrlAfterLogin', window.location.pathname);
@@ -220,8 +248,8 @@ class MembrsModule {
         };
     }
 }
-MembrsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, imports: [CommonModule,
+MembrsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, imports: [CommonModule,
         HttpClientModule,
         JwtModule
         // JwtModule.forRoot({
@@ -235,7 +263,7 @@ MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "
         // }),
         // JwtModule.forRoot({})
     ] });
-MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, imports: [CommonModule,
+MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, imports: [CommonModule,
         HttpClientModule,
         JwtModule
         // JwtModule.forRoot({
@@ -249,7 +277,7 @@ MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "
         // }),
         // JwtModule.forRoot({})
     ] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: MembrsModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
@@ -271,25 +299,60 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
         }] });
 
 class TokenInterceptor {
-    constructor() { }
+    constructor(jwtHelper, membrsService, stateService) {
+        this.jwtHelper = jwtHelper;
+        this.membrsService = membrsService;
+        this.stateService = stateService;
+    }
     intercept(request, next) {
-        console.log('intercept request', localStorage.getItem('membrs'));
-        //this.busyService.busy()
-        request = request.clone({
-            setHeaders: {
-                Authorization: localStorage.getItem('membrs')
+        const token = localStorage.getItem("membrs");
+        if (token && this.jwtHelper.isTokenExpired(token)) {
+            console.log("Token expired. Attempting to reissue.");
+            return from(this.membrsService.reissue()).pipe(switchMap(() => {
+                const refreshedToken = localStorage.getItem("membrs");
+                if (refreshedToken && !this.jwtHelper.isTokenExpired(refreshedToken)) {
+                    console.log("Token successfully reissued.");
+                    request = request.clone({
+                        setHeaders: {
+                            Authorization: refreshedToken,
+                        },
+                    });
+                }
+                return next.handle(request);
+            }), catchError((err) => {
+                console.warn("Token refresh failed. Logging out.");
+                this.membrsService.logout();
+                this.stateService.go("");
+                return throwError(() => err);
+            }), finalize(() => {
+                // this.busyService.finished()
+            }));
+        }
+        if (token && !this.jwtHelper.isTokenExpired(token)) {
+            request = request.clone({
+                setHeaders: {
+                    Authorization: token,
+                },
+            });
+        }
+        return next.handle(request).pipe(tap((event) => {
+            // If this is an HttpResponse, check for x-new-token header
+            if (event && event.type === 4 && event.headers) {
+                const newToken = event.headers.get('x-new-token');
+                if (newToken) {
+                    localStorage.setItem('membrs', newToken);
+                }
             }
-        });
-        return next.handle(request).pipe(finalize(() => {
-            //this.busyService.finished()
+        }), finalize(() => {
+            // this.busyService.finished()
         }));
     }
 }
-TokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TokenInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-TokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TokenInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TokenInterceptor, decorators: [{
+TokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenInterceptor, deps: [{ token: i1$1.JwtHelperService }, { token: MembrsService }, { token: i3.StateService }], target: i0.ɵɵFactoryTarget.Injectable });
+TokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TokenInterceptor, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return []; } });
+        }], ctorParameters: function () { return [{ type: i1$1.JwtHelperService }, { type: MembrsService }, { type: i3.StateService }]; } });
 
 /**
  * Generated bundle index. Do not edit.

package/fesm2020/nakedcreativity-membrs-angular-helper.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"nakedcreativity-membrs-angular-helper.mjs","sources":["../../../projects/membrs/src/lib/config.service.ts","../../../projects/membrs/src/lib/membrs.service.ts","../../../projects/membrs/src/lib/router.config.ts","../../../projects/membrs/src/lib/token.ts","../../../projects/membrs/src/lib/membrs.module.ts","../../../projects/membrs/src/lib/auth.interceptor.ts","../../../projects/membrs/src/nakedcreativity-membrs-angular-helper.ts"],"sourcesContent":["import { InjectionToken } from '@angular/core';\nimport { MembrsConfig } from './config.interface';\n\n/**\n * This is not a real service, but it looks like it from the outside.\n * It's just an InjectionTToken used to import the config object, provided from the outside\n */\nexport const MembrsConfigService = new InjectionToken<MembrsConfig>(\"MembrsConfig\");\n","import { Injectable, Inject } from '@angular/core';\nimport { JwtHelperService } from '@auth0/angular-jwt';\nimport { HttpClient } from '@angular/common/http'\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\nimport { BehaviorSubject } from 'rxjs';\nconst jwtService = new JwtHelperService()\n\n@Injectable({\n  providedIn: 'root'\n})\n\n\nexport class MembrsService {\n\n  _token: string;\n  _decoded: any;\n  _lsKey: string = 'membrs';\n  _loggedInObservable: BehaviorSubject<Boolean> = new BehaviorSubject(false)\n\n  constructor(private http: HttpClient, @Inject(MembrsConfigService) private config: MembrsConfig) {\n\n    // console.log('membrs constructor')\n    // if the token exists in local storage, retrieve it back to the service\n    if(localStorage.getItem(this._lsKey)){\n      this.token = localStorage.getItem(this._lsKey)\n    }\n  \n  }\n\n  reissue(token?:string){\n\n    return new Promise((resolve, reject)=>{\n\n      if(!token && !this._token){\n        reject('NOT_LOGGED_IN')\n      }\n\n      if(token)\n        this.token = token\n\n      // check stored token has not expired, or needs to be reissued soon\n      var reissueIn = this._decoded.exp - Math.floor(Date.now()/1000)\n\n      // token has expired\n      if(reissueIn < 0){\n        reject('NOT_LOGGED_IN')\n      }\n      \n      // token expiring soon\n      if(reissueIn < 300){\n\n        this.http.post(this.config.apiProtocol + this.config.api+'/token/'+this._token, {}).subscribe((response:any)=>{\n\n          if(response.token){\n            this.token = response.token\n            this._loggedInObservable.next(true)\n            resolve(this._token)\n          }else {\n            reject('NOT_LOGGED_IN')\n          }\n          \n        }, error=>{\n          reject('NOT_LOGGED_IN')\n        })\n\n      }else {\n        this._loggedInObservable.next(true)\n        resolve(this._token)\n      }\n      \n    })\n    \n  }\n\n  set token(token){\n    this._token = token\n    localStorage.setItem(this._lsKey, token)\n    this._decoded = jwtService.decodeToken(this._token)\n  }\n\n  deleteToken(){\n    localStorage.removeItem(this._lsKey)\n  }\n\n  isLoggedIn(){\n    return this.token ? true : false\n  }\n\n  get profile(){\n    return this._decoded\n  }\n\n  get token(){\n    return this._token\n  }\n\n  get admin (){\n    return this.profile.permission == 1\n  }\n\n  get isLoggedInObservable(){\n    return this._loggedInObservable\n  }\n  \n  logout(){\n    return new Promise((resolve, reject)=>{\n      this.http.delete(this.config.apiProtocol+this.config.api+'/token/'+this._token).subscribe((response:any)=>{\n        this._token = null;\n        localStorage.removeItem(this._lsKey)\n        resolve(this.config.login)\n        //this.router.stateService.go('dashboard')\n      }, error=>{\n        reject(error)\n      })\n    })\n    \n  }\n\n\n}\n","import { UIRouter } from '@uirouter/core';\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\nimport { Injector } from '@angular/core';\nimport { MembrsService } from './membrs.service';\n\nexport function routerConfigFn(router: UIRouter, injector: Injector) {\n\n  const transitionService = router.transitionService;\n  const stateService = router.stateService\n  const config:MembrsConfig = injector.get(MembrsConfigService)\n  const membrsService = injector.get(MembrsService)\n\n \tstateService.defaultErrorHandler(function(error) {\n\t\t \n\t\tconsole.log('Default error handler - Membrs Angular Helper')\n\t\tconsole.log(error)\n\t\t\t\n\t\tif(error.detail == 'NOT_LOGGED_IN'){\n\t\t\tmembrsService.deleteToken()\n\t\t\twindow.location.href = config.login;\n\t\t}\n\n\t\tif(error.detail == 'INSUFFICIENT_PERMISSIONS')\n\t\t\tstateService.go(config.defaultState)\n\n\t});\n\t\n}","export function retrieveToken() {\n    // console.log('retrieve from ls')\n    return localStorage.getItem('membrs');\n}","import { NgModule, ModuleWithProviders, Injector } from '@angular/core';\nimport { CommonModule } from '@angular/common';\nimport { MembrsService } from './membrs.service';\nimport { JwtModule, JWT_OPTIONS } from \"@auth0/angular-jwt\";\nimport { HttpClientModule } from \"@angular/common/http\";\nimport { UIRouterModule } from '@uirouter/angular'\n\nimport { Ng2StateDeclaration } from '@uirouter/angular';\nimport { Transition, UIRouter } from '@uirouter/angular'\n\nimport { routerConfigFn } from './router.config';\nimport { MembrsConfig } from './config.interface';\nimport { MembrsConfigService } from './config.service';\nimport { retrieveToken } from './token';\n\nexport const validateResolve = {\n    token: 'reissue',\n    deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n    resolveFn: validateResolveFn\n}\n\nexport const reissueResolve = {\n  token: 'reissue',\n  deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n  resolveFn: reissueResolveFn\n}\n\nexport const reissueState:Ng2StateDeclaration = {\n\tname: 'reissue', \n\turl: '/reissue?token',\n\tviews: { },\n\tresolve: [\n    reissueResolve\n\t]\n}\n\nexport function reissueResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n    \n    //console.log(membrsService)\n    return new Promise((resolve, reject) => {\n      // console.log('reissue promise resolve')\n      // console.log(transition.params().token)\n      membrsService.reissue(transition.params().token).then((response)=>{\n          if(localStorage.getItem('redirectUrlAfterLogin')){\n            const redirect = localStorage.getItem('redirectUrlAfterLogin')\n            localStorage.removeItem('redirectUrlAfterLogin')\n            window.location.href = redirect\n          }else {\n            router.stateService.go(membrsConfig.defaultState, {}, {inherit:false})\n          }\n          reject()\n      }).catch(error=>{\n          //console.log('error in reissue resolve')\n          //console.log(error)\n          //window.location.href = environment.login\n          reject(error)\n      })\n\n\t})\n}\n\nexport function validateResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n  \n  //console.log(membrsService)\n  return new Promise((resolve, reject) => {\n    // console.log('validate promise resolve')\n    \n    membrsService.reissue().then((response)=>{\n      resolve(null)\n    }).catch(error=>{\n      localStorage.setItem('redirectUrlAfterLogin', window.location.pathname)\n      window.location.href = membrsConfig.login\n      reject(error)\n    })\n\n})\n}\n\nexport function jwtOptionsFactory(config) {\n  // console.log('jwt options factory')\n  // console.log(config)\n  return {\n    tokenGetter: () => {\n      console.log('token getter',  localStorage.getItem('membrs'))\n      return localStorage.getItem('membrs');\n    },\n    allowedDomains: [config.api]\n  }\n}\n\n\n/** The top level state(s) */\nexport const STATES = [\n    reissueState\n]\n\n\n@NgModule({\n  imports: [\n    CommonModule,\n    HttpClientModule,\n    JwtModule\n    // JwtModule.forRoot({\n    //   config: {\n    //     tokenGetter: retrieveToken\n    //   }\n    // })\n    // UIRouterModule.forChild({\n    //   states: STATES,\n    //   config: routerConfigFn,\n    // }),\n    // JwtModule.forRoot({})\n  ]\n})\n\n\n\nexport class MembrsModule { \n  static forRoot(config: MembrsConfig): ModuleWithProviders<MembrsModule> {\n\n\n    const moduleProviders = UIRouterModule.forChild({\n      states: STATES,\n      config: routerConfigFn\n    }).providers\n\n    moduleProviders.push(JwtModule.forRoot({\n      config: {\n        tokenGetter: retrieveToken,\n        allowedDomains: []\n      }\n    }).providers)\n      \n    moduleProviders.push(MembrsService)\n    moduleProviders.push({provide: MembrsConfigService,useValue: config});\n    \n   \n    return {\n      ngModule: MembrsModule, \n      providers: moduleProviders //[{provide: MembrsConfigService,useValue: config}]\n    };\n    \n  }\n\n}\n","import { Injectable } from '@angular/core';\nimport {\n  HttpRequest,\n  HttpHandler,\n  HttpEvent,\n  HttpInterceptor\n} from '@angular/common/http';\nimport { Observable } from 'rxjs';\n//import { NgBusyService } from '@nakedcreativity/ng-busy';\nimport { finalize } from 'rxjs/operators';\n\n\n@Injectable()\nexport class TokenInterceptor implements HttpInterceptor {\n  constructor() {}\n  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n    \n    console.log('intercept request', localStorage.getItem('membrs'))\n    //this.busyService.busy()\n    request = request.clone({\n      setHeaders: {\n        Authorization: localStorage.getItem('membrs')\n      }\n    });\n    return next.handle(request).pipe(finalize(()=>{\n      //this.busyService.finished()\n    }));\n  }\n}","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"nakedcreativity-membrs-angular-helper.mjs","sources":["../../../projects/membrs/src/lib/config.service.ts","../../../projects/membrs/src/lib/membrs.service.ts","../../../projects/membrs/src/lib/router.config.ts","../../../projects/membrs/src/lib/token.ts","../../../projects/membrs/src/lib/membrs.module.ts","../../../projects/membrs/src/lib/auth.interceptor.ts","../../../projects/membrs/src/nakedcreativity-membrs-angular-helper.ts"],"sourcesContent":["import { InjectionToken } from '@angular/core';\nimport { MembrsConfig } from './config.interface';\n\n/**\n * This is not a real service, but it looks like it from the outside.\n * It's just an InjectionTToken used to import the config object, provided from the outside\n */\nexport const MembrsConfigService = new InjectionToken<MembrsConfig>(\"MembrsConfig\");\n","import { Injectable, Inject } from '@angular/core';\nimport { JwtHelperService } from '@auth0/angular-jwt';\nimport { HttpClient } from '@angular/common/http'\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\nimport { BehaviorSubject } from 'rxjs';\nconst jwtService = new JwtHelperService()\n\n@Injectable({\n  providedIn: 'root'\n})\n\n\nexport class MembrsService {\n\n  _token: string;\n  _decoded: any;\n\n  public decodedReady = new BehaviorSubject<any>(null);\n\n  _lsKey: string = 'membrs';\n  _loggedInObservable: BehaviorSubject<Boolean> = new BehaviorSubject(false)\n\n  constructor(private http: HttpClient, @Inject(MembrsConfigService) private config: MembrsConfig) {\n\n    // console.log('membrs constructor')\n    // if the token exists in local storage, retrieve it back to the service\n    if(localStorage.getItem(this._lsKey)){\n      this.token = localStorage.getItem(this._lsKey)\n    }\n  \n  }\n\n  reissue(token?: string) {\n    console.log('Reissuing token...'); // Log function entry\n    \n    return new Promise((resolve, reject) => {\n      if (!token && !this._token) {\n        console.log('No token provided and no token found.'); // Log missing token\n        reject('NOT_LOGGED_IN');\n      }\n  \n      if (token) {\n        console.log(`Token provided: ${token}`); // Log provided token\n        this.token = token;\n      }\n  \n      // check stored token has not expired, or needs to be reissued soon\n      var reissueIn = this._decoded.exp - Math.floor(Date.now() / 1000);\n  \n      // token has expired\n      if (reissueIn < 0) {\n        console.log('Token has expired.'); // Log expired token\n        reject('NOT_LOGGED_IN');\n      }\n  \n      // token expiring soon\n      if (reissueIn < 300) {\n        console.log('Token expiring soon. Reissuing...'); // Log imminent expiration\n        this.http.post(this.config.apiProtocol + this.config.api + '/token/' + this._token, {}).subscribe(\n          (response: any) => {\n            if (response.token) {\n              this.token = response.token;\n              this._loggedInObservable.next(true);\n              console.log('Token successfully reissued.'); // Log success\n              resolve(this._token);\n            } else {\n              console.log('Failed to reissue token.'); // Log failure\n              reject('NOT_LOGGED_IN');\n            }\n          },\n          (error) => {\n            console.log('Error reissuing token:', error); // Log error details\n            reject('NOT_LOGGED_IN');\n          }\n        );\n      } else {\n        this._loggedInObservable.next(true);\n        console.log('Token is valid. No need to reissue.'); // Log valid token\n        resolve(this._token);\n      }\n    });\n  }\n  \n\n  set token(token){\n    this._token = token\n    console.log('Token set.');\n    localStorage.setItem(this._lsKey, token)\n    this._decoded = jwtService.decodeToken(this._token)\n  }\n\n  deleteToken(){\n    localStorage.removeItem(this._lsKey)\n  }\n\n  isLoggedIn(){\n    return this.token ? true : false\n  }\n\n  get profile(){\n    return this._decoded\n  }\n\n  setProfile(decodedData) {\n    this._decoded = decodedData;\n    this.decodedReady.next(decodedData); // Emit the new value when profile is set\n    console.log(this.decodedReady);\n  }\n\n  get decodedReady$() {\n    return this.decodedReady.asObservable();\n  }\n\n  get token(){\n    return this._token\n  }\n\n  get admin (){\n    return this.profile.permission == 1\n  }\n\n  get isLoggedInObservable(){\n    return this._loggedInObservable\n  }\n  \n  logout(){\n    return new Promise((resolve, reject)=>{\n      this.http.delete(this.config.apiProtocol + this.config.api + '/token/' + this._token).subscribe((response:any)=>{\n        this._token = null;\n        localStorage.removeItem(this._lsKey);\n        resolve(this.config.login);\n      }, error => {\n        // If the API call fails (e.g. token already invalid/expired), still clear local state\n        console.warn('Logout API call failed, clearing local token anyway', error);\n        this._token = null;\n        localStorage.removeItem(this._lsKey);\n        resolve(this.config.login);\n      });\n    });\n  }\n\n\n}\n","import { UIRouter } from '@uirouter/core';\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\nimport { Injector } from '@angular/core';\nimport { MembrsService } from './membrs.service';\n\nexport function routerConfigFn(router: UIRouter, injector: Injector) {\n\n  const transitionService = router.transitionService;\n  const stateService = router.stateService\n  const config:MembrsConfig = injector.get(MembrsConfigService)\n  const membrsService = injector.get(MembrsService)\n\n \tstateService.defaultErrorHandler(function(error) {\n\t\t \t\n\t\tif(error.detail == 'NOT_LOGGED_IN'){\n\t\t\tmembrsService.deleteToken()\n\t\t\twindow.location.href = config.login;\n\t\t}\n\n\t\tif(error.detail == 'INSUFFICIENT_PERMISSIONS')\n\t\t\tstateService.go(config.defaultState)\n\n\t});\n\t\n}","export function retrieveToken() {\n    // console.log('retrieve from ls')\n    return localStorage.getItem('membrs');\n}","import { NgModule, ModuleWithProviders, Injector } from '@angular/core';\nimport { CommonModule } from '@angular/common';\nimport { MembrsService } from './membrs.service';\nimport { JwtModule, JWT_OPTIONS } from \"@auth0/angular-jwt\";\nimport { HttpClientModule } from \"@angular/common/http\";\nimport { UIRouterModule } from '@uirouter/angular'\n\nimport { Ng2StateDeclaration } from '@uirouter/angular';\nimport { Transition, UIRouter } from '@uirouter/angular'\n\nimport { routerConfigFn } from './router.config';\nimport { MembrsConfig } from './config.interface';\nimport { MembrsConfigService } from './config.service';\nimport { retrieveToken } from './token';\n\nexport const validateResolve = {\n    token: 'reissue',\n    deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n    resolveFn: validateResolveFn\n}\n\nexport const reissueResolve = {\n  token: 'reissue',\n  deps: [ Transition, UIRouter, MembrsService, MembrsConfigService ],\n  resolveFn: reissueResolveFn\n}\n\nexport const reissueState:Ng2StateDeclaration = {\n\tname: 'reissue', \n\turl: '/reissue?token',\n\tviews: { },\n\tresolve: [\n    reissueResolve\n\t]\n}\n\nexport function reissueResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n    \n    //console.log(membrsService)\n    return new Promise((resolve, reject) => {\n      // console.log('reissue promise resolve')\n      // console.log(transition.params().token)\n      membrsService.reissue(transition.params().token).then((response)=>{\n          if(localStorage.getItem('redirectUrlAfterLogin')){\n            const redirect = localStorage.getItem('redirectUrlAfterLogin')\n            localStorage.removeItem('redirectUrlAfterLogin')\n            window.location.pathname = redirect\n          }else {\n            router.stateService.go(membrsConfig.defaultState, {}, {inherit:false})\n          }\n          reject()\n      }).catch(error=>{\n          //console.log('error in reissue resolve')\n          //console.log(error)\n          //window.location.href = environment.login\n          reject(error)\n      })\n\n\t})\n}\n\nexport function validateResolveFn(transition, router, membrsService, membrsConfig:MembrsConfig) {\n  \n  //console.log(membrsService)\n  return new Promise((resolve, reject) => {\n    // console.log('validate promise resolve')\n    \n    membrsService.reissue().then((response)=>{\n      if(localStorage.getItem('redirectUrlAfterLogin')){\n        const redirect = localStorage.getItem('redirectUrlAfterLogin')\n        localStorage.removeItem('redirectUrlAfterLogin')\n        window.location.pathname = redirect\n      }\n      resolve(null)\n    }).catch(error=>{\n      localStorage.setItem('redirectUrlAfterLogin', window.location.pathname)\n      window.location.href = membrsConfig.login\n      reject(error)\n    })\n\n})\n}\n\nexport function jwtOptionsFactory(config) {\n  // console.log('jwt options factory')\n  // console.log(config)\n  return {\n    tokenGetter: () => {\n      console.log('token getter',  localStorage.getItem('membrs'))\n      return localStorage.getItem('membrs');\n    },\n    allowedDomains: [config.api]\n  }\n}\n\n\n/** The top level state(s) */\nexport const STATES = [\n    reissueState\n]\n\n\n@NgModule({\n  imports: [\n    CommonModule,\n    HttpClientModule,\n    JwtModule\n    // JwtModule.forRoot({\n    //   config: {\n    //     tokenGetter: retrieveToken\n    //   }\n    // })\n    // UIRouterModule.forChild({\n    //   states: STATES,\n    //   config: routerConfigFn,\n    // }),\n    // JwtModule.forRoot({})\n  ]\n})\n\n\n\nexport class MembrsModule { \n  static forRoot(config: MembrsConfig): ModuleWithProviders<MembrsModule> {\n\n\n    const moduleProviders = UIRouterModule.forChild({\n      states: STATES,\n      config: routerConfigFn\n    }).providers\n\n    moduleProviders.push(JwtModule.forRoot({\n      config: {\n        tokenGetter: retrieveToken,\n        allowedDomains: []\n      }\n    }).providers)\n      \n    moduleProviders.push(MembrsService)\n    moduleProviders.push({provide: MembrsConfigService,useValue: config});\n    \n   \n    return {\n      ngModule: MembrsModule, \n      providers: moduleProviders //[{provide: MembrsConfigService,useValue: config}]\n    };\n    \n  }\n\n}\n","import { JwtHelperService } from \"@auth0/angular-jwt\";\nimport { Injectable } from \"@angular/core\";\nimport { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from \"@angular/common/http\";\nimport { Observable, from, throwError } from \"rxjs\";\nimport { switchMap, catchError, finalize, tap } from \"rxjs/operators\";\nimport { MembrsService } from \"./membrs.service\";\nimport { StateService } from \"@uirouter/angular\";\n\n@Injectable()\nexport class TokenInterceptor implements HttpInterceptor {\n  constructor(private jwtHelper: JwtHelperService, private membrsService: MembrsService, private stateService: StateService) {}\n\n  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n    const token = localStorage.getItem(\"membrs\");\n\n    if (token && this.jwtHelper.isTokenExpired(token)) {\n      console.log(\"Token expired. Attempting to reissue.\");\n      return from(this.membrsService.reissue()).pipe(\n        switchMap(() => {\n          const refreshedToken = localStorage.getItem(\"membrs\");\n          if (refreshedToken && !this.jwtHelper.isTokenExpired(refreshedToken)) {\n            console.log(\"Token successfully reissued.\");\n            request = request.clone({\n              setHeaders: {\n                Authorization: refreshedToken,\n              },\n            });\n          }\n          return next.handle(request);\n        }),\n        catchError((err) => {\n          console.warn(\"Token refresh failed. Logging out.\");\n          this.membrsService.logout();\n          this.stateService.go(\"\");\n          return throwError(() => err);\n        }),\n        finalize(() => {\n          // this.busyService.finished()\n        })\n      );\n    }\n\n    if (token && !this.jwtHelper.isTokenExpired(token)) {\n      request = request.clone({\n        setHeaders: {\n          Authorization: token,\n        },\n      });\n    }\n\n    return next.handle(request).pipe(\n      tap((event) => {\n        // If this is an HttpResponse, check for x-new-token header\n        if (event && event.type === 4 && event.headers) {\n          const newToken = event.headers.get('x-new-token');\n          if (newToken) {\n            localStorage.setItem('membrs', newToken);\n          }\n        }\n      }),\n      finalize(() => {\n        // this.busyService.finished()\n      })\n    );\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":["i1","i2.MembrsService"],"mappings":"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"}

package/lib/auth.interceptor.d.ts

@@ -1,8 +1,14 @@
-import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http';
-import { Observable } from 'rxjs';
+import { JwtHelperService } from "@auth0/angular-jwt";
+import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from "@angular/common/http";
+import { Observable } from "rxjs";
+import { MembrsService } from "./membrs.service";
+import { StateService } from "@uirouter/angular";
 import * as i0 from "@angular/core";
 export declare class TokenInterceptor implements HttpInterceptor {
-    constructor();
+    private jwtHelper;
+    private membrsService;
+    private stateService;
+    constructor(jwtHelper: JwtHelperService, membrsService: MembrsService, stateService: StateService);
     intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>;
     static ɵfac: i0.ɵɵFactoryDeclaration<TokenInterceptor, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<TokenInterceptor>;

package/lib/membrs.service.d.ts

@@ -7,6 +7,7 @@ export declare class MembrsService {
     private config;
     _token: string;
     _decoded: any;
+    decodedReady: BehaviorSubject<any>;
     _lsKey: string;
     _loggedInObservable: BehaviorSubject<Boolean>;
     constructor(http: HttpClient, config: MembrsConfig);
@@ -15,6 +16,8 @@ export declare class MembrsService {
     deleteToken(): void;
     isLoggedIn(): boolean;
     get profile(): any;
+    setProfile(decodedData: any): void;
+    get decodedReady$(): import("rxjs").Observable<any>;
     get token(): string;
     get admin(): boolean;
     get isLoggedInObservable(): BehaviorSubject<Boolean>;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@nakedcreativity/membrs-angular-helper",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "peerDependencies": {
-    "@angular/common": "^15.x",
-    "@angular/core": "^15.x",
+    "@angular/common": ">=15.0.0",
+    "@angular/core": ">=15.0.0",
     "@uirouter/angular": "^11.x",
     "@auth0/angular-jwt": "^5.x"
   },