@nakedcreativity/membrs-angular-helper 0.0.2 → 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/nakedcreativity-membrs-angular-helper.umd.js +20 -17
- package/bundles/nakedcreativity-membrs-angular-helper.umd.js.map +1 -1
- package/bundles/nakedcreativity-membrs-angular-helper.umd.min.js +1 -1
- package/bundles/nakedcreativity-membrs-angular-helper.umd.min.js.map +1 -1
- package/esm2015/lib/membrs.module.js +9 -10
- package/esm2015/lib/membrs.service.js +5 -2
- package/esm2015/lib/router.config.js +9 -11
- package/esm5/lib/membrs.module.js +9 -10
- package/esm5/lib/membrs.service.js +5 -2
- package/esm5/lib/router.config.js +9 -11
- package/fesm2015/nakedcreativity-membrs-angular-helper.js +22 -19
- package/fesm2015/nakedcreativity-membrs-angular-helper.js.map +1 -1
- package/fesm5/nakedcreativity-membrs-angular-helper.js +22 -19
- package/fesm5/nakedcreativity-membrs-angular-helper.js.map +1 -1
- package/lib/membrs.module.d.ts +4 -4
- package/nakedcreativity-membrs-angular-helper.metadata.json +1 -1
- package/package.json +1 -1
|
@@ -36,7 +36,7 @@ let MembrsService = class MembrsService {
|
|
|
36
36
|
// token expiring soon
|
|
37
37
|
if (reissueIn < 300) {
|
|
38
38
|
console.log('expires less than 300');
|
|
39
|
-
|
|
39
|
+
console.log(this.config);
|
|
40
40
|
this.http.post(this.config.apiProtocol + this.config.api + '/token/' + this._token, {}).subscribe((response) => {
|
|
41
41
|
console.log('reissue response');
|
|
42
42
|
console.log(response);
|
|
@@ -45,9 +45,12 @@ let MembrsService = class MembrsService {
|
|
|
45
45
|
resolve(this._token);
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
|
+
console.log('error');
|
|
49
|
+
console.log(response);
|
|
48
50
|
reject('NOT_LOGGED_IN');
|
|
49
51
|
}
|
|
50
52
|
}, error => {
|
|
53
|
+
console.log(error);
|
|
51
54
|
reject('NOT_LOGGED_IN');
|
|
52
55
|
});
|
|
53
56
|
}
|
|
@@ -95,4 +98,4 @@ MembrsService = __decorate([
|
|
|
95
98
|
__metadata("design:paramtypes", [JwtHelperService, HttpClient, Object])
|
|
96
99
|
], MembrsService);
|
|
97
100
|
export { MembrsService };
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"membrs.service.js","sourceRoot":"ng://@nakedcreativity/membrs-angular-helper/","sources":["lib/membrs.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Inject } from '@angular/core';\nimport { JwtHelperService } from '@auth0/angular-jwt';\nimport { HttpClient } from '@angular/common/http'\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\n\n@Injectable({\n  providedIn: 'root'\n})\n\nexport class MembrsService {\n\n  _token: string;\n  _decoded: any;\n  _lsKey: string = 'membrs';\n\n  constructor(private jwtService: JwtHelperService, 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        console.log('reject, not logged in')\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        console.log('expires less than 300')\n        \n        \n        console.log(this.config)\n\n        this.http.post(this.config.apiProtocol + this.config.api+'/token/'+this._token, {}).subscribe((response:any)=>{\n          console.log('reissue response')\n          console.log(response)\n          if(response.token){\n            this.token = response.token\n            resolve(this._token)\n          }else {\n            console.log('error')\n            console.log(response)\n            reject('NOT_LOGGED_IN')\n          }\n          \n        }, error=>{\n          console.log(error)\n          reject('NOT_LOGGED_IN')\n        })\n\n      }else {\n        console.log('token ok')\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 = this.jwtService.decodeToken(this._token)\n  }\n\n  get profile(){\n    return this._decoded\n  }\n\n  get admin (){\n    return this.profile.permission == 1\n  }\n\n  logout(){\n    return new Promise((resolve, reject)=>{\n      this.http.get(this.config.apiProtocol+this.config.api+'/token/'+this._token+'/delete', {responseType: 'text'}).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(this.config.login)\n      })\n    })\n    \n  }\n\n\n}\n"]}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { MembrsConfigService } from './config.service';
|
|
2
|
-
import { Injector } from '@angular/core';
|
|
3
1
|
export function routerConfigFn(router, injector) {
|
|
4
2
|
const transitionService = router.transitionService;
|
|
5
3
|
const stateService = router.stateService;
|
|
6
|
-
const config = Injector.call(MembrsConfigService)
|
|
7
|
-
console.log('config in router config fn')
|
|
8
|
-
console.log(config)
|
|
4
|
+
// const config = Injector.call(MembrsConfigService)
|
|
5
|
+
// console.log('config in router config fn')
|
|
6
|
+
// console.log(config)
|
|
9
7
|
// transitionService.onStart({}, (transition)=>{
|
|
10
8
|
// console.log('start transition')
|
|
11
9
|
// console.log(transition.params())
|
|
@@ -15,11 +13,11 @@ export function routerConfigFn(router, injector) {
|
|
|
15
13
|
// console.log('error')
|
|
16
14
|
// console.log(error)
|
|
17
15
|
console.log('default error handler');
|
|
18
|
-
if
|
|
19
|
-
|
|
20
|
-
//console.log(MembrsSettings)
|
|
21
|
-
if
|
|
22
|
-
|
|
16
|
+
// if(error.detail == 'NOT_LOGGED_IN')
|
|
17
|
+
// window.location.href = config.login;
|
|
18
|
+
// //console.log(MembrsSettings)
|
|
19
|
+
// if(error.detail == 'INSUFFICIENT_PERMISSIONS')
|
|
20
|
+
// stateService.go(config.defaultState)
|
|
23
21
|
});
|
|
24
22
|
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0BuYWtlZGNyZWF0aXZpdHkvbWVtYnJzLWFuZ3VsYXItaGVscGVyLyIsInNvdXJjZXMiOlsibGliL3JvdXRlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsTUFBTSxVQUFVLGNBQWMsQ0FBQyxNQUFnQixFQUFFLFFBQWtCO0lBRWpFLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxDQUFDLGlCQUFpQixDQUFDO0lBQ25ELE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUE7SUFHMUMsc0RBQXNEO0lBRXRELDhDQUE4QztJQUM5Qyx3QkFBd0I7SUFFeEIsa0RBQWtEO0lBQ2xELHFDQUFxQztJQUNyQyxzQ0FBc0M7SUFDdEMsNkNBQTZDO0lBQzdDLE9BQU87SUFFTCxZQUFZLENBQUMsbUJBQW1CLENBQUMsVUFBUyxLQUFLO1FBRS9DLHVCQUF1QjtRQUN2QixxQkFBcUI7UUFDckIsT0FBTyxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBQ2hDLHNDQUFzQztRQUMxQyx3Q0FBd0M7UUFDeEMsaUNBQWlDO1FBRWpDLGlEQUFpRDtRQUNqRCx3Q0FBd0M7SUFFekMsQ0FBQyxDQUFDLENBQUM7QUFFSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVUlSb3V0ZXIgfSBmcm9tICdAdWlyb3V0ZXIvY29yZSc7XG5pbXBvcnQgeyBNZW1icnNDb25maWdTZXJ2aWNlIH0gZnJvbSAnLi9jb25maWcuc2VydmljZSdcbmltcG9ydCB7IE1lbWJyc0NvbmZpZyB9IGZyb20gJy4vY29uZmlnLmludGVyZmFjZSc7XG5pbXBvcnQgeyBJbmplY3RvciB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5leHBvcnQgZnVuY3Rpb24gcm91dGVyQ29uZmlnRm4ocm91dGVyOiBVSVJvdXRlciwgaW5qZWN0b3I6IEluamVjdG9yKSB7XG5cbiAgY29uc3QgdHJhbnNpdGlvblNlcnZpY2UgPSByb3V0ZXIudHJhbnNpdGlvblNlcnZpY2U7XG4gIGNvbnN0IHN0YXRlU2VydmljZSA9IHJvdXRlci5zdGF0ZVNlcnZpY2VcblxuXG4vLyAgIGNvbnN0IGNvbmZpZyA9IEluamVjdG9yLmNhbGwoTWVtYnJzQ29uZmlnU2VydmljZSlcblxuLy8gICBjb25zb2xlLmxvZygnY29uZmlnIGluIHJvdXRlciBjb25maWcgZm4nKVxuLy8gICBjb25zb2xlLmxvZyhjb25maWcpXG5cbi8vICAgdHJhbnNpdGlvblNlcnZpY2Uub25TdGFydCh7fSwgKHRyYW5zaXRpb24pPT57XG4vLyAgIFx0Y29uc29sZS5sb2coJ3N0YXJ0IHRyYW5zaXRpb24nKVxuLy8gXHQgIGNvbnNvbGUubG9nKHRyYW5zaXRpb24ucGFyYW1zKCkpXG4vLyBcdCAgY29uc29sZS5sb2codHJhbnNpdGlvbi5wYXJhbXNDaGFuZ2VkKCkpXG4vLyAgIH0pXG5cbiBcdHN0YXRlU2VydmljZS5kZWZhdWx0RXJyb3JIYW5kbGVyKGZ1bmN0aW9uKGVycm9yKSB7XG5cdFx0IFxuXHRcdC8vIGNvbnNvbGUubG9nKCdlcnJvcicpXG5cdFx0Ly8gY29uc29sZS5sb2coZXJyb3IpXG5cdFx0Y29uc29sZS5sb2coJ2RlZmF1bHQgZXJyb3IgaGFuZGxlcicpXG4gIFx0ICBcdC8vIGlmKGVycm9yLmRldGFpbCA9PSAnTk9UX0xPR0dFRF9JTicpXG5cdFx0Ly8gXHR3aW5kb3cubG9jYXRpb24uaHJlZiA9IGNvbmZpZy5sb2dpbjtcblx0XHQvLyBcdC8vY29uc29sZS5sb2coTWVtYnJzU2V0dGluZ3MpXG5cblx0XHQvLyBpZihlcnJvci5kZXRhaWwgPT0gJ0lOU1VGRklDSUVOVF9QRVJNSVNTSU9OUycpXG5cdFx0Ly8gXHRzdGF0ZVNlcnZpY2UuZ28oY29uZmlnLmRlZmF1bHRTdGF0ZSlcblxuXHR9KTtcblx0XG59Il19
|
|
@@ -2,7 +2,6 @@ import { __decorate } from "tslib";
|
|
|
2
2
|
import { NgModule } from '@angular/core';
|
|
3
3
|
import { CommonModule } from '@angular/common';
|
|
4
4
|
import { MembrsService } from './membrs.service';
|
|
5
|
-
import { JwtModule } from "@auth0/angular-jwt";
|
|
6
5
|
import { HttpClientModule } from "@angular/common/http";
|
|
7
6
|
import { UIRouterModule } from '@uirouter/angular';
|
|
8
7
|
import { Transition, UIRouter } from '@uirouter/angular';
|
|
@@ -10,12 +9,12 @@ import { routerConfigFn } from './router.config';
|
|
|
10
9
|
import { MembrsConfigService } from './config.service';
|
|
11
10
|
export var validateResolve = {
|
|
12
11
|
token: 'reissue',
|
|
13
|
-
deps: [Transition, UIRouter, MembrsService],
|
|
12
|
+
deps: [Transition, UIRouter, MembrsService, MembrsConfigService],
|
|
14
13
|
resolveFn: validateResolveFn
|
|
15
14
|
};
|
|
16
15
|
export var reissueResolve = {
|
|
17
16
|
token: 'reissue',
|
|
18
|
-
deps: [Transition, UIRouter, MembrsService],
|
|
17
|
+
deps: [Transition, UIRouter, MembrsService, MembrsConfigService],
|
|
19
18
|
resolveFn: reissueResolveFn
|
|
20
19
|
};
|
|
21
20
|
export var reissueState = {
|
|
@@ -26,14 +25,14 @@ export var reissueState = {
|
|
|
26
25
|
reissueResolve
|
|
27
26
|
]
|
|
28
27
|
};
|
|
29
|
-
export function reissueResolveFn(transition, router, membrsService) {
|
|
28
|
+
export function reissueResolveFn(transition, router, membrsService, membrsConfig) {
|
|
30
29
|
//console.log(membrsService)
|
|
31
30
|
return new Promise(function (resolve, reject) {
|
|
32
31
|
console.log('reissue promise resolve');
|
|
33
32
|
console.log(transition.params().token);
|
|
34
33
|
membrsService.reissue(transition.params().token).then(function (response) {
|
|
35
34
|
console.log('redirect to dashboard state');
|
|
36
|
-
router.stateService.go(
|
|
35
|
+
router.stateService.go(membrsConfig.defaultState, {}, { inherit: false });
|
|
37
36
|
resolve();
|
|
38
37
|
}).catch(function (error) {
|
|
39
38
|
//window.location.href = environment.login
|
|
@@ -41,15 +40,15 @@ export function reissueResolveFn(transition, router, membrsService) {
|
|
|
41
40
|
});
|
|
42
41
|
});
|
|
43
42
|
}
|
|
44
|
-
export function validateResolveFn(transition, router, membrsService) {
|
|
43
|
+
export function validateResolveFn(transition, router, membrsService, membrsConfig) {
|
|
45
44
|
//console.log(membrsService)
|
|
46
45
|
return new Promise(function (resolve, reject) {
|
|
47
46
|
console.log('validate promise resolve');
|
|
48
47
|
membrsService.reissue().then(function (response) {
|
|
49
48
|
resolve();
|
|
50
49
|
}).catch(function (error) {
|
|
51
|
-
|
|
52
|
-
reject(error)
|
|
50
|
+
window.location.href = membrsConfig.login;
|
|
51
|
+
//reject(error)
|
|
53
52
|
});
|
|
54
53
|
});
|
|
55
54
|
}
|
|
@@ -62,7 +61,7 @@ var MembrsModule = /** @class */ (function () {
|
|
|
62
61
|
}
|
|
63
62
|
MembrsModule_1 = MembrsModule;
|
|
64
63
|
MembrsModule.forRoot = function (config) {
|
|
65
|
-
var moduleProviders = JwtModule.forRoot({}).providers;
|
|
64
|
+
var moduleProviders = []; //JwtModule.forRoot({}).providers;
|
|
66
65
|
moduleProviders.push(UIRouterModule.forChild({
|
|
67
66
|
states: STATES,
|
|
68
67
|
config: routerConfigFn
|
|
@@ -101,4 +100,4 @@ var MembrsModule = /** @class */ (function () {
|
|
|
101
100
|
return MembrsModule;
|
|
102
101
|
}());
|
|
103
102
|
export { MembrsModule };
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtYnJzLm1vZHVsZS5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0BuYWtlZGNyZWF0aXZpdHkvbWVtYnJzLWFuZ3VsYXItaGVscGVyLyIsInNvdXJjZXMiOlsibGliL21lbWJycy5tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQWlDLE1BQU0sZUFBZSxDQUFDO0FBQ3hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMvQyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFakQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBR2xELE9BQU8sRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFFeEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRWpELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXZELE1BQU0sQ0FBQyxJQUFNLGVBQWUsR0FBRztJQUMzQixLQUFLLEVBQUUsU0FBUztJQUNoQixJQUFJLEVBQUUsQ0FBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLGFBQWEsRUFBRSxtQkFBbUIsQ0FBRTtJQUNsRSxTQUFTLEVBQUUsaUJBQWlCO0NBQy9CLENBQUE7QUFFRCxNQUFNLENBQUMsSUFBTSxjQUFjLEdBQUc7SUFDNUIsS0FBSyxFQUFFLFNBQVM7SUFDaEIsSUFBSSxFQUFFLENBQUUsVUFBVSxFQUFFLFFBQVEsRUFBRSxhQUFhLEVBQUUsbUJBQW1CLENBQUU7SUFDbEUsU0FBUyxFQUFFLGdCQUFnQjtDQUM1QixDQUFBO0FBRUQsTUFBTSxDQUFDLElBQU0sWUFBWSxHQUF1QjtJQUMvQyxJQUFJLEVBQUUsU0FBUztJQUNmLEdBQUcsRUFBRSxnQkFBZ0I7SUFDckIsS0FBSyxFQUFF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QXdCO2FBQ3pCO1NBQ0YsQ0FBQztPQUlXLFlBQVksQ0E4QnhCO0lBQUQsbUJBQUM7Q0FBQSxBQTlCRCxJQThCQztTQTlCWSxZQUFZIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgTmdNb2R1bGUsIE1vZHVsZVdpdGhQcm92aWRlcnMsIEluamVjdG9yIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBDb21tb25Nb2R1bGUgfSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xuaW1wb3J0IHsgTWVtYnJzU2VydmljZSB9IGZyb20gJy4vbWVtYnJzLnNlcnZpY2UnO1xuaW1wb3J0IHsgSnd0TW9kdWxlIH0gZnJvbSBcIkBhdXRoMC9hbmd1bGFyLWp3dFwiO1xuaW1wb3J0IHsgSHR0cENsaWVudE1vZHVsZSB9IGZyb20gXCJAYW5ndWxhci9jb21tb24vaHR0cFwiO1xuaW1wb3J0IHsgVUlSb3V0ZXJNb2R1bGUgfSBmcm9tICdAdWlyb3V0ZXIvYW5ndWxhcidcblxuaW1wb3J0IHsgTmcyU3RhdGVEZWNsYXJhdGlvbiB9IGZyb20gJ0B1aXJvdXRlci9hbmd1bGFyJztcbmltcG9ydCB7IFRyYW5zaXRpb24sIFVJUm91dGVyIH0gZnJvbSAnQHVpcm91dGVyL2FuZ3VsYXInXG5cbmltcG9ydCB7IHJvdXRlckNvbmZpZ0ZuIH0gZnJvbSAnLi9yb3V0ZXIuY29uZmlnJztcbmltcG9ydCB7IE1lbWJyc0NvbmZpZyB9IGZyb20gJy4vY29uZmlnLmludGVyZmFjZSc7XG5pbXBvcnQgeyBNZW1icnNDb25maWdTZXJ2aWNlIH0gZnJvbSAnLi9jb25maWcuc2VydmljZSc7XG5cbmV4cG9ydCBjb25zdCB2YWxpZGF0ZVJlc29sdmUgPSB7XG4gICAgdG9rZW46ICdyZWlzc3VlJyxcbiAgICBkZXBzOiBbIFRyYW5zaXRpb24sIFVJUm91dGVyLCBNZW1icnNTZXJ2aWNlLCBNZW1icnNDb25maWdTZXJ2aWNlIF0sXG4gICAgcmVzb2x2ZUZuOiB2YWxpZGF0ZVJlc29sdmVGblxufVxuXG5leHBvcnQgY29uc3QgcmVpc3N1ZVJlc29sdmUgPSB7XG4gIHRva2VuOiAncmVpc3N1ZScsXG4gIGRlcHM6IFsgVHJhbnNpdGlvbiwgVUlSb3V0ZXIsIE1lbWJyc1NlcnZpY2UsIE1lbWJyc0NvbmZpZ1NlcnZpY2UgXSxcbiAgcmVzb2x2ZUZuOiByZWlzc3VlUmVzb2x2ZUZuXG59XG5cbmV4cG9ydCBjb25zdCByZWlzc3VlU3RhdGU6TmcyU3RhdGVEZWNsYXJhdGlvbiA9IHtcblx0bmFtZTogJ3JlaXNzdWUnLCBcblx0dXJsOiAnL3JlaXNzdWU/dG9rZW4nLFxuXHR2aWV3czogeyB9LFxuXHRyZXNvbHZlOiBbXG4gICAgcmVpc3N1ZVJlc29sdmVcblx0XVxufVxuXG5leHBvcnQgZnVuY3Rpb24gcmVpc3N1ZVJlc29sdmVGbih0cmFuc2l0aW9uLCByb3V0ZXIsIG1lbWJyc1NlcnZpY2UsIG1lbWJyc0NvbmZpZzpNZW1icnNDb25maWcpIHtcbiAgICBcbiAgICAvL2NvbnNvbGUubG9nKG1lbWJyc1NlcnZpY2UpXG4gICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHtcbiAgICAgIGNvbnNvbGUubG9nKCdyZWlzc3VlIHByb21pc2UgcmVzb2x2ZScpXG4gICAgICBjb25zb2xlLmxvZyh0cmFuc2l0aW9uLnBhcmFtcygpLnRva2VuKVxuICAgICAgbWVtYnJzU2VydmljZS5yZWlzc3VlKHRyYW5zaXRpb24ucGFyYW1zKCkudG9rZW4pLnRoZW4oKHJlc3BvbnNlKT0+e1xuICAgICAgICAgIGNvbnNvbGUubG9nKCdyZWRpcmVjdCB0byBkYXNoYm9hcmQgc3RhdGUnKVxuICAgICAgICAgIHJvdXRlci5zdGF0ZVNlcnZpY2UuZ28obWVtYnJzQ29uZmlnLmRlZmF1bHRTdGF0ZSwge30sIHtpbmhlcml0OmZhbHNlfSlcbiAgICAgICAgICByZXNvbHZlKClcbiAgICAgIH0pLmNhdGNoKGVycm9yPT57XG4gICAgICAgICAgLy93aW5kb3cubG9jYXRpb24uaHJlZiA9IGVudmlyb25tZW50LmxvZ2luXG4gICAgICAgICAgcmVqZWN0KGVycm9yKVxuICAgICAgfSlcblxuXHR9KVxufVxuXG5leHBvcnQgZnVuY3Rpb24gdmFsaWRhdGVSZXNvbHZlRm4odHJhbnNpdGlvbiwgcm91dGVyLCBtZW1icnNTZXJ2aWNlLCBtZW1icnNDb25maWc6TWVtYnJzQ29uZmlnKSB7XG4gIFxuICAvL2NvbnNvbGUubG9nKG1lbWJyc1NlcnZpY2UpXG4gIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7XG4gICAgY29uc29sZS5sb2coJ3ZhbGlkYXRlIHByb21pc2UgcmVzb2x2ZScpXG4gICAgXG4gICAgbWVtYnJzU2VydmljZS5yZWlzc3VlKCkudGhlbigocmVzcG9uc2UpPT57XG4gICAgICAgIHJlc29sdmUoKVxuICAgIH0pLmNhdGNoKGVycm9yPT57XG4gICAgICAgIHdpbmRvdy5sb2NhdGlvbi5ocmVmID0gbWVtYnJzQ29uZmlnLmxvZ2luXG4gICAgICAgIC8vcmVqZWN0KGVycm9yKVxuICAgIH0pXG5cbn0pXG59XG5cblxuLyoqIFRoZSB0b3AgbGV2ZWwgc3RhdGUocykgKi9cbmV4cG9ydCBjb25zdCBTVEFURVMgPSBbXG4gICAgcmVpc3N1ZVN0YXRlXG5dXG5cblxuQE5nTW9kdWxlKHtcbiAgaW1wb3J0czogW1xuICAgIENvbW1vbk1vZHVsZSxcbiAgICBIdHRwQ2xpZW50TW9kdWxlXG4gICAgLy8gVUlSb3V0ZXJNb2R1bGUuZm9yQ2hpbGQoe1xuICAgIC8vICAgc3RhdGVzOiBTVEFURVMsXG4gICAgLy8gICBjb25maWc6IHJvdXRlckNvbmZpZ0ZuLFxuICAgIC8vIH0pLFxuICAgIC8vIEp3dE1vZHVsZS5mb3JSb290KHt9KVxuICBdXG59KVxuXG5cblxuZXhwb3J0IGNsYXNzIE1lbWJyc01vZHVsZSB7IFxuICBzdGF0aWMgZm9yUm9vdChjb25maWc6IE1lbWJyc0NvbmZpZyk6IE1vZHVsZVdpdGhQcm92aWRlcnM8TWVtYnJzTW9kdWxlPiB7XG5cblxuICAgIGNvbnN0IG1vZHVsZVByb3ZpZGVycyA9IFtdIC8vSnd0TW9kdWxlLmZvclJvb3Qoe30pLnByb3ZpZGVycztcbiAgICBtb2R1bGVQcm92aWRlcnMucHVzaChVSVJvdXRlck1vZHVsZS5mb3JDaGlsZCh7XG4gICAgICAgIHN0YXRlczogU1RBVEVTLFxuICAgICAgICBjb25maWc6IHJvdXRlckNvbmZpZ0ZuXG4gICAgICB9KS5wcm92aWRlcnMpXG4gICAgICBcbiAgICBtb2R1bGVQcm92aWRlcnMucHVzaChNZW1icnNTZXJ2aWNlKVxuICAgIG1vZHVsZVByb3ZpZGVycy5wdXNoKHtwcm92aWRlOiBNZW1icnNDb25maWdTZXJ2aWNlLHVzZVZhbHVlOiBjb25maWd9KTtcbiAgICByZXR1cm4ge1xuICAgICAgbmdNb2R1bGU6IE1lbWJyc01vZHVsZSwgXG4gICAgICBwcm92aWRlcnM6IG1vZHVsZVByb3ZpZGVyc1xuICAgIH07XG5cblxuICAgIHJldHVybiB7XG4gICAgICBuZ01vZHVsZTogTWVtYnJzTW9kdWxlLFxuICAgICAgcHJvdmlkZXJzOiBbXG4gICAgICAgIE1lbWJyc1NlcnZpY2UsXG4gICAgICAgIHtcbiAgICAgICAgICBwcm92aWRlOiBNZW1icnNDb25maWdTZXJ2aWNlLFxuICAgICAgICAgIHVzZVZhbHVlOiBjb25maWdcbiAgICAgICAgfSxcbiAgICAgIF1cbiAgICB9XG4gIH1cblxufVxuIl19
|
|
@@ -37,7 +37,7 @@ var MembrsService = /** @class */ (function () {
|
|
|
37
37
|
// token expiring soon
|
|
38
38
|
if (reissueIn < 300) {
|
|
39
39
|
console.log('expires less than 300');
|
|
40
|
-
|
|
40
|
+
console.log(_this.config);
|
|
41
41
|
_this.http.post(_this.config.apiProtocol + _this.config.api + '/token/' + _this._token, {}).subscribe(function (response) {
|
|
42
42
|
console.log('reissue response');
|
|
43
43
|
console.log(response);
|
|
@@ -46,9 +46,12 @@ var MembrsService = /** @class */ (function () {
|
|
|
46
46
|
resolve(_this._token);
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
|
+
console.log('error');
|
|
50
|
+
console.log(response);
|
|
49
51
|
reject('NOT_LOGGED_IN');
|
|
50
52
|
}
|
|
51
53
|
}, function (error) {
|
|
54
|
+
console.log(error);
|
|
52
55
|
reject('NOT_LOGGED_IN');
|
|
53
56
|
});
|
|
54
57
|
}
|
|
@@ -110,4 +113,4 @@ var MembrsService = /** @class */ (function () {
|
|
|
110
113
|
return MembrsService;
|
|
111
114
|
}());
|
|
112
115
|
export { MembrsService };
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"membrs.service.js","sourceRoot":"ng://@nakedcreativity/membrs-angular-helper/","sources":["lib/membrs.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Inject } from '@angular/core';\nimport { JwtHelperService } from '@auth0/angular-jwt';\nimport { HttpClient } from '@angular/common/http'\nimport { MembrsConfigService } from './config.service'\nimport { MembrsConfig } from './config.interface';\n\n@Injectable({\n  providedIn: 'root'\n})\n\nexport class MembrsService {\n\n  _token: string;\n  _decoded: any;\n  _lsKey: string = 'membrs';\n\n  constructor(private jwtService: JwtHelperService, 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        console.log('reject, not logged in')\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        console.log('expires less than 300')\n        \n        \n        console.log(this.config)\n\n        this.http.post(this.config.apiProtocol + this.config.api+'/token/'+this._token, {}).subscribe((response:any)=>{\n          console.log('reissue response')\n          console.log(response)\n          if(response.token){\n            this.token = response.token\n            resolve(this._token)\n          }else {\n            console.log('error')\n            console.log(response)\n            reject('NOT_LOGGED_IN')\n          }\n          \n        }, error=>{\n          console.log(error)\n          reject('NOT_LOGGED_IN')\n        })\n\n      }else {\n        console.log('token ok')\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 = this.jwtService.decodeToken(this._token)\n  }\n\n  get profile(){\n    return this._decoded\n  }\n\n  get admin (){\n    return this.profile.permission == 1\n  }\n\n  logout(){\n    return new Promise((resolve, reject)=>{\n      this.http.get(this.config.apiProtocol+this.config.api+'/token/'+this._token+'/delete', {responseType: 'text'}).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(this.config.login)\n      })\n    })\n    \n  }\n\n\n}\n"]}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { MembrsConfigService } from './config.service';
|
|
2
|
-
import { Injector } from '@angular/core';
|
|
3
1
|
export function routerConfigFn(router, injector) {
|
|
4
2
|
var transitionService = router.transitionService;
|
|
5
3
|
var stateService = router.stateService;
|
|
6
|
-
|
|
7
|
-
console.log('config in router config fn')
|
|
8
|
-
console.log(config)
|
|
4
|
+
// const config = Injector.call(MembrsConfigService)
|
|
5
|
+
// console.log('config in router config fn')
|
|
6
|
+
// console.log(config)
|
|
9
7
|
// transitionService.onStart({}, (transition)=>{
|
|
10
8
|
// console.log('start transition')
|
|
11
9
|
// console.log(transition.params())
|
|
@@ -15,11 +13,11 @@ export function routerConfigFn(router, injector) {
|
|
|
15
13
|
// console.log('error')
|
|
16
14
|
// console.log(error)
|
|
17
15
|
console.log('default error handler');
|
|
18
|
-
if
|
|
19
|
-
|
|
20
|
-
//console.log(MembrsSettings)
|
|
21
|
-
if
|
|
22
|
-
|
|
16
|
+
// if(error.detail == 'NOT_LOGGED_IN')
|
|
17
|
+
// window.location.href = config.login;
|
|
18
|
+
// //console.log(MembrsSettings)
|
|
19
|
+
// if(error.detail == 'INSUFFICIENT_PERMISSIONS')
|
|
20
|
+
// stateService.go(config.defaultState)
|
|
23
21
|
});
|
|
24
22
|
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0BuYWtlZGNyZWF0aXZpdHkvbWVtYnJzLWFuZ3VsYXItaGVscGVyLyIsInNvdXJjZXMiOlsibGliL3JvdXRlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsTUFBTSxVQUFVLGNBQWMsQ0FBQyxNQUFnQixFQUFFLFFBQWtCO0lBRWpFLElBQU0saUJBQWlCLEdBQUcsTUFBTSxDQUFDLGlCQUFpQixDQUFDO0lBQ25ELElBQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUE7SUFHMUMsc0RBQXNEO0lBRXRELDhDQUE4QztJQUM5Qyx3QkFBd0I7SUFFeEIsa0RBQWtEO0lBQ2xELHFDQUFxQztJQUNyQyxzQ0FBc0M7SUFDdEMsNkNBQTZDO0lBQzdDLE9BQU87SUFFTCxZQUFZLENBQUMsbUJBQW1CLENBQUMsVUFBUyxLQUFLO1FBRS9DLHVCQUF1QjtRQUN2QixxQkFBcUI7UUFDckIsT0FBTyxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBQ2hDLHNDQUFzQztRQUMxQyx3Q0FBd0M7UUFDeEMsaUNBQWlDO1FBRWpDLGlEQUFpRDtRQUNqRCx3Q0FBd0M7SUFFekMsQ0FBQyxDQUFDLENBQUM7QUFFSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVUlSb3V0ZXIgfSBmcm9tICdAdWlyb3V0ZXIvY29yZSc7XG5pbXBvcnQgeyBNZW1icnNDb25maWdTZXJ2aWNlIH0gZnJvbSAnLi9jb25maWcuc2VydmljZSdcbmltcG9ydCB7IE1lbWJyc0NvbmZpZyB9IGZyb20gJy4vY29uZmlnLmludGVyZmFjZSc7XG5pbXBvcnQgeyBJbmplY3RvciB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5leHBvcnQgZnVuY3Rpb24gcm91dGVyQ29uZmlnRm4ocm91dGVyOiBVSVJvdXRlciwgaW5qZWN0b3I6IEluamVjdG9yKSB7XG5cbiAgY29uc3QgdHJhbnNpdGlvblNlcnZpY2UgPSByb3V0ZXIudHJhbnNpdGlvblNlcnZpY2U7XG4gIGNvbnN0IHN0YXRlU2VydmljZSA9IHJvdXRlci5zdGF0ZVNlcnZpY2VcblxuXG4vLyAgIGNvbnN0IGNvbmZpZyA9IEluamVjdG9yLmNhbGwoTWVtYnJzQ29uZmlnU2VydmljZSlcblxuLy8gICBjb25zb2xlLmxvZygnY29uZmlnIGluIHJvdXRlciBjb25maWcgZm4nKVxuLy8gICBjb25zb2xlLmxvZyhjb25maWcpXG5cbi8vICAgdHJhbnNpdGlvblNlcnZpY2Uub25TdGFydCh7fSwgKHRyYW5zaXRpb24pPT57XG4vLyAgIFx0Y29uc29sZS5sb2coJ3N0YXJ0IHRyYW5zaXRpb24nKVxuLy8gXHQgIGNvbnNvbGUubG9nKHRyYW5zaXRpb24ucGFyYW1zKCkpXG4vLyBcdCAgY29uc29sZS5sb2codHJhbnNpdGlvbi5wYXJhbXNDaGFuZ2VkKCkpXG4vLyAgIH0pXG5cbiBcdHN0YXRlU2VydmljZS5kZWZhdWx0RXJyb3JIYW5kbGVyKGZ1bmN0aW9uKGVycm9yKSB7XG5cdFx0IFxuXHRcdC8vIGNvbnNvbGUubG9nKCdlcnJvcicpXG5cdFx0Ly8gY29uc29sZS5sb2coZXJyb3IpXG5cdFx0Y29uc29sZS5sb2coJ2RlZmF1bHQgZXJyb3IgaGFuZGxlcicpXG4gIFx0ICBcdC8vIGlmKGVycm9yLmRldGFpbCA9PSAnTk9UX0xPR0dFRF9JTicpXG5cdFx0Ly8gXHR3aW5kb3cubG9jYXRpb24uaHJlZiA9IGNvbmZpZy5sb2dpbjtcblx0XHQvLyBcdC8vY29uc29sZS5sb2coTWVtYnJzU2V0dGluZ3MpXG5cblx0XHQvLyBpZihlcnJvci5kZXRhaWwgPT0gJ0lOU1VGRklDSUVOVF9QRVJNSVNTSU9OUycpXG5cdFx0Ly8gXHRzdGF0ZVNlcnZpY2UuZ28oY29uZmlnLmRlZmF1bHRTdGF0ZSlcblxuXHR9KTtcblx0XG59Il19
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate, __param, __metadata } from 'tslib';
|
|
2
|
-
import { InjectionToken, Inject, ɵɵdefineInjectable, ɵɵinject, Injectable,
|
|
3
|
-
import { JwtHelperService
|
|
2
|
+
import { InjectionToken, Inject, ɵɵdefineInjectable, ɵɵinject, Injectable, NgModule } from '@angular/core';
|
|
3
|
+
import { JwtHelperService } from '@auth0/angular-jwt';
|
|
4
4
|
import { HttpClient, HttpClientModule } from '@angular/common/http';
|
|
5
5
|
import { CommonModule } from '@angular/common';
|
|
6
6
|
import { Transition, UIRouter, UIRouterModule } from '@uirouter/angular';
|
|
@@ -40,7 +40,7 @@ let MembrsService = class MembrsService {
|
|
|
40
40
|
// token expiring soon
|
|
41
41
|
if (reissueIn < 300) {
|
|
42
42
|
console.log('expires less than 300');
|
|
43
|
-
|
|
43
|
+
console.log(this.config);
|
|
44
44
|
this.http.post(this.config.apiProtocol + this.config.api + '/token/' + this._token, {}).subscribe((response) => {
|
|
45
45
|
console.log('reissue response');
|
|
46
46
|
console.log(response);
|
|
@@ -49,9 +49,12 @@ let MembrsService = class MembrsService {
|
|
|
49
49
|
resolve(this._token);
|
|
50
50
|
}
|
|
51
51
|
else {
|
|
52
|
+
console.log('error');
|
|
53
|
+
console.log(response);
|
|
52
54
|
reject('NOT_LOGGED_IN');
|
|
53
55
|
}
|
|
54
56
|
}, error => {
|
|
57
|
+
console.log(error);
|
|
55
58
|
reject('NOT_LOGGED_IN');
|
|
56
59
|
});
|
|
57
60
|
}
|
|
@@ -102,9 +105,9 @@ MembrsService = __decorate([
|
|
|
102
105
|
function routerConfigFn(router, injector) {
|
|
103
106
|
const transitionService = router.transitionService;
|
|
104
107
|
const stateService = router.stateService;
|
|
105
|
-
const config = Injector.call(MembrsConfigService)
|
|
106
|
-
console.log('config in router config fn')
|
|
107
|
-
console.log(config)
|
|
108
|
+
// const config = Injector.call(MembrsConfigService)
|
|
109
|
+
// console.log('config in router config fn')
|
|
110
|
+
// console.log(config)
|
|
108
111
|
// transitionService.onStart({}, (transition)=>{
|
|
109
112
|
// console.log('start transition')
|
|
110
113
|
// console.log(transition.params())
|
|
@@ -114,23 +117,23 @@ function routerConfigFn(router, injector) {
|
|
|
114
117
|
// console.log('error')
|
|
115
118
|
// console.log(error)
|
|
116
119
|
console.log('default error handler');
|
|
117
|
-
if
|
|
118
|
-
|
|
119
|
-
//console.log(MembrsSettings)
|
|
120
|
-
if
|
|
121
|
-
|
|
120
|
+
// if(error.detail == 'NOT_LOGGED_IN')
|
|
121
|
+
// window.location.href = config.login;
|
|
122
|
+
// //console.log(MembrsSettings)
|
|
123
|
+
// if(error.detail == 'INSUFFICIENT_PERMISSIONS')
|
|
124
|
+
// stateService.go(config.defaultState)
|
|
122
125
|
});
|
|
123
126
|
}
|
|
124
127
|
|
|
125
128
|
var MembrsModule_1;
|
|
126
129
|
const validateResolve = {
|
|
127
130
|
token: 'reissue',
|
|
128
|
-
deps: [Transition, UIRouter, MembrsService],
|
|
131
|
+
deps: [Transition, UIRouter, MembrsService, MembrsConfigService],
|
|
129
132
|
resolveFn: validateResolveFn
|
|
130
133
|
};
|
|
131
134
|
const reissueResolve = {
|
|
132
135
|
token: 'reissue',
|
|
133
|
-
deps: [Transition, UIRouter, MembrsService],
|
|
136
|
+
deps: [Transition, UIRouter, MembrsService, MembrsConfigService],
|
|
134
137
|
resolveFn: reissueResolveFn
|
|
135
138
|
};
|
|
136
139
|
const reissueState = {
|
|
@@ -141,14 +144,14 @@ const reissueState = {
|
|
|
141
144
|
reissueResolve
|
|
142
145
|
]
|
|
143
146
|
};
|
|
144
|
-
function reissueResolveFn(transition, router, membrsService) {
|
|
147
|
+
function reissueResolveFn(transition, router, membrsService, membrsConfig) {
|
|
145
148
|
//console.log(membrsService)
|
|
146
149
|
return new Promise((resolve, reject) => {
|
|
147
150
|
console.log('reissue promise resolve');
|
|
148
151
|
console.log(transition.params().token);
|
|
149
152
|
membrsService.reissue(transition.params().token).then((response) => {
|
|
150
153
|
console.log('redirect to dashboard state');
|
|
151
|
-
router.stateService.go(
|
|
154
|
+
router.stateService.go(membrsConfig.defaultState, {}, { inherit: false });
|
|
152
155
|
resolve();
|
|
153
156
|
}).catch(error => {
|
|
154
157
|
//window.location.href = environment.login
|
|
@@ -156,15 +159,15 @@ function reissueResolveFn(transition, router, membrsService) {
|
|
|
156
159
|
});
|
|
157
160
|
});
|
|
158
161
|
}
|
|
159
|
-
function validateResolveFn(transition, router, membrsService) {
|
|
162
|
+
function validateResolveFn(transition, router, membrsService, membrsConfig) {
|
|
160
163
|
//console.log(membrsService)
|
|
161
164
|
return new Promise((resolve, reject) => {
|
|
162
165
|
console.log('validate promise resolve');
|
|
163
166
|
membrsService.reissue().then((response) => {
|
|
164
167
|
resolve();
|
|
165
168
|
}).catch(error => {
|
|
166
|
-
|
|
167
|
-
reject(error)
|
|
169
|
+
window.location.href = membrsConfig.login;
|
|
170
|
+
//reject(error)
|
|
168
171
|
});
|
|
169
172
|
});
|
|
170
173
|
}
|
|
@@ -174,7 +177,7 @@ const STATES = [
|
|
|
174
177
|
];
|
|
175
178
|
let MembrsModule = MembrsModule_1 = class MembrsModule {
|
|
176
179
|
static forRoot(config) {
|
|
177
|
-
const moduleProviders = JwtModule.forRoot({}).providers;
|
|
180
|
+
const moduleProviders = []; //JwtModule.forRoot({}).providers;
|
|
178
181
|
moduleProviders.push(UIRouterModule.forChild({
|
|
179
182
|
states: STATES,
|
|
180
183
|
config: routerConfigFn
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nakedcreativity-membrs-angular-helper.js","sources":["ng://@nakedcreativity/membrs-angular-helper/lib/config.service.ts","ng://@nakedcreativity/membrs-angular-helper/lib/membrs.service.ts","ng://@nakedcreativity/membrs-angular-helper/lib/router.config.ts","ng://@nakedcreativity/membrs-angular-helper/lib/membrs.module.ts","ng://@nakedcreativity/membrs-angular-helper/public-api.ts","ng://@nakedcreativity/membrs-angular-helper/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';\n\n@Injectable({\n providedIn: 'root'\n})\n\nexport class MembrsService {\n\n _token: string;\n _decoded: any;\n _lsKey: string = 'membrs';\n\n constructor(private jwtService: JwtHelperService, 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 console.log('reject, not logged in')\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 console.log('expires less than 300')\n // to-do: call Apollo here\n\n this.http.post(this.config.apiProtocol + this.config.api+'/token/'+this._token, {}).subscribe((response:any)=>{\n console.log('reissue response')\n console.log(response)\n if(response.token){\n this.token = response.token\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 console.log('token ok')\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 = this.jwtService.decodeToken(this._token)\n }\n\n get profile(){\n return this._decoded\n }\n\n get admin (){\n return this.profile.permission == 1\n }\n\n logout(){\n return new Promise((resolve, reject)=>{\n this.http.get(this.config.apiProtocol+this.config.api+'/token/'+this._token+'/delete', {responseType: 'text'}).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(this.config.login)\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';\n\nexport function routerConfigFn(router: UIRouter, injector: Injector) {\n\n const transitionService = router.transitionService;\n const stateService = router.stateService\n\n\n const config = Injector.call(MembrsConfigService)\n\n console.log('config in router config fn')\n console.log(config)\n\n// transitionService.onStart({}, (transition)=>{\n// \tconsole.log('start transition')\n// \t console.log(transition.params())\n// \t console.log(transition.paramsChanged())\n// })\n\n \tstateService.defaultErrorHandler(function(error) {\n\t\t \n\t\t// console.log('error')\n\t\t// console.log(error)\n\t\tconsole.log('default error handler')\n \t \tif(error.detail == 'NOT_LOGGED_IN')\n\t\t\twindow.location.href = config.login;\n\t\t\t//console.log(MembrsSettings)\n\n\t\tif(error.detail == 'INSUFFICIENT_PERMISSIONS')\n\t\t\tstateService.go(config.defaultState)\n\n\t});\n\t\n}","import { NgModule, ModuleWithProviders, Injector } from '@angular/core';\nimport { CommonModule } from '@angular/common';\nimport { MembrsService } from './membrs.service';\nimport { JwtModule } 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';\n\nexport const validateResolve = {\n token: 'reissue',\n deps: [ Transition, UIRouter, MembrsService ],\n resolveFn: validateResolveFn\n}\n\nexport const reissueResolve = {\n token: 'reissue',\n deps: [ Transition, UIRouter, MembrsService ],\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) {\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 dashboard state')\n router.stateService.go('dashboard',{}, {inherit:false})\n resolve()\n }).catch(error=>{\n //window.location.href = environment.login\n reject(error)\n })\n\n\t})\n}\n\nexport function validateResolveFn(transition, router, membrsService) {\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()\n }).catch(error=>{\n //window.location.href = environment.login\n reject(error)\n })\n\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 // 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 = JwtModule.forRoot({}).providers;\n moduleProviders.push(UIRouterModule.forChild({\n states: STATES,\n config: routerConfigFn\n }).providers)\n \n moduleProviders.push(MembrsService)\n moduleProviders.push({provide: MembrsConfigService,useValue: config});\n return {\n ngModule: MembrsModule, \n providers: moduleProviders\n };\n\n\n return {\n ngModule: MembrsModule,\n providers: [\n MembrsService,\n {\n provide: MembrsConfigService,\n useValue: config\n },\n ]\n }\n }\n\n}\n","/*\n * Public API Surface of membrs\n */\n\nexport * from './lib/membrs.service';\nexport * from './lib/membrs.module';\n\nexport function retrieveToken() {\n return localStorage.getItem('membrs');\n}","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n\nexport {MembrsConfig as ɵb} from './lib/config.interface';\nexport {MembrsConfigService as ɵa} from './lib/config.service';"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"nakedcreativity-membrs-angular-helper.js","sources":["ng://@nakedcreativity/membrs-angular-helper/lib/config.service.ts","ng://@nakedcreativity/membrs-angular-helper/lib/membrs.service.ts","ng://@nakedcreativity/membrs-angular-helper/lib/router.config.ts","ng://@nakedcreativity/membrs-angular-helper/lib/membrs.module.ts","ng://@nakedcreativity/membrs-angular-helper/public-api.ts","ng://@nakedcreativity/membrs-angular-helper/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';\n\n@Injectable({\n providedIn: 'root'\n})\n\nexport class MembrsService {\n\n _token: string;\n _decoded: any;\n _lsKey: string = 'membrs';\n\n constructor(private jwtService: JwtHelperService, 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 console.log('reject, not logged in')\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 console.log('expires less than 300')\n \n \n console.log(this.config)\n\n this.http.post(this.config.apiProtocol + this.config.api+'/token/'+this._token, {}).subscribe((response:any)=>{\n console.log('reissue response')\n console.log(response)\n if(response.token){\n this.token = response.token\n resolve(this._token)\n }else {\n console.log('error')\n console.log(response)\n reject('NOT_LOGGED_IN')\n }\n \n }, error=>{\n console.log(error)\n reject('NOT_LOGGED_IN')\n })\n\n }else {\n console.log('token ok')\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 = this.jwtService.decodeToken(this._token)\n }\n\n get profile(){\n return this._decoded\n }\n\n get admin (){\n return this.profile.permission == 1\n }\n\n logout(){\n return new Promise((resolve, reject)=>{\n this.http.get(this.config.apiProtocol+this.config.api+'/token/'+this._token+'/delete', {responseType: 'text'}).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(this.config.login)\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';\n\nexport function routerConfigFn(router: UIRouter, injector: Injector) {\n\n const transitionService = router.transitionService;\n const stateService = router.stateService\n\n\n// const config = Injector.call(MembrsConfigService)\n\n// console.log('config in router config fn')\n// console.log(config)\n\n// transitionService.onStart({}, (transition)=>{\n// \tconsole.log('start transition')\n// \t console.log(transition.params())\n// \t console.log(transition.paramsChanged())\n// })\n\n \tstateService.defaultErrorHandler(function(error) {\n\t\t \n\t\t// console.log('error')\n\t\t// console.log(error)\n\t\tconsole.log('default error handler')\n \t \t// if(error.detail == 'NOT_LOGGED_IN')\n\t\t// \twindow.location.href = config.login;\n\t\t// \t//console.log(MembrsSettings)\n\n\t\t// if(error.detail == 'INSUFFICIENT_PERMISSIONS')\n\t\t// \tstateService.go(config.defaultState)\n\n\t});\n\t\n}","import { NgModule, ModuleWithProviders, Injector } from '@angular/core';\nimport { CommonModule } from '@angular/common';\nimport { MembrsService } from './membrs.service';\nimport { JwtModule } 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';\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 dashboard state')\n router.stateService.go(membrsConfig.defaultState, {}, {inherit:false})\n resolve()\n }).catch(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()\n }).catch(error=>{\n window.location.href = membrsConfig.login\n //reject(error)\n })\n\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 // 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 = [] //JwtModule.forRoot({}).providers;\n moduleProviders.push(UIRouterModule.forChild({\n states: STATES,\n config: routerConfigFn\n }).providers)\n \n moduleProviders.push(MembrsService)\n moduleProviders.push({provide: MembrsConfigService,useValue: config});\n return {\n ngModule: MembrsModule, \n providers: moduleProviders\n };\n\n\n return {\n ngModule: MembrsModule,\n providers: [\n MembrsService,\n {\n provide: MembrsConfigService,\n useValue: config\n },\n ]\n }\n }\n\n}\n","/*\n * Public API Surface of membrs\n */\n\nexport * from './lib/membrs.service';\nexport * from './lib/membrs.module';\n\nexport function retrieveToken() {\n return localStorage.getItem('membrs');\n}","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n\nexport {MembrsConfig as ɵb} from './lib/config.interface';\nexport {MembrsConfigService as ɵa} from './lib/config.service';"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate, __param, __metadata } from 'tslib';
|
|
2
|
-
import { InjectionToken, Inject, ɵɵdefineInjectable, ɵɵinject, Injectable,
|
|
3
|
-
import { JwtHelperService
|
|
2
|
+
import { InjectionToken, Inject, ɵɵdefineInjectable, ɵɵinject, Injectable, NgModule } from '@angular/core';
|
|
3
|
+
import { JwtHelperService } from '@auth0/angular-jwt';
|
|
4
4
|
import { HttpClient, HttpClientModule } from '@angular/common/http';
|
|
5
5
|
import { CommonModule } from '@angular/common';
|
|
6
6
|
import { Transition, UIRouter, UIRouterModule } from '@uirouter/angular';
|
|
@@ -41,7 +41,7 @@ var MembrsService = /** @class */ (function () {
|
|
|
41
41
|
// token expiring soon
|
|
42
42
|
if (reissueIn < 300) {
|
|
43
43
|
console.log('expires less than 300');
|
|
44
|
-
|
|
44
|
+
console.log(_this.config);
|
|
45
45
|
_this.http.post(_this.config.apiProtocol + _this.config.api + '/token/' + _this._token, {}).subscribe(function (response) {
|
|
46
46
|
console.log('reissue response');
|
|
47
47
|
console.log(response);
|
|
@@ -50,9 +50,12 @@ var MembrsService = /** @class */ (function () {
|
|
|
50
50
|
resolve(_this._token);
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
|
+
console.log('error');
|
|
54
|
+
console.log(response);
|
|
53
55
|
reject('NOT_LOGGED_IN');
|
|
54
56
|
}
|
|
55
57
|
}, function (error) {
|
|
58
|
+
console.log(error);
|
|
56
59
|
reject('NOT_LOGGED_IN');
|
|
57
60
|
});
|
|
58
61
|
}
|
|
@@ -117,9 +120,9 @@ var MembrsService = /** @class */ (function () {
|
|
|
117
120
|
function routerConfigFn(router, injector) {
|
|
118
121
|
var transitionService = router.transitionService;
|
|
119
122
|
var stateService = router.stateService;
|
|
120
|
-
|
|
121
|
-
console.log('config in router config fn')
|
|
122
|
-
console.log(config)
|
|
123
|
+
// const config = Injector.call(MembrsConfigService)
|
|
124
|
+
// console.log('config in router config fn')
|
|
125
|
+
// console.log(config)
|
|
123
126
|
// transitionService.onStart({}, (transition)=>{
|
|
124
127
|
// console.log('start transition')
|
|
125
128
|
// console.log(transition.params())
|
|
@@ -129,22 +132,22 @@ function routerConfigFn(router, injector) {
|
|
|
129
132
|
// console.log('error')
|
|
130
133
|
// console.log(error)
|
|
131
134
|
console.log('default error handler');
|
|
132
|
-
if
|
|
133
|
-
|
|
134
|
-
//console.log(MembrsSettings)
|
|
135
|
-
if
|
|
136
|
-
|
|
135
|
+
// if(error.detail == 'NOT_LOGGED_IN')
|
|
136
|
+
// window.location.href = config.login;
|
|
137
|
+
// //console.log(MembrsSettings)
|
|
138
|
+
// if(error.detail == 'INSUFFICIENT_PERMISSIONS')
|
|
139
|
+
// stateService.go(config.defaultState)
|
|
137
140
|
});
|
|
138
141
|
}
|
|
139
142
|
|
|
140
143
|
var validateResolve = {
|
|
141
144
|
token: 'reissue',
|
|
142
|
-
deps: [Transition, UIRouter, MembrsService],
|
|
145
|
+
deps: [Transition, UIRouter, MembrsService, MembrsConfigService],
|
|
143
146
|
resolveFn: validateResolveFn
|
|
144
147
|
};
|
|
145
148
|
var reissueResolve = {
|
|
146
149
|
token: 'reissue',
|
|
147
|
-
deps: [Transition, UIRouter, MembrsService],
|
|
150
|
+
deps: [Transition, UIRouter, MembrsService, MembrsConfigService],
|
|
148
151
|
resolveFn: reissueResolveFn
|
|
149
152
|
};
|
|
150
153
|
var reissueState = {
|
|
@@ -155,14 +158,14 @@ var reissueState = {
|
|
|
155
158
|
reissueResolve
|
|
156
159
|
]
|
|
157
160
|
};
|
|
158
|
-
function reissueResolveFn(transition, router, membrsService) {
|
|
161
|
+
function reissueResolveFn(transition, router, membrsService, membrsConfig) {
|
|
159
162
|
//console.log(membrsService)
|
|
160
163
|
return new Promise(function (resolve, reject) {
|
|
161
164
|
console.log('reissue promise resolve');
|
|
162
165
|
console.log(transition.params().token);
|
|
163
166
|
membrsService.reissue(transition.params().token).then(function (response) {
|
|
164
167
|
console.log('redirect to dashboard state');
|
|
165
|
-
router.stateService.go(
|
|
168
|
+
router.stateService.go(membrsConfig.defaultState, {}, { inherit: false });
|
|
166
169
|
resolve();
|
|
167
170
|
}).catch(function (error) {
|
|
168
171
|
//window.location.href = environment.login
|
|
@@ -170,15 +173,15 @@ function reissueResolveFn(transition, router, membrsService) {
|
|
|
170
173
|
});
|
|
171
174
|
});
|
|
172
175
|
}
|
|
173
|
-
function validateResolveFn(transition, router, membrsService) {
|
|
176
|
+
function validateResolveFn(transition, router, membrsService, membrsConfig) {
|
|
174
177
|
//console.log(membrsService)
|
|
175
178
|
return new Promise(function (resolve, reject) {
|
|
176
179
|
console.log('validate promise resolve');
|
|
177
180
|
membrsService.reissue().then(function (response) {
|
|
178
181
|
resolve();
|
|
179
182
|
}).catch(function (error) {
|
|
180
|
-
|
|
181
|
-
reject(error)
|
|
183
|
+
window.location.href = membrsConfig.login;
|
|
184
|
+
//reject(error)
|
|
182
185
|
});
|
|
183
186
|
});
|
|
184
187
|
}
|
|
@@ -191,7 +194,7 @@ var MembrsModule = /** @class */ (function () {
|
|
|
191
194
|
}
|
|
192
195
|
MembrsModule_1 = MembrsModule;
|
|
193
196
|
MembrsModule.forRoot = function (config) {
|
|
194
|
-
var moduleProviders = JwtModule.forRoot({}).providers;
|
|
197
|
+
var moduleProviders = []; //JwtModule.forRoot({}).providers;
|
|
195
198
|
moduleProviders.push(UIRouterModule.forChild({
|
|
196
199
|
states: STATES,
|
|
197
200
|
config: routerConfigFn
|