@trudb/tru-common-lib 0.0.697 → 0.0.698
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/esm2020/lib/components/login/classes/tru-auth-jwt-strategy.mjs +12 -8
- package/esm2020/lib/components/login/classes/tru-auth-token.mjs +5 -3
- package/fesm2015/trudb-tru-common-lib.mjs +11 -10
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +11 -7
- package/fesm2020/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/components/login/classes/tru-auth-jwt-strategy.d.ts +3 -1
- package/lib/components/login/classes/tru-auth-token.d.ts +4 -2
- package/package.json +1 -1
|
@@ -1,26 +1,30 @@
|
|
|
1
1
|
import { of } from "rxjs";
|
|
2
2
|
export class TruAuthJwtStrategy {
|
|
3
3
|
constructor() {
|
|
4
|
-
this.
|
|
4
|
+
this.JWT_ACCESS_TOKEN = "ACCESS_TOKEN";
|
|
5
|
+
this.JWT_REFRESH_TOKEN = "REFRESH_TOKEN";
|
|
6
|
+
this.USER_CLAIMS = "USER_CLAIMS";
|
|
5
7
|
}
|
|
6
8
|
doLoginUser(token) {
|
|
7
|
-
localStorage.setItem(this.
|
|
9
|
+
localStorage.setItem(this.JWT_ACCESS_TOKEN, JSON.stringify(token.jwtAccessToken));
|
|
10
|
+
localStorage.setItem(this.JWT_REFRESH_TOKEN, JSON.stringify(token.jwtRefreshToken));
|
|
11
|
+
localStorage.setItem(this.USER_CLAIMS, JSON.stringify(token.userClaims));
|
|
8
12
|
}
|
|
9
13
|
doLogoutUser() {
|
|
10
|
-
localStorage.removeItem(this.
|
|
14
|
+
localStorage.removeItem(this.JWT_ACCESS_TOKEN);
|
|
11
15
|
}
|
|
12
16
|
getCurrentUser() {
|
|
13
17
|
//todo check v6 for how this should be done
|
|
14
|
-
return of(JSON.parse(localStorage.getItem(this.
|
|
18
|
+
return of(JSON.parse(localStorage.getItem(this.USER_CLAIMS)));
|
|
15
19
|
}
|
|
16
20
|
isLoggedIn() {
|
|
17
21
|
return !!this.getJwtToken();
|
|
18
22
|
}
|
|
19
23
|
getJwtToken() {
|
|
20
|
-
return JSON.parse(localStorage.getItem(this.
|
|
24
|
+
return JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
21
25
|
}
|
|
22
26
|
getToken() {
|
|
23
|
-
var token = JSON.parse(localStorage.getItem(this.
|
|
27
|
+
var token = JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
24
28
|
if (token && token !== "undefined") {
|
|
25
29
|
const encodedPayload = token.split(".")[1];
|
|
26
30
|
const payloadStr = window.atob(encodedPayload);
|
|
@@ -29,11 +33,11 @@ export class TruAuthJwtStrategy {
|
|
|
29
33
|
var d = new Date();
|
|
30
34
|
var epoch = Math.round(d.getTime() / 1000);
|
|
31
35
|
if (exp < epoch) {
|
|
32
|
-
localStorage.removeItem(this.
|
|
36
|
+
localStorage.removeItem(this.JWT_ACCESS_TOKEN);
|
|
33
37
|
return null;
|
|
34
38
|
}
|
|
35
39
|
}
|
|
36
40
|
return token;
|
|
37
41
|
}
|
|
38
42
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtand0LXN0cmF0ZWd5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jb21wb25lbnRzL2xvZ2luL2NsYXNzZXMvdHJ1LWF1dGgtand0LXN0cmF0ZWd5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBYyxFQUFFLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFLdEMsTUFBTSxPQUFPLGtCQUFrQjtJQUEvQjtRQUNtQixxQkFBZ0IsR0FBRyxjQUFjLENBQUM7UUFDbEMsc0JBQWlCLEdBQUcsZUFBZSxDQUFDO1FBQ3BDLGdCQUFXLEdBQUcsYUFBYSxDQUFDO0lBNEMvQyxDQUFDO0lBMUNDLFdBQVcsQ0FBQyxLQUFtQjtRQUM3QixZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDO1FBQ2xGLFlBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7UUFDcEYsWUFBWSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7SUFDM0UsQ0FBQztJQUVELFlBQVk7UUFDVixZQUFZLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxjQUFjO1FBQ1osMkNBQTJDO1FBQzNDLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFXLENBQUMsQ0FBQyxDQUFDO0lBQzFFLENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQzlCLENBQUM7SUFDRCxXQUFXO1FBQ1QsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFXLENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBRUQsUUFBUTtRQUNOLElBQUksS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQVcsQ0FBQyxDQUFDO1FBRTlFLElBQUksS0FBSyxJQUFJLEtBQUssS0FBSyxXQUFXLEVBQUU7WUFDbEMsTUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMzQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1lBRS9DLElBQUksT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDckMsSUFBSSxHQUFHLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3pCLElBQUksQ0FBQyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7WUFDbkIsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7WUFFM0MsSUFBSSxHQUFHLEdBQUcsS0FBSyxFQUFFO2dCQUNmLFlBQVksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7Z0JBQy9DLE9BQU8sSUFBSSxDQUFDO2FBQ2I7U0FDRjtRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT2JzZXJ2YWJsZSwgb2YgfSBmcm9tIFwicnhqc1wiO1xyXG5pbXBvcnQgeyBUcnVBdXRoVG9rZW4gfSBmcm9tIFwiLi90cnUtYXV0aC10b2tlblwiO1xyXG5pbXBvcnQgeyBUcnVVc2VyIH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS11c2VyXCI7XHJcbmltcG9ydCB7IFRydUF1dGhTdHJhdGVneSB9IGZyb20gXCIuL3RydS1hdXRoLWNvbmZpZ1wiO1xyXG5cclxuZXhwb3J0IGNsYXNzIFRydUF1dGhKd3RTdHJhdGVneSBpbXBsZW1lbnRzIFRydUF1dGhTdHJhdGVneTxUcnVBdXRoVG9rZW4+IHtcclxuICBwcml2YXRlIHJlYWRvbmx5IEpXVF9BQ0NFU1NfVE9LRU4gPSBcIkFDQ0VTU19UT0tFTlwiO1xyXG4gIHByaXZhdGUgcmVhZG9ubHkgSldUX1JFRlJFU0hfVE9LRU4gPSBcIlJFRlJFU0hfVE9LRU5cIjtcclxuICBwcml2YXRlIHJlYWRvbmx5IFVTRVJfQ0xBSU1TID0gXCJVU0VSX0NMQUlNU1wiO1xyXG5cclxuICBkb0xvZ2luVXNlcih0b2tlbjogVHJ1QXV0aFRva2VuKTogdm9pZCB7XHJcbiAgICBsb2NhbFN0b3JhZ2Uuc2V0SXRlbSh0aGlzLkpXVF9BQ0NFU1NfVE9LRU4sIEpTT04uc3RyaW5naWZ5KHRva2VuLmp3dEFjY2Vzc1Rva2VuKSk7XHJcbiAgICBsb2NhbFN0b3JhZ2Uuc2V0SXRlbSh0aGlzLkpXVF9SRUZSRVNIX1RPS0VOLCBKU09OLnN0cmluZ2lmeSh0b2tlbi5qd3RSZWZyZXNoVG9rZW4pKTtcclxuICAgIGxvY2FsU3RvcmFnZS5zZXRJdGVtKHRoaXMuVVNFUl9DTEFJTVMsIEpTT04uc3RyaW5naWZ5KHRva2VuLnVzZXJDbGFpbXMpKTtcclxuICB9XHJcblxyXG4gIGRvTG9nb3V0VXNlcigpOiB2b2lkIHtcclxuICAgIGxvY2FsU3RvcmFnZS5yZW1vdmVJdGVtKHRoaXMuSldUX0FDQ0VTU19UT0tFTik7XHJcbiAgfVxyXG5cclxuICBnZXRDdXJyZW50VXNlcigpOiBPYnNlcnZhYmxlPFRydVVzZXIgfCB1bmRlZmluZWQ+IHtcclxuICAgIC8vdG9kbyBjaGVjayB2NiBmb3IgaG93IHRoaXMgc2hvdWxkIGJlIGRvbmVcclxuICAgIHJldHVybiBvZihKU09OLnBhcnNlKGxvY2FsU3RvcmFnZS5nZXRJdGVtKHRoaXMuVVNFUl9DTEFJTVMpIGFzIHN0cmluZykpO1xyXG4gIH1cclxuXHJcbiAgaXNMb2dnZWRJbigpOiBib29sZWFuIHtcclxuICAgIHJldHVybiAhIXRoaXMuZ2V0Snd0VG9rZW4oKTtcclxuICB9XHJcbiAgZ2V0Snd0VG9rZW4oKSB7XHJcbiAgICByZXR1cm4gSlNPTi5wYXJzZShsb2NhbFN0b3JhZ2UuZ2V0SXRlbSh0aGlzLkpXVF9BQ0NFU1NfVE9LRU4pIGFzIHN0cmluZyk7XHJcbiAgfVxyXG5cclxuICBnZXRUb2tlbigpIHtcclxuICAgIHZhciB0b2tlbiA9IEpTT04ucGFyc2UobG9jYWxTdG9yYWdlLmdldEl0ZW0odGhpcy5KV1RfQUNDRVNTX1RPS0VOKSBhcyBzdHJpbmcpO1xyXG5cclxuICAgIGlmICh0b2tlbiAmJiB0b2tlbiAhPT0gXCJ1bmRlZmluZWRcIikge1xyXG4gICAgICBjb25zdCBlbmNvZGVkUGF5bG9hZCA9IHRva2VuLnNwbGl0KFwiLlwiKVsxXTtcclxuICAgICAgY29uc3QgcGF5bG9hZFN0ciA9IHdpbmRvdy5hdG9iKGVuY29kZWRQYXlsb2FkKTtcclxuXHJcbiAgICAgIHZhciBwYXlsb2FkID0gSlNPTi5wYXJzZShwYXlsb2FkU3RyKTtcclxuICAgICAgdmFyIGV4cCA9IHBheWxvYWRbXCJleHBcIl07XHJcbiAgICAgIHZhciBkID0gbmV3IERhdGUoKTtcclxuICAgICAgdmFyIGVwb2NoID0gTWF0aC5yb3VuZChkLmdldFRpbWUoKSAvIDEwMDApO1xyXG5cclxuICAgICAgaWYgKGV4cCA8IGVwb2NoKSB7XHJcbiAgICAgICAgbG9jYWxTdG9yYWdlLnJlbW92ZUl0ZW0odGhpcy5KV1RfQUNDRVNTX1RPS0VOKTtcclxuICAgICAgICByZXR1cm4gbnVsbDtcclxuICAgICAgfVxyXG4gICAgfVxyXG4gICAgXHJcbiAgICByZXR1cm4gdG9rZW47XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
export class TruAuthToken {
|
|
2
|
-
constructor(
|
|
3
|
-
this.
|
|
2
|
+
constructor(jwtAccessToken, jwtRefreshToken, userClaims) {
|
|
3
|
+
this.jwtAccessToken = jwtAccessToken;
|
|
4
|
+
this.jwtRefreshToken = jwtRefreshToken;
|
|
5
|
+
this.userClaims = userClaims;
|
|
4
6
|
}
|
|
5
7
|
}
|
|
6
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtdG9rZW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NvbXBvbmVudHMvbG9naW4vY2xhc3Nlcy90cnUtYXV0aC10b2tlbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLE9BQU8sWUFBWTtJQUN2QixZQUNTLGNBQXNCLEVBQ3RCLGVBQXVCLEVBQ3ZCLFVBQWtCO1FBRmxCLG1CQUFjLEdBQWQsY0FBYyxDQUFRO1FBQ3RCLG9CQUFlLEdBQWYsZUFBZSxDQUFRO1FBQ3ZCLGVBQVUsR0FBVixVQUFVLENBQVE7SUFBSSxDQUFDO0NBQ2pDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNsYXNzIFRydUF1dGhUb2tlbiB7XHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICBwdWJsaWMgand0QWNjZXNzVG9rZW46IHN0cmluZyxcclxuICAgIHB1YmxpYyBqd3RSZWZyZXNoVG9rZW46IHN0cmluZyxcclxuICAgIHB1YmxpYyB1c2VyQ2xhaW1zOiBzdHJpbmcpIHsgfVxyXG59XHJcbiJdfQ==
|
|
@@ -5987,29 +5987,30 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
5987
5987
|
|
|
5988
5988
|
class TruAuthJwtStrategy {
|
|
5989
5989
|
constructor() {
|
|
5990
|
-
this.
|
|
5990
|
+
this.JWT_ACCESS_TOKEN = "ACCESS_TOKEN";
|
|
5991
|
+
this.JWT_REFRESH_TOKEN = "REFRESH_TOKEN";
|
|
5992
|
+
this.USER_CLAIMS = "USER_CLAIMS";
|
|
5991
5993
|
}
|
|
5992
5994
|
doLoginUser(token) {
|
|
5993
|
-
localStorage.setItem(this.
|
|
5995
|
+
localStorage.setItem(this.JWT_ACCESS_TOKEN, JSON.stringify(token.jwtAccessToken));
|
|
5996
|
+
localStorage.setItem(this.JWT_REFRESH_TOKEN, JSON.stringify(token.jwtRefreshToken));
|
|
5997
|
+
localStorage.setItem(this.USER_CLAIMS, JSON.stringify(token.userClaims));
|
|
5994
5998
|
}
|
|
5995
5999
|
doLogoutUser() {
|
|
5996
|
-
localStorage.removeItem(this.
|
|
6000
|
+
localStorage.removeItem(this.JWT_ACCESS_TOKEN);
|
|
5997
6001
|
}
|
|
5998
6002
|
getCurrentUser() {
|
|
5999
|
-
var _a;
|
|
6000
6003
|
//todo check v6 for how this should be done
|
|
6001
|
-
return of(
|
|
6004
|
+
return of(JSON.parse(localStorage.getItem(this.USER_CLAIMS)));
|
|
6002
6005
|
}
|
|
6003
6006
|
isLoggedIn() {
|
|
6004
6007
|
return !!this.getJwtToken();
|
|
6005
6008
|
}
|
|
6006
6009
|
getJwtToken() {
|
|
6007
|
-
|
|
6008
|
-
return (_a = JSON.parse(localStorage.getItem(this.JWT_TOKEN))) === null || _a === void 0 ? void 0 : _a.jwt;
|
|
6010
|
+
return JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
6009
6011
|
}
|
|
6010
6012
|
getToken() {
|
|
6011
|
-
var
|
|
6012
|
-
var token = (_a = JSON.parse(localStorage.getItem(this.JWT_TOKEN))) === null || _a === void 0 ? void 0 : _a.jwt;
|
|
6013
|
+
var token = JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
6013
6014
|
if (token && token !== "undefined") {
|
|
6014
6015
|
const encodedPayload = token.split(".")[1];
|
|
6015
6016
|
const payloadStr = window.atob(encodedPayload);
|
|
@@ -6018,7 +6019,7 @@ class TruAuthJwtStrategy {
|
|
|
6018
6019
|
var d = new Date();
|
|
6019
6020
|
var epoch = Math.round(d.getTime() / 1000);
|
|
6020
6021
|
if (exp < epoch) {
|
|
6021
|
-
localStorage.removeItem(this.
|
|
6022
|
+
localStorage.removeItem(this.JWT_ACCESS_TOKEN);
|
|
6022
6023
|
return null;
|
|
6023
6024
|
}
|
|
6024
6025
|
}
|