@nakedcreativity/membrs-angular-helper 0.1.4 → 0.1.7

package/{fesm2020 → fesm2022}/nakedcreativity-membrs-angular-helper.mjs

@@ -1,12 +1,14 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, Injectable, Inject, NgModule } from '@angular/core';
+import { InjectionToken, Inject, Injectable, 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.
@@ -16,11 +18,16 @@ const MembrsConfigService = new InjectionToken("MembrsConfig");
 
 const jwtService = new JwtHelperService();
 class MembrsService {
+    http;
+    config;
+    _token;
+    _decoded;
+    decodedReady = new BehaviorSubject(null);
+    _lsKey = 'membrs';
+    _loggedInObservable = new BehaviorSubject(false);
     constructor(http, config) {
         this.http = http;
         this.config = config;
-        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)) {
@@ -28,41 +35,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 +93,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,24 +116,27 @@ 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);
             });
         });
     }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: MembrsService, deps: [{ token: i1.HttpClient }, { token: MembrsConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: MembrsService, providedIn: 'root' });
 }
-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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: MembrsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+        }], ctorParameters: () => [{ type: i1.HttpClient }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [MembrsConfigService]
-                }] }]; } });
+                }] }] });
 
 function routerConfigFn(router, injector) {
     const transitionService = router.transitionService;
@@ -175,6 +204,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);
@@ -217,37 +251,37 @@ class MembrsModule {
             providers: moduleProviders //[{provide: MembrsConfigService,useValue: config}]
         };
     }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: MembrsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.3.12", ngImport: i0, type: MembrsModule, imports: [CommonModule,
+            HttpClientModule,
+            JwtModule
+            // JwtModule.forRoot({
+            //   config: {
+            //     tokenGetter: retrieveToken
+            //   }
+            // })
+            // UIRouterModule.forChild({
+            //   states: STATES,
+            //   config: routerConfigFn,
+            // }),
+            // JwtModule.forRoot({})
+        ] });
+    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: MembrsModule, imports: [CommonModule,
+            HttpClientModule,
+            JwtModule
+            // JwtModule.forRoot({
+            //   config: {
+            //     tokenGetter: retrieveToken
+            //   }
+            // })
+            // UIRouterModule.forChild({
+            //   states: STATES,
+            //   config: routerConfigFn,
+            // }),
+            // JwtModule.forRoot({})
+        ] });
 }
-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,
-        HttpClientModule,
-        JwtModule
-        // JwtModule.forRoot({
-        //   config: {
-        //     tokenGetter: retrieveToken
-        //   }
-        // })
-        // UIRouterModule.forChild({
-        //   states: STATES,
-        //   config: routerConfigFn,
-        // }),
-        // JwtModule.forRoot({})
-    ] });
-MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.3.0", 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: "14.3.0", ngImport: i0, type: MembrsModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: MembrsModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
@@ -269,25 +303,63 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
         }] });
 
 class TokenInterceptor {
-    constructor() { }
+    jwtHelper;
+    membrsService;
+    stateService;
+    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()
         }));
     }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: TokenInterceptor, deps: [{ token: i1$1.JwtHelperService }, { token: MembrsService }, { token: i3.StateService }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: TokenInterceptor });
 }
-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: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: TokenInterceptor, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return []; } });
+        }], ctorParameters: () => [{ type: i1$1.JwtHelperService }, { type: MembrsService }, { type: i3.StateService }] });
 
 /**
  * Generated bundle index. Do not edit.

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

@@ -0,0 +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\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,20 +1,16 @@
 {
   "name": "@nakedcreativity/membrs-angular-helper",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "peerDependencies": {
-    "@angular/common": "^15.x",
-    "@angular/core": "^15.x",
-    "@uirouter/angular": "^11.x",
+    "@angular/common": ">=15.0.0",
+    "@angular/core": ">=15.0.0",
+    "@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,25 +0,0 @@
-import { Injectable } from '@angular/core';
-//import { NgBusyService } from '@nakedcreativity/ng-busy';
-import { finalize } from 'rxjs/operators';
-import * as i0 from "@angular/core";
-export class TokenInterceptor {
-    constructor() { }
-    intercept(request, next) {
-        console.log('intercept request', localStorage.getItem('membrs'));
-        //this.busyService.busy()
-        request = request.clone({
-            setHeaders: {
-                Authorization: localStorage.getItem('membrs')
-            }
-        });
-        return next.handle(request).pipe(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: [{
-            type: Injectable
-        }], ctorParameters: function () { return []; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL21lbWJycy9zcmMvbGliL2F1dGguaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQVEzQywyREFBMkQ7QUFDM0QsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDOztBQUkxQyxNQUFNLE9BQU8sZ0JBQWdCO0lBQzNCLGdCQUFlLENBQUM7SUFDaEIsU0FBUyxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFFcEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsRUFBRSxZQUFZLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUE7UUFDaEUseUJBQXlCO1FBQ3pCLE9BQU8sR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO1lBQ3RCLFVBQVUsRUFBRTtnQkFDVixhQUFhLEVBQUUsWUFBWSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUM7YUFDOUM7U0FDRixDQUFDLENBQUM7UUFDSCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFFLEVBQUU7WUFDNUMsNkJBQTZCO1FBQy9CLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDTixDQUFDOzs2R0FkVSxnQkFBZ0I7aUhBQWhCLGdCQUFnQjsyRkFBaEIsZ0JBQWdCO2tCQUQ1QixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtcbiAgSHR0cFJlcXVlc3QsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBJbnRlcmNlcHRvclxufSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG4vL2ltcG9ydCB7IE5nQnVzeVNlcnZpY2UgfSBmcm9tICdAbmFrZWRjcmVhdGl2aXR5L25nLWJ1c3knO1xuaW1wb3J0IHsgZmluYWxpemUgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIFRva2VuSW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICBjb25zdHJ1Y3RvcigpIHt9XG4gIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICBcbiAgICBjb25zb2xlLmxvZygnaW50ZXJjZXB0IHJlcXVlc3QnLCBsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgnbWVtYnJzJykpXG4gICAgLy90aGlzLmJ1c3lTZXJ2aWNlLmJ1c3koKVxuICAgIHJlcXVlc3QgPSByZXF1ZXN0LmNsb25lKHtcbiAgICAgIHNldEhlYWRlcnM6IHtcbiAgICAgICAgQXV0aG9yaXphdGlvbjogbG9jYWxTdG9yYWdlLmdldEl0ZW0oJ21lbWJycycpXG4gICAgICB9XG4gICAgfSk7XG4gICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpLnBpcGUoZmluYWxpemUoKCk9PntcbiAgICAgIC8vdGhpcy5idXN5U2VydmljZS5maW5pc2hlZCgpXG4gICAgfSkpO1xuICB9XG59Il19

package/esm2020/lib/membrs.module.mjs

@@ -1,150 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MembrsService } from './membrs.service';
-import { JwtModule } from "@auth0/angular-jwt";
-import { HttpClientModule } from "@angular/common/http";
-import { UIRouterModule } from '@uirouter/angular';
-import { Transition, UIRouter } from '@uirouter/angular';
-import { routerConfigFn } from './router.config';
-import { MembrsConfigService } from './config.service';
-import { retrieveToken } from './token';
-import * as i0 from "@angular/core";
-export const validateResolve = {
-    token: 'reissue',
-    deps: [Transition, UIRouter, MembrsService, MembrsConfigService],
-    resolveFn: validateResolveFn
-};
-export const reissueResolve = {
-    token: 'reissue',
-    deps: [Transition, UIRouter, MembrsService, MembrsConfigService],
-    resolveFn: reissueResolveFn
-};
-export const reissueState = {
-    name: 'reissue',
-    url: '/reissue?token',
-    views: {},
-    resolve: [
-        reissueResolve
-    ]
-};
-export 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);
-        });
-    });
-}
-export function validateResolveFn(transition, router, membrsService, membrsConfig) {
-    //console.log(membrsService)
-    return new Promise((resolve, reject) => {
-        // console.log('validate promise resolve')
-        membrsService.reissue().then((response) => {
-            resolve(null);
-        }).catch(error => {
-            localStorage.setItem('redirectUrlAfterLogin', window.location.pathname);
-            window.location.href = membrsConfig.login;
-            reject(error);
-        });
-    });
-}
-export 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) */
-export const STATES = [
-    reissueState
-];
-export 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: "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,
-        HttpClientModule,
-        JwtModule
-        // JwtModule.forRoot({
-        //   config: {
-        //     tokenGetter: retrieveToken
-        //   }
-        // })
-        // UIRouterModule.forChild({
-        //   states: STATES,
-        //   config: routerConfigFn,
-        // }),
-        // JwtModule.forRoot({})
-    ] });
-MembrsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.3.0", 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: "14.3.0", 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({})
-                    ]
-                }]
-        }] });
-//# 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      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"]}