@nakedcreativity/membrs-angular-helper 0.0.21 → 0.0.23

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

@@ -0,0 +1,297 @@
+import * as i0 from '@angular/core';
+import { InjectionToken, Injectable, Inject, NgModule } from '@angular/core';
+import { JwtHelperService, JwtModule } from '@auth0/angular-jwt';
+import { BehaviorSubject } from 'rxjs';
+import * as i1 from '@angular/common/http';
+import { HttpClientModule } from '@angular/common/http';
+import { CommonModule } from '@angular/common';
+import { Transition, UIRouter, UIRouterModule } from '@uirouter/angular';
+import { finalize } 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._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) {
+        return new Promise((resolve, reject) => {
+            if (!token && !this._token) {
+                reject('NOT_LOGGED_IN');
+            }
+            if (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) {
+                reject('NOT_LOGGED_IN');
+            }
+            // token expiring soon
+            if (reissueIn < 300) {
+                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);
+                        resolve(this._token);
+                    }
+                    else {
+                        reject('NOT_LOGGED_IN');
+                    }
+                }, error => {
+                    reject('NOT_LOGGED_IN');
+                });
+            }
+            else {
+                this._loggedInObservable.next(true);
+                resolve(this._token);
+            }
+        });
+    }
+    set token(token) {
+        this._token = token;
+        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;
+    }
+    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);
+                //this.router.stateService.go('dashboard')
+            }, error => {
+                reject(error);
+            });
+        });
+    }
+}
+MembrsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: MembrsService, deps: [{ token: i1.HttpClient }, { token: MembrsConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
+MembrsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: MembrsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.0", 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) {
+        console.log('Default error handler - Membrs Angular Helper');
+        console.log(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) => {
+            //console.log('redirect to default state')
+            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) => {
+            resolve(null);
+        }).catch(error => {
+            // console.log('error in validateResolveFn')
+            // console.log(error)
+            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: "13.1.0", ngImport: i0, type: MembrsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.1.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: "13.1.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: "13.1.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({})
+                    ]
+                }]
+        }] });
+
+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: "13.1.0", ngImport: i0, type: TokenInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+TokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: TokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: TokenInterceptor, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return []; } });
+
+/**
+ * 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

package/fesm2015/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  _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          //console.log('redirect to default state')\n          router.stateService.go(membrsConfig.defaultState, {}, {inherit:false})\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      // console.log('error in validateResolveFn')\n      // console.log(error)\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;;;;AAIO,MAAM,mBAAmB,GAAG,IAAI,cAAc,CAAe,cAAc,CAAC;;ACDnF,MAAM,UAAU,GAAG,IAAI,gBAAgB,EAAE,CAAA;MAO5B,aAAa;IAOxB,YAAoB,IAAgB,EAAuC,MAAoB;QAA3E,SAAI,GAAJ,IAAI,CAAY;QAAuC,WAAM,GAAN,MAAM,CAAc;QAH/F,WAAM,GAAW,QAAQ,CAAC;QAC1B,wBAAmB,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;SAC/C;KAEF;IAED,OAAO,CAAC,KAAa;QAEnB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM;YAEjC,IAAG,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,EAAC;gBACxB,MAAM,CAAC,eAAe,CAAC,CAAA;aACxB;YAED,IAAG,KAAK;gBACN,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;;YAGpB,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;;YAGD,IAAG,SAAS,GAAG,GAAG,EAAC;gBAEjB,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;oBAEzG,IAAG,QAAQ,CAAC,KAAK,EAAC;wBAChB,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;wBAC3B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;wBACnC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;qBACrB;yBAAK;wBACJ,MAAM,CAAC,eAAe,CAAC,CAAA;qBACxB;iBAEF,EAAE,KAAK;oBACN,MAAM,CAAC,eAAe,CAAC,CAAA;iBACxB,CAAC,CAAA;aAEH;iBAAK;gBACJ,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACnC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;aACrB;SAEF,CAAC,CAAA;KAEH;IAED,IAAI,KAAK,CAAC,KAAK;QACb,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;QACT,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK,CAAA;KACjC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAA;KACrB;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAA;KACnB;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,CAAA;KACpC;IAED,IAAI,oBAAoB;QACtB,OAAO,IAAI,CAAC,mBAAmB,CAAA;KAChC;IAED,MAAM;QACJ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM;YACjC,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;gBACrG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;gBACnB,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBACpC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;;aAE3B,EAAE,KAAK;gBACN,MAAM,CAAC,KAAK,CAAC,CAAA;aACd,CAAC,CAAA;SACH,CAAC,CAAA;KAEH;;0GAxGU,aAAa,4CAOsB,mBAAmB;8GAPtD,aAAa,cAJZ,MAAM;2FAIP,aAAa;kBALzB,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB;;;8BAUwC,MAAM;+BAAC,mBAAmB;;;;SCdnD,cAAc,CAAC,MAAgB,EAAE,QAAkB;IAEjE,MAAM,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;IACnD,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;IAEjD,YAAY,CAAC,mBAAmB,CAAC,UAAS,KAAK;QAE/C,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAA;QAC5D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAElB,IAAG,KAAK,CAAC,MAAM,IAAI,eAAe,EAAC;YAClC,aAAa,CAAC,WAAW,EAAE,CAAA;YAC3B,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;SACpC;QAED,IAAG,KAAK,CAAC,MAAM,IAAI,0BAA0B;YAC5C,YAAY,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;KAErC,CAAC,CAAC;AAEJ;;SC5BgB,aAAa;;IAEzB,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC1C;;MCYa,eAAe,GAAG;IAC3B,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,CAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,mBAAmB,CAAE;IAClE,SAAS,EAAE,iBAAiB;EAC/B;MAEY,cAAc,GAAG;IAC5B,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,CAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,mBAAmB,CAAE;IAClE,SAAS,EAAE,gBAAgB;EAC5B;MAEY,YAAY,GAAuB;IAC/C,IAAI,EAAE,SAAS;IACf,GAAG,EAAE,gBAAgB;IACrB,KAAK,EAAE,EAAG;IACV,OAAO,EAAE;QACN,cAAc;KAChB;EACD;SAEe,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,YAAyB;;IAGzF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM;;;QAGjC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ;;YAE3D,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,EAAE,EAAC,OAAO,EAAC,KAAK,EAAC,CAAC,CAAA;YACtE,MAAM,EAAE,CAAA;SACX,CAAC,CAAC,KAAK,CAAC,KAAK;;;;YAIV,MAAM,CAAC,KAAK,CAAC,CAAA;SAChB,CAAC,CAAA;KAEN,CAAC,CAAA;AACH,CAAC;SAEe,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,YAAyB;;IAG5F,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM;;QAGjC,aAAa,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ;YAClC,OAAO,CAAC,IAAI,CAAC,CAAA;SAChB,CAAC,CAAC,KAAK,CAAC,KAAK;;;YAGV,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAA;YACzC,MAAM,CAAC,KAAK,CAAC,CAAA;SAChB,CAAC,CAAA;KAEL,CAAC,CAAA;AACF,CAAC;SAEe,iBAAiB,CAAC,MAAM;;;IAGtC,OAAO;QACL,WAAW,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,cAAc,EAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;YAC5D,OAAO,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SACvC;QACD,cAAc,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;KAC7B,CAAA;AACH,CAAC;AAGD;MACa,MAAM,GAAG;IAClB,YAAY;EACf;MAuBY,YAAY;IACvB,OAAO,OAAO,CAAC,MAAoB;QAGjC,MAAM,eAAe,GAAG,cAAc,CAAC,QAAQ,CAAC;YAC9C,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,cAAc;SACvB,CAAC,CAAC,SAAS,CAAA;QAEZ,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACrC,MAAM,EAAE;gBACN,WAAW,EAAE,aAAa;gBAC1B,cAAc,EAAE,EAAE;aACnB;SACF,CAAC,CAAC,SAAS,CAAC,CAAA;QAEb,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QACnC,eAAe,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,mBAAmB,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;QAGtE,OAAO;YACL,QAAQ,EAAE,YAAY;YACtB,SAAS,EAAE,eAAe;SAC3B,CAAC;KAEH;;yGAzBU,YAAY;0GAAZ,YAAY,YAlBrB,YAAY;QACZ,gBAAgB;QAChB,SAAS;;;;;;;;;;;;0GAgBA,YAAY,YAnBd;YACP,YAAY;YACZ,gBAAgB;YAChB,SAAS;;;;;;;;;;;SAWV;2FAKU,YAAY;kBApBxB,QAAQ;mBAAC;oBACR,OAAO,EAAE;wBACP,YAAY;wBACZ,gBAAgB;wBAChB,SAAS;;;;;;;;;;;qBAWV;iBACF;;;MChGY,gBAAgB;IAC3B,iBAAgB;IAChB,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAEpD,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;;QAEhE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;YACtB,UAAU,EAAE;gBACV,aAAa,EAAE,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC;aAC9C;SACF,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;;SAEzC,CAAC,CAAC,CAAC;KACL;;6GAdU,gBAAgB;iHAAhB,gBAAgB;2FAAhB,gBAAgB;kBAD5B,UAAU;;;ACZX;;;;;;"}

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

@@ -1,7 +1,9 @@
-import { InjectionToken, ɵɵdefineInjectable, ɵɵinject, Injectable, Inject, NgModule } from '@angular/core';
+import * as i0 from '@angular/core';
+import { InjectionToken, Injectable, Inject, NgModule } from '@angular/core';
 import { JwtHelperService, JwtModule } from '@auth0/angular-jwt';
-import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { BehaviorSubject } from 'rxjs';
+import * as i1 from '@angular/common/http';
+import { HttpClientModule } from '@angular/common/http';
 import { CommonModule } from '@angular/common';
 import { Transition, UIRouter, UIRouterModule } from '@uirouter/angular';
 import { finalize } from 'rxjs/operators';
@@ -19,7 +21,7 @@ class MembrsService {
         this.config = config;
         this._lsKey = 'membrs';
         this._loggedInObservable = new BehaviorSubject(false);
-        console.log('membrs constructor');
+        // 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);
@@ -95,16 +97,17 @@ class MembrsService {
         });
     }
 }
-MembrsService.ɵprov = ɵɵdefineInjectable({ factory: function MembrsService_Factory() { return new MembrsService(ɵɵinject(HttpClient), ɵɵinject(MembrsConfigService)); }, token: MembrsService, providedIn: "root" });
-MembrsService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-MembrsService.ctorParameters = () => [
-    { type: HttpClient },
-    { type: undefined, decorators: [{ type: Inject, args: [MembrsConfigService,] }] }
-];
+MembrsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: MembrsService, deps: [{ token: i1.HttpClient }, { token: MembrsConfigService }], target: i0.ɵɵFactoryTarget.Injectable });
+MembrsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: MembrsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.0", 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;
@@ -124,7 +127,7 @@ function routerConfigFn(router, injector) {
 }
 
 function retrieveToken() {
-    console.log('retrieve from ls');
+    // console.log('retrieve from ls')
     return localStorage.getItem('membrs');
 }
 
@@ -149,15 +152,15 @@ const reissueState = {
 function reissueResolveFn(transition, router, membrsService, membrsConfig) {
     //console.log(membrsService)
     return new Promise((resolve, reject) => {
-        console.log('reissue promise resolve');
-        console.log(transition.params().token);
+        // console.log('reissue promise resolve')
+        // console.log(transition.params().token)
         membrsService.reissue(transition.params().token).then((response) => {
-            console.log('redirect to default state');
+            //console.log('redirect to default state')
             router.stateService.go(membrsConfig.defaultState, {}, { inherit: false });
             reject();
         }).catch(error => {
-            console.log('error in reissue resolve');
-            console.log(error);
+            //console.log('error in reissue resolve')
+            //console.log(error)
             //window.location.href = environment.login
             reject(error);
         });
@@ -166,20 +169,20 @@ function reissueResolveFn(transition, router, membrsService, membrsConfig) {
 function validateResolveFn(transition, router, membrsService, membrsConfig) {
     //console.log(membrsService)
     return new Promise((resolve, reject) => {
-        console.log('validate promise resolve');
+        // console.log('validate promise resolve')
         membrsService.reissue().then((response) => {
             resolve(null);
         }).catch(error => {
-            console.log('error in validateResolveFn');
-            console.log(error);
+            // console.log('error in validateResolveFn')
+            // console.log(error)
             window.location.href = membrsConfig.login;
             reject(error);
         });
     });
 }
 function jwtOptionsFactory(config) {
-    console.log('jwt options factory');
-    console.log(config);
+    // console.log('jwt options factory')
+    // console.log(config)
     return {
         tokenGetter: () => {
             console.log('token getter', localStorage.getItem('membrs'));
@@ -212,29 +215,61 @@ class MembrsModule {
         };
     }
 }
-MembrsModule.decorators = [
-    { type: NgModule, args: [{
-                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: "13.1.0", ngImport: i0, type: MembrsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+MembrsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.1.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: "13.1.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: "13.1.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({})
+                    ]
+                }]
+        }] });
 
 class TokenInterceptor {
     constructor() { }
     intercept(request, next) {
+        console.log('intercept request', localStorage.getItem('membrs'));
         //this.busyService.busy()
         request = request.clone({
             setHeaders: {
@@ -246,14 +281,15 @@ class TokenInterceptor {
         }));
     }
 }
-TokenInterceptor.decorators = [
-    { type: Injectable }
-];
-TokenInterceptor.ctorParameters = () => [];
+TokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: TokenInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+TokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: TokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.0", ngImport: i0, type: TokenInterceptor, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return []; } });
 
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { MembrsModule, MembrsService, STATES, TokenInterceptor, jwtOptionsFactory, reissueResolve, reissueResolveFn, reissueState, retrieveToken, validateResolve, validateResolveFn, MembrsConfigService as ɵa };
-//# sourceMappingURL=nakedcreativity-membrs-angular-helper.js.map
+export { MembrsModule, MembrsService, STATES, TokenInterceptor, jwtOptionsFactory, reissueResolve, reissueResolveFn, reissueState, retrieveToken, validateResolve, validateResolveFn };
+//# sourceMappingURL=nakedcreativity-membrs-angular-helper.mjs.map

package/fesm2020/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  _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          //console.log('redirect to default state')\n          router.stateService.go(membrsConfig.defaultState, {}, {inherit:false})\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      // console.log('error in validateResolveFn')\n      // console.log(error)\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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"}

package/lib/auth.interceptor.d.ts

@@ -1,6 +1,9 @@
 import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import * as i0 from "@angular/core";
 export declare class TokenInterceptor implements HttpInterceptor {
     constructor();
     intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<TokenInterceptor, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<TokenInterceptor>;
 }

package/lib/membrs.module.d.ts

@@ -3,6 +3,10 @@ import { MembrsService } from './membrs.service';
 import { Ng2StateDeclaration } from '@uirouter/angular';
 import { Transition, UIRouter } from '@uirouter/angular';
 import { MembrsConfig } from './config.interface';
+import * as i0 from "@angular/core";
+import * as i1 from "@angular/common";
+import * as i2 from "@angular/common/http";
+import * as i3 from "@auth0/angular-jwt";
 export declare const validateResolve: {
     token: string;
     deps: (import("@angular/core").InjectionToken<MembrsConfig> | typeof MembrsService | typeof Transition | typeof UIRouter)[];
@@ -24,4 +28,7 @@ export declare function jwtOptionsFactory(config: any): {
 export declare const STATES: Ng2StateDeclaration[];
 export declare class MembrsModule {
     static forRoot(config: MembrsConfig): ModuleWithProviders<MembrsModule>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MembrsModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MembrsModule, never, [typeof i1.CommonModule, typeof i2.HttpClientModule, typeof i3.JwtModule], never>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<MembrsModule>;
 }

package/lib/membrs.service.d.ts

@@ -1,6 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { MembrsConfig } from './config.interface';
 import { BehaviorSubject } from 'rxjs';
+import * as i0 from "@angular/core";
 export declare class MembrsService {
     private http;
     private config;
@@ -18,4 +19,6 @@ export declare class MembrsService {
     get admin(): boolean;
     get isLoggedInObservable(): BehaviorSubject<Boolean>;
     logout(): Promise<unknown>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MembrsService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<MembrsService>;
 }

package/nakedcreativity-membrs-angular-helper.d.ts

@@ -1,6 +1,5 @@
 /**
  * Generated bundle index. Do not edit.
  */
+/// <amd-module name="@nakedcreativity/membrs-angular-helper" />
 export * from './public-api';
-export { MembrsConfig as ɵb } from './lib/config.interface';
-export { MembrsConfigService as ɵa } from './lib/config.service';