@trudb/tru-common-lib 0.0.673 → 0.0.675
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 +4 -4
- package/fesm2015/trudb-tru-common-lib.mjs +6 -3
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +3 -3
- package/fesm2020/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/components/login/classes/tru-auth-jwt-strategy.d.ts +2 -2
- package/package.json +1 -1
|
@@ -11,16 +11,16 @@ export class TruAuthJwtStrategy {
|
|
|
11
11
|
}
|
|
12
12
|
getCurrentUser() {
|
|
13
13
|
//todo check v6 for how this should be done
|
|
14
|
-
return of(JSON.parse(localStorage.getItem(this.JWT_TOKEN))
|
|
14
|
+
return of(JSON.parse(localStorage.getItem(this.JWT_TOKEN))?.user);
|
|
15
15
|
}
|
|
16
16
|
isLoggedIn() {
|
|
17
17
|
return !!this.getJwtToken();
|
|
18
18
|
}
|
|
19
19
|
getJwtToken() {
|
|
20
|
-
return localStorage.getItem(this.JWT_TOKEN);
|
|
20
|
+
return JSON.parse(localStorage.getItem(this.JWT_TOKEN))?.jwt;
|
|
21
21
|
}
|
|
22
22
|
getToken() {
|
|
23
|
-
var token = localStorage.getItem(this.JWT_TOKEN);
|
|
23
|
+
var token = JSON.parse(localStorage.getItem(this.JWT_TOKEN))?.jwt;
|
|
24
24
|
if (token && token !== "undefined") {
|
|
25
25
|
const encodedPayload = token.split(".")[1];
|
|
26
26
|
const payloadStr = window.atob(encodedPayload);
|
|
@@ -36,4 +36,4 @@ export class TruAuthJwtStrategy {
|
|
|
36
36
|
return token;
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtand0LXN0cmF0ZWd5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jb21wb25lbnRzL2xvZ2luL2NsYXNzZXMvdHJ1LWF1dGgtand0LXN0cmF0ZWd5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBYyxFQUFFLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFLdEMsTUFBTSxPQUFPLGtCQUFrQjtJQUEvQjtRQUNtQixjQUFTLEdBQUcsV0FBVyxDQUFDO0lBMEMzQyxDQUFDO0lBeENDLFdBQVcsQ0FBQyxLQUFtQjtRQUM3QixZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQzlELENBQUM7SUFFRCxZQUFZO1FBQ1YsWUFBWSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUVELGNBQWM7UUFDWiwyQ0FBMkM7UUFDM0MsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQVcsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzlFLENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQzlCLENBQUM7SUFDRCxXQUFXO1FBQ1QsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBVyxDQUFDLEVBQUUsR0FBRyxDQUFDO0lBQ3pFLENBQUM7SUFFRCxRQUFRO1FBQ04sSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQVcsQ0FBQyxFQUFFLEdBQUcsQ0FBQztRQUU1RSxJQUFJLEtBQUssSUFBSSxLQUFLLEtBQUssV0FBVyxFQUFFO1lBQ2xDLE1BQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDM0MsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztZQUUvQyxJQUFJLE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ3JDLElBQUksR0FBRyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUN6QixJQUFJLENBQUMsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ25CLElBQUksS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO1lBRTNDLElBQUksR0FBRyxHQUFHLEtBQUssRUFBRTtnQkFDZixZQUFZLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFDeEMsT0FBTyxJQUFJLENBQUM7YUFDYjtTQUNGO1FBRUQsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBPYnNlcnZhYmxlLCBvZiB9IGZyb20gXCJyeGpzXCI7XHJcbmltcG9ydCB7IFRydUF1dGhUb2tlbiB9IGZyb20gXCIuL3RydS1hdXRoLXRva2VuXCI7XHJcbmltcG9ydCB7IFRydVVzZXIgfSBmcm9tIFwiLi4vLi4vLi4vc2VydmljZXMvdHJ1LXVzZXJcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aFN0cmF0ZWd5IH0gZnJvbSBcIi4vdHJ1LWF1dGgtY29uZmlnXCI7XHJcblxyXG5leHBvcnQgY2xhc3MgVHJ1QXV0aEp3dFN0cmF0ZWd5IGltcGxlbWVudHMgVHJ1QXV0aFN0cmF0ZWd5PFRydUF1dGhUb2tlbj4ge1xyXG4gIHByaXZhdGUgcmVhZG9ubHkgSldUX1RPS0VOID0gXCJKV1RfVE9LRU5cIjtcclxuXHJcbiAgZG9Mb2dpblVzZXIodG9rZW46IFRydUF1dGhUb2tlbik6IHZvaWQge1xyXG4gICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0odGhpcy5KV1RfVE9LRU4sIEpTT04uc3RyaW5naWZ5KHRva2VuKSk7XHJcbiAgfVxyXG5cclxuICBkb0xvZ291dFVzZXIoKTogdm9pZCB7XHJcbiAgICBsb2NhbFN0b3JhZ2UucmVtb3ZlSXRlbSh0aGlzLkpXVF9UT0tFTik7XHJcbiAgfVxyXG5cclxuICBnZXRDdXJyZW50VXNlcigpOiBPYnNlcnZhYmxlPFRydVVzZXIgfCB1bmRlZmluZWQ+IHtcclxuICAgIC8vdG9kbyBjaGVjayB2NiBmb3IgaG93IHRoaXMgc2hvdWxkIGJlIGRvbmVcclxuICAgIHJldHVybiBvZihKU09OLnBhcnNlKGxvY2FsU3RvcmFnZS5nZXRJdGVtKHRoaXMuSldUX1RPS0VOKSBhcyBzdHJpbmcpPy51c2VyKTtcclxuICB9XHJcblxyXG4gIGlzTG9nZ2VkSW4oKTogYm9vbGVhbiB7XHJcbiAgICByZXR1cm4gISF0aGlzLmdldEp3dFRva2VuKCk7XHJcbiAgfVxyXG4gIGdldEp3dFRva2VuKCkge1xyXG4gICAgcmV0dXJuIEpTT04ucGFyc2UobG9jYWxTdG9yYWdlLmdldEl0ZW0odGhpcy5KV1RfVE9LRU4pIGFzIHN0cmluZyk/Lmp3dDtcclxuICB9XHJcblxyXG4gIGdldFRva2VuKCkge1xyXG4gICAgdmFyIHRva2VuID0gSlNPTi5wYXJzZShsb2NhbFN0b3JhZ2UuZ2V0SXRlbSh0aGlzLkpXVF9UT0tFTikgYXMgc3RyaW5nKT8uand0O1xyXG5cclxuICAgIGlmICh0b2tlbiAmJiB0b2tlbiAhPT0gXCJ1bmRlZmluZWRcIikge1xyXG4gICAgICBjb25zdCBlbmNvZGVkUGF5bG9hZCA9IHRva2VuLnNwbGl0KFwiLlwiKVsxXTtcclxuICAgICAgY29uc3QgcGF5bG9hZFN0ciA9IHdpbmRvdy5hdG9iKGVuY29kZWRQYXlsb2FkKTtcclxuXHJcbiAgICAgIHZhciBwYXlsb2FkID0gSlNPTi5wYXJzZShwYXlsb2FkU3RyKTtcclxuICAgICAgdmFyIGV4cCA9IHBheWxvYWRbXCJleHBcIl07XHJcbiAgICAgIHZhciBkID0gbmV3IERhdGUoKTtcclxuICAgICAgdmFyIGVwb2NoID0gTWF0aC5yb3VuZChkLmdldFRpbWUoKSAvIDEwMDApO1xyXG5cclxuICAgICAgaWYgKGV4cCA8IGVwb2NoKSB7XHJcbiAgICAgICAgbG9jYWxTdG9yYWdlLnJlbW92ZUl0ZW0odGhpcy5KV1RfVE9LRU4pO1xyXG4gICAgICAgIHJldHVybiBudWxsO1xyXG4gICAgICB9XHJcbiAgICB9XHJcbiAgICBcclxuICAgIHJldHVybiB0b2tlbjtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -5873,17 +5873,20 @@ class TruAuthJwtStrategy {
|
|
|
5873
5873
|
localStorage.removeItem(this.JWT_TOKEN);
|
|
5874
5874
|
}
|
|
5875
5875
|
getCurrentUser() {
|
|
5876
|
+
var _a;
|
|
5876
5877
|
//todo check v6 for how this should be done
|
|
5877
|
-
return of(JSON.parse(localStorage.getItem(this.JWT_TOKEN)).user);
|
|
5878
|
+
return of((_a = JSON.parse(localStorage.getItem(this.JWT_TOKEN))) === null || _a === void 0 ? void 0 : _a.user);
|
|
5878
5879
|
}
|
|
5879
5880
|
isLoggedIn() {
|
|
5880
5881
|
return !!this.getJwtToken();
|
|
5881
5882
|
}
|
|
5882
5883
|
getJwtToken() {
|
|
5883
|
-
|
|
5884
|
+
var _a;
|
|
5885
|
+
return (_a = JSON.parse(localStorage.getItem(this.JWT_TOKEN))) === null || _a === void 0 ? void 0 : _a.jwt;
|
|
5884
5886
|
}
|
|
5885
5887
|
getToken() {
|
|
5886
|
-
var
|
|
5888
|
+
var _a;
|
|
5889
|
+
var token = (_a = JSON.parse(localStorage.getItem(this.JWT_TOKEN))) === null || _a === void 0 ? void 0 : _a.jwt;
|
|
5887
5890
|
if (token && token !== "undefined") {
|
|
5888
5891
|
const encodedPayload = token.split(".")[1];
|
|
5889
5892
|
const payloadStr = window.atob(encodedPayload);
|