@nakedcreativity/membrs-angular-helper 0.1.5 → 0.1.7

package/package.json

@@ -1,20 +1,16 @@
 {
   "name": "@nakedcreativity/membrs-angular-helper",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "peerDependencies": {
     "@angular/common": ">=15.0.0",
     "@angular/core": ">=15.0.0",
-    "@uirouter/angular": "^11.x",
+    "@uirouter/angular": ">=11.0.0",
     "@auth0/angular-jwt": "^5.x"
   },
   "dependencies": {
     "tslib": "^2.0.0"
   },
-  "module": "fesm2015/nakedcreativity-membrs-angular-helper.mjs",
-  "es2020": "fesm2020/nakedcreativity-membrs-angular-helper.mjs",
-  "esm2020": "esm2020/nakedcreativity-membrs-angular-helper.mjs",
-  "fesm2020": "fesm2020/nakedcreativity-membrs-angular-helper.mjs",
-  "fesm2015": "fesm2015/nakedcreativity-membrs-angular-helper.mjs",
+  "module": "fesm2022/nakedcreativity-membrs-angular-helper.mjs",
   "typings": "index.d.ts",
   "exports": {
     "./package.json": {
@@ -22,11 +18,9 @@
     },
     ".": {
       "types": "./index.d.ts",
-      "esm2020": "./esm2020/nakedcreativity-membrs-angular-helper.mjs",
-      "es2020": "./fesm2020/nakedcreativity-membrs-angular-helper.mjs",
-      "es2015": "./fesm2015/nakedcreativity-membrs-angular-helper.mjs",
-      "node": "./fesm2015/nakedcreativity-membrs-angular-helper.mjs",
-      "default": "./fesm2020/nakedcreativity-membrs-angular-helper.mjs"
+      "esm2022": "./esm2022/nakedcreativity-membrs-angular-helper.mjs",
+      "esm": "./esm2022/nakedcreativity-membrs-angular-helper.mjs",
+      "default": "./fesm2022/nakedcreativity-membrs-angular-helper.mjs"
     }
   },
   "sideEffects": false

package/esm2020/lib/auth.interceptor.mjs

@@ -1,63 +0,0 @@
-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(jwtHelper, membrsService, stateService) {
-        this.jwtHelper = jwtHelper;
-        this.membrsService = membrsService;
-        this.stateService = stateService;
-    }
-    intercept(request, next) {
-        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);
-                }
-            }
-        }), finalize(() => {
-            // this.busyService.finished()
-        }));
-    }
-}
-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 [{ type: i1.JwtHelperService }, { type: i2.MembrsService }, { type: i3.StateService }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL21lbWJycy9zcmMvbGliL2F1dGguaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQWMsSUFBSSxFQUFFLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNwRCxPQUFPLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBS3RFLE1BQU0sT0FBTyxnQkFBZ0I7SUFDM0IsWUFBb0IsU0FBMkIsRUFBVSxhQUE0QixFQUFVLFlBQTBCO1FBQXJHLGNBQVMsR0FBVCxTQUFTLENBQWtCO1FBQVUsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFBVSxpQkFBWSxHQUFaLFlBQVksQ0FBYztJQUFHLENBQUM7SUFFN0gsU0FBUyxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDcEQsTUFBTSxLQUFLLEdBQUcsWUFBWSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUU3QyxJQUFJLEtBQUssSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNqRCxPQUFPLENBQUMsR0FBRyxDQUFDLHVDQUF1QyxDQUFDLENBQUM7WUFDckQsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FDNUMsU0FBUyxDQUFDLEdBQUcsRUFBRTtnQkFDYixNQUFNLGNBQWMsR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO2dCQUN0RCxJQUFJLGNBQWMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxFQUFFO29CQUNwRSxPQUFPLENBQUMsR0FBRyxDQUFDLDhCQUE4QixDQUFDLENBQUM7b0JBQzVDLE9BQU8sR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO3dCQUN0QixVQUFVLEVBQUU7NEJBQ1YsYUFBYSxFQUFFLGNBQWM7eUJBQzlCO3FCQUNGLENBQUMsQ0FBQztpQkFDSjtnQkFDRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDOUIsQ0FBQyxDQUFDLEVBQ0YsVUFBVSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7Z0JBQ2pCLE9BQU8sQ0FBQyxJQUFJLENBQUMsb0NBQW9DLENBQUMsQ0FBQztnQkFDbkQsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFDNUIsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ3pCLE9BQU8sVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQy9CLENBQUMsQ0FBQyxFQUNGLFFBQVEsQ0FBQyxHQUFHLEVBQUU7Z0JBQ1osOEJBQThCO1lBQ2hDLENBQUMsQ0FBQyxDQUNILENBQUM7U0FDSDtRQUVELElBQUksS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDbEQsT0FBTyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUM7Z0JBQ3RCLFVBQVUsRUFBRTtvQkFDVixhQUFhLEVBQUUsS0FBSztpQkFDckI7YUFDRixDQUFDLENBQUM7U0FDSjtRQUVELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQzlCLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ1osMkRBQTJEO1lBQzNELElBQUksS0FBSyxJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssQ0FBQyxJQUFJLEtBQUssQ0FBQyxPQUFPLEVBQUU7Z0JBQzlDLE1BQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO2dCQUNsRCxJQUFJLFFBQVEsRUFBRTtvQkFDWixZQUFZLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztpQkFDMUM7YUFDRjtRQUNILENBQUMsQ0FBQyxFQUNGLFFBQVEsQ0FBQyxHQUFHLEVBQUU7WUFDWiw4QkFBOEI7UUFDaEMsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7OzhHQXZEVSxnQkFBZ0I7a0hBQWhCLGdCQUFnQjs0RkFBaEIsZ0JBQWdCO2tCQUQ1QixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSnd0SGVscGVyU2VydmljZSB9IGZyb20gXCJAYXV0aDAvYW5ndWxhci1qd3RcIjtcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tIFwiQGFuZ3VsYXIvY29yZVwiO1xuaW1wb3J0IHsgSHR0cFJlcXVlc3QsIEh0dHBIYW5kbGVyLCBIdHRwRXZlbnQsIEh0dHBJbnRlcmNlcHRvciB9IGZyb20gXCJAYW5ndWxhci9jb21tb24vaHR0cFwiO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgZnJvbSwgdGhyb3dFcnJvciB9IGZyb20gXCJyeGpzXCI7XG5pbXBvcnQgeyBzd2l0Y2hNYXAsIGNhdGNoRXJyb3IsIGZpbmFsaXplLCB0YXAgfSBmcm9tIFwicnhqcy9vcGVyYXRvcnNcIjtcbmltcG9ydCB7IE1lbWJyc1NlcnZpY2UgfSBmcm9tIFwiLi9tZW1icnMuc2VydmljZVwiO1xuaW1wb3J0IHsgU3RhdGVTZXJ2aWNlIH0gZnJvbSBcIkB1aXJvdXRlci9hbmd1bGFyXCI7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBUb2tlbkludGVyY2VwdG9yIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBqd3RIZWxwZXI6IEp3dEhlbHBlclNlcnZpY2UsIHByaXZhdGUgbWVtYnJzU2VydmljZTogTWVtYnJzU2VydmljZSwgcHJpdmF0ZSBzdGF0ZVNlcnZpY2U6IFN0YXRlU2VydmljZSkge31cblxuICBpbnRlcmNlcHQocmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XG4gICAgY29uc3QgdG9rZW4gPSBsb2NhbFN0b3JhZ2UuZ2V0SXRlbShcIm1lbWJyc1wiKTtcblxuICAgIGlmICh0b2tlbiAmJiB0aGlzLmp3dEhlbHBlci5pc1Rva2VuRXhwaXJlZCh0b2tlbikpIHtcbiAgICAgIGNvbnNvbGUubG9nKFwiVG9rZW4gZXhwaXJlZC4gQXR0ZW1wdGluZyB0byByZWlzc3VlLlwiKTtcbiAgICAgIHJldHVybiBmcm9tKHRoaXMubWVtYnJzU2VydmljZS5yZWlzc3VlKCkpLnBpcGUoXG4gICAgICAgIHN3aXRjaE1hcCgoKSA9PiB7XG4gICAgICAgICAgY29uc3QgcmVmcmVzaGVkVG9rZW4gPSBsb2NhbFN0b3JhZ2UuZ2V0SXRlbShcIm1lbWJyc1wiKTtcbiAgICAgICAgICBpZiAocmVmcmVzaGVkVG9rZW4gJiYgIXRoaXMuand0SGVscGVyLmlzVG9rZW5FeHBpcmVkKHJlZnJlc2hlZFRva2VuKSkge1xuICAgICAgICAgICAgY29uc29sZS5sb2coXCJUb2tlbiBzdWNjZXNzZnVsbHkgcmVpc3N1ZWQuXCIpO1xuICAgICAgICAgICAgcmVxdWVzdCA9IHJlcXVlc3QuY2xvbmUoe1xuICAgICAgICAgICAgICBzZXRIZWFkZXJzOiB7XG4gICAgICAgICAgICAgICAgQXV0aG9yaXphdGlvbjogcmVmcmVzaGVkVG9rZW4sXG4gICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICB9KTtcbiAgICAgICAgICB9XG4gICAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpO1xuICAgICAgICB9KSxcbiAgICAgICAgY2F0Y2hFcnJvcigoZXJyKSA9PiB7XG4gICAgICAgICAgY29uc29sZS53YXJuKFwiVG9rZW4gcmVmcmVzaCBmYWlsZWQuIExvZ2dpbmcgb3V0LlwiKTtcbiAgICAgICAgICB0aGlzLm1lbWJyc1NlcnZpY2UubG9nb3V0KCk7XG4gICAgICAgICAgdGhpcy5zdGF0ZVNlcnZpY2UuZ28oXCJcIik7XG4gICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoKCkgPT4gZXJyKTtcbiAgICAgICAgfSksXG4gICAgICAgIGZpbmFsaXplKCgpID0+IHtcbiAgICAgICAgICAvLyB0aGlzLmJ1c3lTZXJ2aWNlLmZpbmlzaGVkKClcbiAgICAgICAgfSlcbiAgICAgICk7XG4gICAgfVxuXG4gICAgaWYgKHRva2VuICYmICF0aGlzLmp3dEhlbHBlci5pc1Rva2VuRXhwaXJlZCh0b2tlbikpIHtcbiAgICAgIHJlcXVlc3QgPSByZXF1ZXN0LmNsb25lKHtcbiAgICAgICAgc2V0SGVhZGVyczoge1xuICAgICAgICAgIEF1dGhvcml6YXRpb246IHRva2VuLFxuICAgICAgICB9LFxuICAgICAgfSk7XG4gICAgfVxuXG4gICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpLnBpcGUoXG4gICAgICB0YXAoKGV2ZW50KSA9PiB7XG4gICAgICAgIC8vIElmIHRoaXMgaXMgYW4gSHR0cFJlc3BvbnNlLCBjaGVjayBmb3IgeC1uZXctdG9rZW4gaGVhZGVyXG4gICAgICAgIGlmIChldmVudCAmJiBldmVudC50eXBlID09PSA0ICYmIGV2ZW50LmhlYWRlcnMpIHtcbiAgICAgICAgICBjb25zdCBuZXdUb2tlbiA9IGV2ZW50LmhlYWRlcnMuZ2V0KCd4LW5ldy10b2tlbicpO1xuICAgICAgICAgIGlmIChuZXdUb2tlbikge1xuICAgICAgICAgICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0oJ21lbWJycycsIG5ld1Rva2VuKTtcbiAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgIH0pLFxuICAgICAgZmluYWxpemUoKCkgPT4ge1xuICAgICAgICAvLyB0aGlzLmJ1c3lTZXJ2aWNlLmZpbmlzaGVkKClcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxufVxuIl19

package/esm2020/lib/membrs.service.mjs

@@ -1,124 +0,0 @@
-import { Injectable, Inject } from '@angular/core';
-import { JwtHelperService } from '@auth0/angular-jwt';
-import { MembrsConfigService } from './config.service';
-import { BehaviorSubject } from 'rxjs';
-import * as i0 from "@angular/core";
-import * as i1 from "@angular/common/http";
-const jwtService = new JwtHelperService();
-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')
-        // if the token exists in local storage, retrieve it back to the service
-        if (localStorage.getItem(this._lsKey)) {
-            this.token = localStorage.getItem(this._lsKey);
-        }
-    }
-    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) {
-                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) => {
-                    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);
-    }
-    deleteToken() {
-        localStorage.removeItem(this._lsKey);
-    }
-    isLoggedIn() {
-        return this.token ? true : false;
-    }
-    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;
-    }
-    get admin() {
-        return this.profile.permission == 1;
-    }
-    get isLoggedInObservable() {
-        return this._loggedInObservable;
-    }
-    logout() {
-        return new Promise((resolve, reject) => {
-            this.http.delete(this.config.apiProtocol + this.config.api + '/token/' + this._token).subscribe((response) => {
-                this._token = null;
-                localStorage.removeItem(this._lsKey);
-                resolve(this.config.login);
-            }, 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: "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'
-                }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: [MembrsConfigService]
-                }] }]; } });
-//# 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/fesm2015/nakedcreativity-membrs-angular-helper.mjs

@@ -1,364 +0,0 @@
-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, 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 { switchMap, catchError, finalize, tap } from 'rxjs/operators';
-
-/**
- * This is not a real service, but it looks like it from the outside.
- * It's just an InjectionTToken used to import the config object, provided from the outside
- */
-const MembrsConfigService = new InjectionToken("MembrsConfig");
-
-const jwtService = new JwtHelperService();
-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')
-        // if the token exists in local storage, retrieve it back to the service
-        if (localStorage.getItem(this._lsKey)) {
-            this.token = localStorage.getItem(this._lsKey);
-        }
-    }
-    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) {
-                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) => {
-                    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);
-    }
-    deleteToken() {
-        localStorage.removeItem(this._lsKey);
-    }
-    isLoggedIn() {
-        return this.token ? true : false;
-    }
-    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;
-    }
-    get admin() {
-        return this.profile.permission == 1;
-    }
-    get isLoggedInObservable() {
-        return this._loggedInObservable;
-    }
-    logout() {
-        return new Promise((resolve, reject) => {
-            this.http.delete(this.config.apiProtocol + this.config.api + '/token/' + this._token).subscribe((response) => {
-                this._token = null;
-                localStorage.removeItem(this._lsKey);
-                resolve(this.config.login);
-            }, 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: "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'
-                }]
-        }], ctorParameters: function () {
-        return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
-                        type: Inject,
-                        args: [MembrsConfigService]
-                    }] }];
-    } });
-
-function routerConfigFn(router, injector) {
-    const transitionService = router.transitionService;
-    const stateService = router.stateService;
-    const config = injector.get(MembrsConfigService);
-    const membrsService = injector.get(MembrsService);
-    stateService.defaultErrorHandler(function (error) {
-        if (error.detail == 'NOT_LOGGED_IN') {
-            membrsService.deleteToken();
-            window.location.href = config.login;
-        }
-        if (error.detail == 'INSUFFICIENT_PERMISSIONS')
-            stateService.go(config.defaultState);
-    });
-}
-
-function retrieveToken() {
-    // console.log('retrieve from ls')
-    return localStorage.getItem('membrs');
-}
-
-const validateResolve = {
-    token: 'reissue',
-    deps: [Transition, UIRouter, MembrsService, MembrsConfigService],
-    resolveFn: validateResolveFn
-};
-const reissueResolve = {
-    token: 'reissue',
-    deps: [Transition, UIRouter, MembrsService, MembrsConfigService],
-    resolveFn: reissueResolveFn
-};
-const reissueState = {
-    name: 'reissue',
-    url: '/reissue?token',
-    views: {},
-    resolve: [
-        reissueResolve
-    ]
-};
-function reissueResolveFn(transition, router, membrsService, membrsConfig) {
-    //console.log(membrsService)
-    return new Promise((resolve, reject) => {
-        // console.log('reissue promise resolve')
-        // console.log(transition.params().token)
-        membrsService.reissue(transition.params().token).then((response) => {
-            if (localStorage.getItem('redirectUrlAfterLogin')) {
-                const redirect = localStorage.getItem('redirectUrlAfterLogin');
-                localStorage.removeItem('redirectUrlAfterLogin');
-                window.location.pathname = redirect;
-            }
-            else {
-                router.stateService.go(membrsConfig.defaultState, {}, { inherit: false });
-            }
-            reject();
-        }).catch(error => {
-            //console.log('error in reissue resolve')
-            //console.log(error)
-            //window.location.href = environment.login
-            reject(error);
-        });
-    });
-}
-function validateResolveFn(transition, router, membrsService, membrsConfig) {
-    //console.log(membrsService)
-    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);
-            window.location.href = membrsConfig.login;
-            reject(error);
-        });
-    });
-}
-function jwtOptionsFactory(config) {
-    // console.log('jwt options factory')
-    // console.log(config)
-    return {
-        tokenGetter: () => {
-            console.log('token getter', localStorage.getItem('membrs'));
-            return localStorage.getItem('membrs');
-        },
-        allowedDomains: [config.api]
-    };
-}
-/** The top level state(s) */
-const STATES = [
-    reissueState
-];
-class MembrsModule {
-    static forRoot(config) {
-        const moduleProviders = UIRouterModule.forChild({
-            states: STATES,
-            config: routerConfigFn
-        }).providers;
-        moduleProviders.push(JwtModule.forRoot({
-            config: {
-                tokenGetter: retrieveToken,
-                allowedDomains: []
-            }
-        }).providers);
-        moduleProviders.push(MembrsService);
-        moduleProviders.push({ provide: MembrsConfigService, useValue: config });
-        return {
-            ngModule: MembrsModule,
-            providers: moduleProviders //[{provide: MembrsConfigService,useValue: config}]
-        };
-    }
-}
-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({
-        //   config: {
-        //     tokenGetter: retrieveToken
-        //   }
-        // })
-        // UIRouterModule.forChild({
-        //   states: STATES,
-        //   config: routerConfigFn,
-        // }),
-        // JwtModule.forRoot({})
-    ] });
-MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, imports: [CommonModule,
-        HttpClientModule,
-        JwtModule
-        // JwtModule.forRoot({
-        //   config: {
-        //     tokenGetter: retrieveToken
-        //   }
-        // })
-        // UIRouterModule.forChild({
-        //   states: STATES,
-        //   config: routerConfigFn,
-        // }),
-        // JwtModule.forRoot({})
-    ] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: MembrsModule, decorators: [{
-            type: NgModule,
-            args: [{
-                    imports: [
-                        CommonModule,
-                        HttpClientModule,
-                        JwtModule
-                        // JwtModule.forRoot({
-                        //   config: {
-                        //     tokenGetter: retrieveToken
-                        //   }
-                        // })
-                        // UIRouterModule.forChild({
-                        //   states: STATES,
-                        //   config: routerConfigFn,
-                        // }),
-                        // JwtModule.forRoot({})
-                    ]
-                }]
-        }] });
-
-class TokenInterceptor {
-    constructor(jwtHelper, membrsService, stateService) {
-        this.jwtHelper = jwtHelper;
-        this.membrsService = membrsService;
-        this.stateService = stateService;
-    }
-    intercept(request, next) {
-        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);
-                }
-            }
-        }), finalize(() => {
-            // this.busyService.finished()
-        }));
-    }
-}
-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 [{ type: i1$1.JwtHelperService }, { type: MembrsService }, { type: i3.StateService }]; } });
-
-/**
- * Generated bundle index. Do not edit.
- */
-
-export { MembrsModule, MembrsService, STATES, TokenInterceptor, jwtOptionsFactory, reissueResolve, reissueResolveFn, reissueState, retrieveToken, validateResolve, validateResolveFn };
-//# sourceMappingURL=nakedcreativity-membrs-angular-helper.mjs.map