@trudb/tru-common-lib 0.0.705 → 0.0.708
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-config.mjs +1 -1
- package/esm2020/lib/components/login/classes/tru-auth-jwt-strategy.mjs +11 -1
- package/esm2020/lib/components/login/classes/tru-auth-session-strategy.mjs +4 -13
- package/esm2020/lib/components/login/services/tru-auth.mjs +18 -12
- package/fesm2015/trudb-tru-common-lib.mjs +30 -22
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +30 -22
- package/fesm2020/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/components/login/classes/tru-auth-config.d.ts +1 -0
- package/lib/components/login/classes/tru-auth-jwt-strategy.d.ts +1 -0
- package/lib/components/login/classes/tru-auth-session-strategy.d.ts +1 -2
- package/lib/components/login/services/tru-auth.d.ts +1 -2
- package/package.json +1 -1
|
@@ -5,4 +5,4 @@ export const TRU_AUTH_CONFIG = {
|
|
|
5
5
|
auth: "token",
|
|
6
6
|
};
|
|
7
7
|
export const TRU_AUTH_STRATEGY = new InjectionToken("AuthStrategy");
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jb21wb25lbnRzL2xvZ2luL2NsYXNzZXMvdHJ1LWF1dGgtY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFVL0MsTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFrQjtJQUM1QyxPQUFPLEVBQUUseUJBQXlCO0lBQ2xDLE9BQU8sRUFBRSxXQUFXO0lBQ3BCLElBQUksRUFBRSxPQUFPO0NBQ2QsQ0FBQztBQVlGLE1BQU0sQ0FBQyxNQUFNLGlCQUFpQixHQUFHLElBQUksY0FBYyxDQUNqRCxjQUFjLENBQ2YsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGlvblRva2VuIH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gXCJyeGpzXCI7XHJcbmltcG9ydCB7IFRydVVzZXIgfSBmcm9tIFwiLi4vLi4vLi4vc2VydmljZXMvdHJ1LXVzZXJcIjtcclxuXHJcbmV4cG9ydCBpbnRlcmZhY2UgVHJ1QXV0aENvbmZpZyB7XHJcbiAgYmFzZVVybDogc3RyaW5nO1xyXG4gIGF1dGhVcmw6IHN0cmluZztcclxuICBhdXRoOiBcInNlc3Npb25cIiB8IFwidG9rZW5cIjtcclxufVxyXG5cclxuZXhwb3J0IGNvbnN0IFRSVV9BVVRIX0NPTkZJRzogVHJ1QXV0aENvbmZpZyA9IHtcclxuICBiYXNlVXJsOiBcImh0dHBzOi8vbG9jYWxob3N0OjQ0MzAzXCIsXHJcbiAgYXV0aFVybDogXCIvYXBpL2F1dGhcIixcclxuICBhdXRoOiBcInRva2VuXCIsXHJcbn07XHJcblxyXG5leHBvcnQgaW50ZXJmYWNlIFRydUF1dGhTdHJhdGVneTxUPiB7XHJcbiAgZG9Mb2dpblVzZXIoZGF0YTogVCk6IHZvaWQ7XHJcblxyXG4gIGRvTG9nb3V0VXNlcigpOiB2b2lkO1xyXG5cclxuICBpc0xvZ2dlZEluKCk6IGJvb2xlYW47XHJcblxyXG4gIGdldERlY29kZWRKd3RKc29uRGF0YSgpOiBvYmplY3Q7XHJcbn1cclxuXHJcbmV4cG9ydCBjb25zdCBUUlVfQVVUSF9TVFJBVEVHWSA9IG5ldyBJbmplY3Rpb25Ub2tlbjxUcnVBdXRoU3RyYXRlZ3k8YW55Pj4oXHJcbiAgXCJBdXRoU3RyYXRlZ3lcIlxyXG4pO1xyXG4iXX0=
|
|
@@ -16,6 +16,16 @@ export class TruAuthJwtStrategy {
|
|
|
16
16
|
getJwtToken() {
|
|
17
17
|
return JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
18
18
|
}
|
|
19
|
+
getDecodedJwtJsonData() {
|
|
20
|
+
let token = JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
21
|
+
let payload = {};
|
|
22
|
+
if (token && token !== "undefined") {
|
|
23
|
+
const encodedPayload = token.split(".")[1];
|
|
24
|
+
const payloadStr = window.atob(encodedPayload);
|
|
25
|
+
payload = JSON.parse(payloadStr);
|
|
26
|
+
}
|
|
27
|
+
return payload;
|
|
28
|
+
}
|
|
19
29
|
getToken() {
|
|
20
30
|
var token = JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
21
31
|
if (token && token !== "undefined") {
|
|
@@ -33,4 +43,4 @@ export class TruAuthJwtStrategy {
|
|
|
33
43
|
return token;
|
|
34
44
|
}
|
|
35
45
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtand0LXN0cmF0ZWd5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jb21wb25lbnRzL2xvZ2luL2NsYXNzZXMvdHJ1LWF1dGgtand0LXN0cmF0ZWd5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE1BQU0sT0FBTyxrQkFBa0I7SUFBL0I7UUFDbUIscUJBQWdCLEdBQUcsY0FBYyxDQUFDO1FBQ2xDLHNCQUFpQixHQUFHLGVBQWUsQ0FBQztJQW9EdkQsQ0FBQztJQWxEQyxXQUFXLENBQUMsS0FBbUI7UUFDN0IsWUFBWSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztRQUMvRSxZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQ25GLENBQUM7SUFFRCxZQUFZO1FBQ1YsWUFBWSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQsVUFBVTtRQUNSLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUM5QixDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBVyxDQUFDLENBQUM7SUFDM0UsQ0FBQztJQUVELHFCQUFxQjtRQUNuQixJQUFJLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFXLENBQUMsQ0FBQztRQUM5RSxJQUFJLE9BQU8sR0FBRyxFQUFFLENBQUE7UUFDaEIsSUFBSSxLQUFLLElBQUksS0FBSyxLQUFLLFdBQVcsRUFBRTtZQUNsQyxNQUFNLGNBQWMsR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzNDLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7WUFFL0MsT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7U0FDbEM7UUFFRCxPQUFPLE9BQU8sQ0FBQztJQUNqQixDQUFDO0lBRUQsUUFBUTtRQUNOLElBQUksS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQVcsQ0FBQyxDQUFDO1FBRTlFLElBQUksS0FBSyxJQUFJLEtBQUssS0FBSyxXQUFXLEVBQUU7WUFDbEMsTUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMzQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1lBRS9DLElBQUksT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDckMsSUFBSSxHQUFHLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3pCLElBQUksQ0FBQyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7WUFDbkIsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7WUFFM0MsSUFBSSxHQUFHLEdBQUcsS0FBSyxFQUFFO2dCQUNmLFlBQVksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7Z0JBQy9DLE9BQU8sSUFBSSxDQUFDO2FBQ2I7U0FDRjtRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT2JzZXJ2YWJsZSwgb2YgfSBmcm9tIFwicnhqc1wiO1xyXG5pbXBvcnQgeyBUcnVBdXRoVG9rZW4gfSBmcm9tIFwiLi90cnUtYXV0aC10b2tlblwiO1xyXG5pbXBvcnQgeyBUcnVVc2VyIH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS11c2VyXCI7XHJcbmltcG9ydCB7IFRydUF1dGhTdHJhdGVneSB9IGZyb20gXCIuL3RydS1hdXRoLWNvbmZpZ1wiO1xyXG5cclxuZXhwb3J0IGNsYXNzIFRydUF1dGhKd3RTdHJhdGVneSBpbXBsZW1lbnRzIFRydUF1dGhTdHJhdGVneTxUcnVBdXRoVG9rZW4+IHtcclxuICBwcml2YXRlIHJlYWRvbmx5IEpXVF9BQ0NFU1NfVE9LRU4gPSBcIkFDQ0VTU19UT0tFTlwiO1xyXG4gIHByaXZhdGUgcmVhZG9ubHkgSldUX1JFRlJFU0hfVE9LRU4gPSBcIlJFRlJFU0hfVE9LRU5cIjtcclxuXHJcbiAgZG9Mb2dpblVzZXIodG9rZW46IFRydUF1dGhUb2tlbik6IHZvaWQge1xyXG4gICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0odGhpcy5KV1RfQUNDRVNTX1RPS0VOLCBKU09OLnN0cmluZ2lmeSh0b2tlbi5hY2Nlc3NUb2tlbikpO1xyXG4gICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0odGhpcy5KV1RfUkVGUkVTSF9UT0tFTiwgSlNPTi5zdHJpbmdpZnkodG9rZW4ucmVmcmVzaFRva2VuKSk7XHJcbiAgfVxyXG5cclxuICBkb0xvZ291dFVzZXIoKTogdm9pZCB7XHJcbiAgICBsb2NhbFN0b3JhZ2UucmVtb3ZlSXRlbSh0aGlzLkpXVF9BQ0NFU1NfVE9LRU4pO1xyXG4gIH1cclxuXHJcbiAgaXNMb2dnZWRJbigpOiBib29sZWFuIHtcclxuICAgIHJldHVybiAhIXRoaXMuZ2V0Snd0VG9rZW4oKTtcclxuICB9XHJcblxyXG4gIGdldEp3dFRva2VuKCkge1xyXG4gICAgcmV0dXJuIEpTT04ucGFyc2UobG9jYWxTdG9yYWdlLmdldEl0ZW0odGhpcy5KV1RfQUNDRVNTX1RPS0VOKSBhcyBzdHJpbmcpO1xyXG4gIH1cclxuXHJcbiAgZ2V0RGVjb2RlZEp3dEpzb25EYXRhKCkge1xyXG4gICAgbGV0IHRva2VuID0gSlNPTi5wYXJzZShsb2NhbFN0b3JhZ2UuZ2V0SXRlbSh0aGlzLkpXVF9BQ0NFU1NfVE9LRU4pIGFzIHN0cmluZyk7XHJcbiAgICBsZXQgcGF5bG9hZCA9IHt9XHJcbiAgICBpZiAodG9rZW4gJiYgdG9rZW4gIT09IFwidW5kZWZpbmVkXCIpIHtcclxuICAgICAgY29uc3QgZW5jb2RlZFBheWxvYWQgPSB0b2tlbi5zcGxpdChcIi5cIilbMV07XHJcbiAgICAgIGNvbnN0IHBheWxvYWRTdHIgPSB3aW5kb3cuYXRvYihlbmNvZGVkUGF5bG9hZCk7XHJcblxyXG4gICAgICBwYXlsb2FkID0gSlNPTi5wYXJzZShwYXlsb2FkU3RyKTtcclxuICAgIH1cclxuXHJcbiAgICByZXR1cm4gcGF5bG9hZDtcclxuICB9XHJcblxyXG4gIGdldFRva2VuKCkge1xyXG4gICAgdmFyIHRva2VuID0gSlNPTi5wYXJzZShsb2NhbFN0b3JhZ2UuZ2V0SXRlbSh0aGlzLkpXVF9BQ0NFU1NfVE9LRU4pIGFzIHN0cmluZyk7XHJcblxyXG4gICAgaWYgKHRva2VuICYmIHRva2VuICE9PSBcInVuZGVmaW5lZFwiKSB7XHJcbiAgICAgIGNvbnN0IGVuY29kZWRQYXlsb2FkID0gdG9rZW4uc3BsaXQoXCIuXCIpWzFdO1xyXG4gICAgICBjb25zdCBwYXlsb2FkU3RyID0gd2luZG93LmF0b2IoZW5jb2RlZFBheWxvYWQpO1xyXG5cclxuICAgICAgdmFyIHBheWxvYWQgPSBKU09OLnBhcnNlKHBheWxvYWRTdHIpO1xyXG4gICAgICB2YXIgZXhwID0gcGF5bG9hZFtcImV4cFwiXTtcclxuICAgICAgdmFyIGQgPSBuZXcgRGF0ZSgpO1xyXG4gICAgICB2YXIgZXBvY2ggPSBNYXRoLnJvdW5kKGQuZ2V0VGltZSgpIC8gMTAwMCk7XHJcblxyXG4gICAgICBpZiAoZXhwIDwgZXBvY2gpIHtcclxuICAgICAgICBsb2NhbFN0b3JhZ2UucmVtb3ZlSXRlbSh0aGlzLkpXVF9BQ0NFU1NfVE9LRU4pO1xyXG4gICAgICAgIHJldHVybiBudWxsO1xyXG4gICAgICB9XHJcbiAgICB9XHJcbiAgICBcclxuICAgIHJldHVybiB0b2tlbjtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
import { of } from "rxjs";
|
|
2
|
-
import { tap } from "rxjs/operators";
|
|
3
|
-
import { TRU_AUTH_CONFIG } from "./tru-auth-config";
|
|
4
1
|
export class TruAuthSessionStrategy {
|
|
5
2
|
constructor(http) {
|
|
6
3
|
this.http = http;
|
|
@@ -11,18 +8,12 @@ export class TruAuthSessionStrategy {
|
|
|
11
8
|
doLogoutUser() {
|
|
12
9
|
this.loggedUser = undefined;
|
|
13
10
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
return of(this.loggedUser);
|
|
17
|
-
}
|
|
18
|
-
else {
|
|
19
|
-
return this.http
|
|
20
|
-
.get(`${TRU_AUTH_CONFIG.authUrl}/user`)
|
|
21
|
-
.pipe(tap((user) => (this.loggedUser = user)));
|
|
22
|
-
}
|
|
11
|
+
getDecodedJwtJsonData() {
|
|
12
|
+
return {};
|
|
23
13
|
}
|
|
14
|
+
;
|
|
24
15
|
isLoggedIn() {
|
|
25
16
|
return false; //todo, implement this
|
|
26
17
|
}
|
|
27
18
|
}
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtc2Vzc2lvbi1zdHJhdGVneS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3RydS1jb21tb24tbGliL3NyYy9saWIvY29tcG9uZW50cy9sb2dpbi9jbGFzc2VzL3RydS1hdXRoLXNlc3Npb24tc3RyYXRlZ3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsTUFBTSxPQUFPLHNCQUFzQjtJQUdqQyxZQUFvQixJQUFnQjtRQUFoQixTQUFJLEdBQUosSUFBSSxDQUFZO0lBQUcsQ0FBQztJQUV4QyxXQUFXLENBQUMsSUFBYTtRQUN2QixJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQztJQUN6QixDQUFDO0lBRUQsWUFBWTtRQUNWLElBQUksQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDO0lBQzlCLENBQUM7SUFFRCxxQkFBcUI7UUFDbkIsT0FBTyxFQUFFLENBQUM7SUFDWixDQUFDO0lBQUEsQ0FBQztJQUVGLFVBQVU7UUFDUixPQUFPLEtBQUssQ0FBQyxDQUFBLHNCQUFzQjtJQUNyQyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBIdHRwQ2xpZW50IH0gZnJvbSBcIkBhbmd1bGFyL2NvbW1vbi9odHRwXCI7XHJcbmltcG9ydCB7IFRydUF1dGhTdHJhdGVneSB9IGZyb20gXCIuL3RydS1hdXRoLWNvbmZpZ1wiO1xyXG5pbXBvcnQgeyBUcnVVc2VyIH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS11c2VyXCI7XHJcblxyXG5cclxuZXhwb3J0IGNsYXNzIFRydUF1dGhTZXNzaW9uU3RyYXRlZ3kgaW1wbGVtZW50cyBUcnVBdXRoU3RyYXRlZ3k8VHJ1VXNlcj4ge1xyXG4gIHByaXZhdGUgbG9nZ2VkVXNlcj86IFRydVVzZXI7XHJcblxyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgaHR0cDogSHR0cENsaWVudCkge31cclxuXHJcbiAgZG9Mb2dpblVzZXIodXNlcjogVHJ1VXNlcik6IHZvaWQge1xyXG4gICAgdGhpcy5sb2dnZWRVc2VyID0gdXNlcjtcclxuICB9XHJcblxyXG4gIGRvTG9nb3V0VXNlcigpOiB2b2lkIHtcclxuICAgIHRoaXMubG9nZ2VkVXNlciA9IHVuZGVmaW5lZDtcclxuICB9XHJcblxyXG4gIGdldERlY29kZWRKd3RKc29uRGF0YSgpOiBvYmplY3Qge1xyXG4gICAgcmV0dXJuIHt9O1xyXG4gIH07XHJcblxyXG4gIGlzTG9nZ2VkSW4oKTogYm9vbGVhbiB7XHJcbiAgICByZXR1cm4gZmFsc2U7Ly90b2RvLCBpbXBsZW1lbnQgdGhpc1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -2,8 +2,7 @@ import { Injectable, Inject } from "@angular/core";
|
|
|
2
2
|
import { BehaviorSubject } from "rxjs";
|
|
3
3
|
import { TRU_AUTH_STRATEGY } from "../classes/tru-auth-config";
|
|
4
4
|
import { TRU_AUTH_CONFIG } from "../classes/tru-auth-config";
|
|
5
|
-
import { tap
|
|
6
|
-
import { TruAuthUserRequest } from "../classes/tru-auth-user-request";
|
|
5
|
+
import { tap } from "rxjs/operators";
|
|
7
6
|
import * as i0 from "@angular/core";
|
|
8
7
|
import * as i1 from "@angular/router";
|
|
9
8
|
import * as i2 from "@angular/common/http";
|
|
@@ -20,21 +19,28 @@ export class TruAuth {
|
|
|
20
19
|
this.auth = auth;
|
|
21
20
|
this.loggedIn = new BehaviorSubject(false);
|
|
22
21
|
this.baseUrl = '';
|
|
23
|
-
this.createUserRequest = (username) => {
|
|
24
|
-
let truUser = new TruAuthUserRequest();
|
|
25
|
-
truUser.username = username;
|
|
26
|
-
return truUser;
|
|
27
|
-
};
|
|
28
22
|
this.baseUrl = this.appEnvironment.appUri;
|
|
29
23
|
}
|
|
30
24
|
login(loginRequest) {
|
|
31
25
|
return this.http
|
|
32
26
|
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/login`, loginRequest)
|
|
33
|
-
.pipe(tap((tokenData) =>
|
|
34
|
-
this.auth.doLoginUser(
|
|
35
|
-
this.user.create(userData);
|
|
27
|
+
.pipe(tap((tokenData) => {
|
|
28
|
+
this.auth.doLoginUser(tokenData);
|
|
36
29
|
this.loggedIn.next(true);
|
|
37
|
-
}))
|
|
30
|
+
}));
|
|
31
|
+
}
|
|
32
|
+
setUser() {
|
|
33
|
+
let jwtData = this.auth.getDecodedJwtJsonData();
|
|
34
|
+
console.log(jwtData);
|
|
35
|
+
let user = {
|
|
36
|
+
activeUserRef: jwtData.UserRef,
|
|
37
|
+
firstName: jwtData.FirstName,
|
|
38
|
+
lastName: jwtData.LastName,
|
|
39
|
+
email: jwtData.Email,
|
|
40
|
+
username: jwtData['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'],
|
|
41
|
+
roles: jwtData['http://schemas.microsoft.com/ws/2008/06/identity/claims/role']
|
|
42
|
+
};
|
|
43
|
+
this.user.create(user);
|
|
38
44
|
}
|
|
39
45
|
logout() {
|
|
40
46
|
this.doLogoutUser();
|
|
@@ -67,4 +73,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
67
73
|
type: Inject,
|
|
68
74
|
args: [TRU_AUTH_STRATEGY]
|
|
69
75
|
}] }]; } });
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NvbXBvbmVudHMvbG9naW4vc2VydmljZXMvdHJ1LWF1dGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFJbkQsT0FBTyxFQUFFLGVBQWUsRUFBYyxNQUFNLE1BQU0sQ0FBQztBQUduRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUUvRCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDN0QsT0FBTyxFQUFFLEdBQUcsRUFBOEIsTUFBTSxnQkFBZ0IsQ0FBQzs7Ozs7OztBQVNqRSxNQUFNLE9BQU8sT0FBTztJQUlsQixZQUNVLE1BQWMsRUFDZCxJQUFnQixFQUNoQixLQUFtQixFQUNuQixJQUFhLEVBQ2IsY0FBaUMsRUFDTixJQUEwQjtRQUxyRCxXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsU0FBSSxHQUFKLElBQUksQ0FBWTtRQUNoQixVQUFLLEdBQUwsS0FBSyxDQUFjO1FBQ25CLFNBQUksR0FBSixJQUFJLENBQVM7UUFDYixtQkFBYyxHQUFkLGNBQWMsQ0FBbUI7UUFDTixTQUFJLEdBQUosSUFBSSxDQUFzQjtRQVR2RCxhQUFRLEdBQUcsSUFBSSxlQUFlLENBQVUsS0FBSyxDQUFDLENBQUM7UUFDL0MsWUFBTyxHQUFXLEVBQUUsQ0FBQztRQVUzQixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDO0lBQzVDLENBQUM7SUFFRCxLQUFLLENBQUMsWUFBaUM7UUFDckMsT0FBTyxJQUFJLENBQUMsSUFBSTthQUNiLElBQUksQ0FBTSxHQUFHLElBQUksQ0FBQyxPQUFPLEdBQUcsZUFBZSxDQUFDLE9BQU8sUUFBUSxFQUFFLFlBQVksQ0FBQzthQUMxRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLEVBQUU7WUFDcEIsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDakMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDM0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNWLENBQUM7SUFFRCxPQUFPO1FBQ0wsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxxQkFBcUIsRUFBUyxDQUFDO1FBQ3ZELE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDckIsSUFBSSxJQUFJLEdBQWE7WUFDbkIsYUFBYSxFQUFFLE9BQU8sQ0FBQyxPQUFPO1lBQzlCLFNBQVMsRUFBRSxPQUFPLENBQUMsU0FBUztZQUM1QixRQUFRLEVBQUUsT0FBTyxDQUFDLFFBQVE7WUFDMUIsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLO1lBQ3BCLFFBQVEsRUFBRSxPQUFPLENBQUMsNERBQTRELENBQUM7WUFDL0UsS0FBSyxFQUFFLE9BQU8sQ0FBQyw4REFBOEQsQ0FBQztTQUMvRSxDQUFBO1FBQ0QsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekIsQ0FBQztJQUVELE1BQU07UUFDSixJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDdEIsQ0FBQztJQUVELElBQUksVUFBVTtRQUNaLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRTtZQUN4QixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUM7U0FDNUM7UUFDRCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDdEMsQ0FBQztJQUVELDBCQUEwQjtRQUN4QixJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDcEIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDMUIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFFTyxZQUFZO1FBQ2xCLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDcEIsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN0QixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQzNCLENBQUM7O29HQTNEVSxPQUFPLHNKQVVSLGlCQUFpQjt3R0FWaEIsT0FBTyxjQUZOLE1BQU07MkZBRVAsT0FBTztrQkFIbkIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkI7OzBCQVdJLE1BQU07MkJBQUMsaUJBQWlCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSwgSW5qZWN0IH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcclxuaW1wb3J0IHsgSHR0cENsaWVudCB9IGZyb20gXCJAYW5ndWxhci9jb21tb24vaHR0cFwiO1xyXG5pbXBvcnQgeyBSb3V0ZXIgfSBmcm9tIFwiQGFuZ3VsYXIvcm91dGVyXCI7XHJcbmltcG9ydCB7IE9ic2VydmFibGUsIG9mIH0gZnJvbSBcInJ4anNcIjtcclxuaW1wb3J0IHsgQmVoYXZpb3JTdWJqZWN0LCB0aHJvd0Vycm9yIH0gZnJvbSBcInJ4anNcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aExvZ2luUmVxdWVzdCB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWxvZ2luLXJlcXVlc3RcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aENhY2hlIH0gZnJvbSBcIi4vdHJ1LWF1dGgtY2FjaGVcIjtcclxuaW1wb3J0IHsgVFJVX0FVVEhfU1RSQVRFR1kgfSBmcm9tIFwiLi4vY2xhc3Nlcy90cnUtYXV0aC1jb25maWdcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aFN0cmF0ZWd5IH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtY29uZmlnXCI7XHJcbmltcG9ydCB7IFRSVV9BVVRIX0NPTkZJRyB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWNvbmZpZ1wiO1xyXG5pbXBvcnQgeyB0YXAsIG1hcCwgY2F0Y2hFcnJvciwgc3dpdGNoTWFwIH0gZnJvbSBcInJ4anMvb3BlcmF0b3JzXCI7XHJcbmltcG9ydCB7IElUcnVVc2VyLCBUcnVVc2VyIH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS11c2VyXCI7XHJcbmltcG9ydCB7IFRydUFwcEVudmlyb25tZW50IH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS1hcHAtZW52aXJvbm1lbnRcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aFVzZXJSZXF1ZXN0IH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtdXNlci1yZXF1ZXN0XCI7XHJcbmltcG9ydCB7IGZsYXRNYXAgfSBmcm9tIFwibG9kYXNoXCI7XHJcblxyXG5ASW5qZWN0YWJsZSh7XHJcbiAgcHJvdmlkZWRJbjogXCJyb290XCIsXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBUcnVBdXRoIHtcclxuICBwcml2YXRlIGxvZ2dlZEluID0gbmV3IEJlaGF2aW9yU3ViamVjdDxib29sZWFuPihmYWxzZSk7XHJcbiAgcHJpdmF0ZSBiYXNlVXJsOiBzdHJpbmcgPSAnJztcclxuXHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICBwcml2YXRlIHJvdXRlcjogUm91dGVyLFxyXG4gICAgcHJpdmF0ZSBodHRwOiBIdHRwQ2xpZW50LFxyXG4gICAgcHJpdmF0ZSBjYWNoZTogVHJ1QXV0aENhY2hlLFxyXG4gICAgcHJpdmF0ZSB1c2VyOiBUcnVVc2VyLFxyXG4gICAgcHJpdmF0ZSBhcHBFbnZpcm9ubWVudDogVHJ1QXBwRW52aXJvbm1lbnQsXHJcbiAgICBASW5qZWN0KFRSVV9BVVRIX1NUUkFURUdZKSBwcml2YXRlIGF1dGg6IFRydUF1dGhTdHJhdGVneTxhbnk+XHJcbiAgKSB7XHJcbiAgICB0aGlzLmJhc2VVcmwgPSB0aGlzLmFwcEVudmlyb25tZW50LmFwcFVyaTtcclxuICB9XHJcblxyXG4gIGxvZ2luKGxvZ2luUmVxdWVzdDogVHJ1QXV0aExvZ2luUmVxdWVzdCk6IE9ic2VydmFibGU8YW55PiB7XHJcbiAgICByZXR1cm4gdGhpcy5odHRwXHJcbiAgICAgIC5wb3N0PGFueT4oYCR7dGhpcy5iYXNlVXJsfSR7VFJVX0FVVEhfQ09ORklHLmF1dGhVcmx9L2xvZ2luYCwgbG9naW5SZXF1ZXN0KVxyXG4gICAgICAucGlwZSh0YXAoKHRva2VuRGF0YSkgPT4geyBcclxuICAgICAgICAgIHRoaXMuYXV0aC5kb0xvZ2luVXNlcih0b2tlbkRhdGEpO1xyXG4gICAgICAgICAgdGhpcy5sb2dnZWRJbi5uZXh0KHRydWUpO1xyXG4gICAgICAgIH0pKTtcclxuICB9XHJcblxyXG4gIHNldFVzZXIoKSB7XHJcbiAgICBsZXQgand0RGF0YSA9IHRoaXMuYXV0aC5nZXREZWNvZGVkSnd0SnNvbkRhdGEoKSBhcyBhbnk7XHJcbiAgICBjb25zb2xlLmxvZyhqd3REYXRhKTtcclxuICAgIGxldCB1c2VyOiBJVHJ1VXNlciA9IHtcclxuICAgICAgYWN0aXZlVXNlclJlZjogand0RGF0YS5Vc2VyUmVmLFxyXG4gICAgICBmaXJzdE5hbWU6IGp3dERhdGEuRmlyc3ROYW1lLFxyXG4gICAgICBsYXN0TmFtZTogand0RGF0YS5MYXN0TmFtZSxcclxuICAgICAgZW1haWw6IGp3dERhdGEuRW1haWwsXHJcbiAgICAgIHVzZXJuYW1lOiBqd3REYXRhWydodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lJ10sXHJcbiAgICAgIHJvbGVzOiBqd3REYXRhWydodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUnXVxyXG4gICAgfVxyXG4gICAgdGhpcy51c2VyLmNyZWF0ZSh1c2VyKTtcclxuICB9XHJcblxyXG4gIGxvZ291dCgpIHtcclxuICAgIHRoaXMuZG9Mb2dvdXRVc2VyKCk7XHJcbiAgfVxyXG5cclxuICBnZXQgaXNMb2dnZWRJbigpIHtcclxuICAgIGlmICghdGhpcy5sb2dnZWRJbi52YWx1ZSkge1xyXG4gICAgICB0aGlzLmxvZ2dlZEluLm5leHQodGhpcy5hdXRoLmlzTG9nZ2VkSW4oKSk7XHJcbiAgICB9XHJcbiAgICByZXR1cm4gdGhpcy5sb2dnZWRJbi5hc09ic2VydmFibGUoKTtcclxuICB9XHJcblxyXG4gIGRvTG9nb3V0QW5kUmVkaXJlY3RUb0xvZ2luKCkge1xyXG4gICAgdGhpcy5kb0xvZ291dFVzZXIoKTtcclxuICAgIHRoaXMubG9nZ2VkSW4ubmV4dChmYWxzZSk7XHJcbiAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbXCJcIl0pO1xyXG4gIH1cclxuXHJcbiAgcHJpdmF0ZSBkb0xvZ291dFVzZXIoKSB7XHJcbiAgICB0aGlzLnVzZXIuZGVzdHJveSgpO1xyXG4gICAgdGhpcy5jYWNoZS5wcnVuZUFsbCgpO1xyXG4gICAgdGhpcy5hdXRoLmRvTG9nb3V0VXNlcigpO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -71,7 +71,7 @@ import { __awaiter } from 'tslib';
|
|
|
71
71
|
import moment$1 from 'moment';
|
|
72
72
|
import * as i8 from 'ag-grid-angular';
|
|
73
73
|
import { AgGridModule } from 'ag-grid-angular';
|
|
74
|
-
import { tap,
|
|
74
|
+
import { tap, catchError } from 'rxjs/operators';
|
|
75
75
|
import * as i1$6 from '@angular/router';
|
|
76
76
|
import { RouterModule } from '@angular/router';
|
|
77
77
|
import * as i1$7 from '@angular/platform-browser';
|
|
@@ -3692,9 +3692,6 @@ const TRU_AUTH_CONFIG = {
|
|
|
3692
3692
|
};
|
|
3693
3693
|
const TRU_AUTH_STRATEGY = new InjectionToken("AuthStrategy");
|
|
3694
3694
|
|
|
3695
|
-
class TruAuthUserRequest {
|
|
3696
|
-
}
|
|
3697
|
-
|
|
3698
3695
|
class TruAuthCache {
|
|
3699
3696
|
constructor() {
|
|
3700
3697
|
this.prunables = [];
|
|
@@ -3725,21 +3722,28 @@ class TruAuth {
|
|
|
3725
3722
|
this.auth = auth;
|
|
3726
3723
|
this.loggedIn = new BehaviorSubject(false);
|
|
3727
3724
|
this.baseUrl = '';
|
|
3728
|
-
this.createUserRequest = (username) => {
|
|
3729
|
-
let truUser = new TruAuthUserRequest();
|
|
3730
|
-
truUser.username = username;
|
|
3731
|
-
return truUser;
|
|
3732
|
-
};
|
|
3733
3725
|
this.baseUrl = this.appEnvironment.appUri;
|
|
3734
3726
|
}
|
|
3735
3727
|
login(loginRequest) {
|
|
3736
3728
|
return this.http
|
|
3737
3729
|
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/login`, loginRequest)
|
|
3738
|
-
.pipe(tap((tokenData) =>
|
|
3739
|
-
this.auth.doLoginUser(
|
|
3740
|
-
this.user.create(userData);
|
|
3730
|
+
.pipe(tap((tokenData) => {
|
|
3731
|
+
this.auth.doLoginUser(tokenData);
|
|
3741
3732
|
this.loggedIn.next(true);
|
|
3742
|
-
}))
|
|
3733
|
+
}));
|
|
3734
|
+
}
|
|
3735
|
+
setUser() {
|
|
3736
|
+
let jwtData = this.auth.getDecodedJwtJsonData();
|
|
3737
|
+
console.log(jwtData);
|
|
3738
|
+
let user = {
|
|
3739
|
+
activeUserRef: jwtData.UserRef,
|
|
3740
|
+
firstName: jwtData.FirstName,
|
|
3741
|
+
lastName: jwtData.LastName,
|
|
3742
|
+
email: jwtData.Email,
|
|
3743
|
+
username: jwtData['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'],
|
|
3744
|
+
roles: jwtData['http://schemas.microsoft.com/ws/2008/06/identity/claims/role']
|
|
3745
|
+
};
|
|
3746
|
+
this.user.create(user);
|
|
3743
3747
|
}
|
|
3744
3748
|
logout() {
|
|
3745
3749
|
this.doLogoutUser();
|
|
@@ -6006,6 +6010,16 @@ class TruAuthJwtStrategy {
|
|
|
6006
6010
|
getJwtToken() {
|
|
6007
6011
|
return JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
6008
6012
|
}
|
|
6013
|
+
getDecodedJwtJsonData() {
|
|
6014
|
+
let token = JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
6015
|
+
let payload = {};
|
|
6016
|
+
if (token && token !== "undefined") {
|
|
6017
|
+
const encodedPayload = token.split(".")[1];
|
|
6018
|
+
const payloadStr = window.atob(encodedPayload);
|
|
6019
|
+
payload = JSON.parse(payloadStr);
|
|
6020
|
+
}
|
|
6021
|
+
return payload;
|
|
6022
|
+
}
|
|
6009
6023
|
getToken() {
|
|
6010
6024
|
var token = JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
6011
6025
|
if (token && token !== "undefined") {
|
|
@@ -6068,16 +6082,10 @@ class TruAuthSessionStrategy {
|
|
|
6068
6082
|
doLogoutUser() {
|
|
6069
6083
|
this.loggedUser = undefined;
|
|
6070
6084
|
}
|
|
6071
|
-
|
|
6072
|
-
|
|
6073
|
-
return of(this.loggedUser);
|
|
6074
|
-
}
|
|
6075
|
-
else {
|
|
6076
|
-
return this.http
|
|
6077
|
-
.get(`${TRU_AUTH_CONFIG.authUrl}/user`)
|
|
6078
|
-
.pipe(tap((user) => (this.loggedUser = user)));
|
|
6079
|
-
}
|
|
6085
|
+
getDecodedJwtJsonData() {
|
|
6086
|
+
return {};
|
|
6080
6087
|
}
|
|
6088
|
+
;
|
|
6081
6089
|
isLoggedIn() {
|
|
6082
6090
|
return false; //todo, implement this
|
|
6083
6091
|
}
|