@trudb/tru-common-lib 0.0.711 → 0.0.715
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 +14 -1
- package/esm2020/lib/components/login/classes/tru-auth-logout-request.mjs +3 -0
- package/esm2020/lib/components/login/classes/tru-auth-session-strategy.mjs +2 -4
- package/esm2020/lib/components/login/services/tru-auth-interceptor.mjs +14 -7
- package/esm2020/lib/components/login/services/tru-auth.mjs +10 -16
- package/esm2020/lib/components/toolbar/user-profile/tru-toolbar-user-profile.mjs +2 -2
- package/fesm2015/trudb-tru-common-lib.mjs +49 -39
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +49 -39
- package/fesm2020/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/components/login/classes/tru-auth-config.d.ts +2 -1
- package/lib/components/login/classes/tru-auth-jwt-strategy.d.ts +2 -0
- package/lib/components/login/classes/tru-auth-logout-request.d.ts +3 -0
- package/lib/components/login/classes/tru-auth-session-strategy.d.ts +1 -1
- package/lib/components/login/services/tru-auth-interceptor.d.ts +5 -1
- package/lib/components/login/services/tru-auth.d.ts +2 -1
- 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jb21wb25lbnRzL2xvZ2luL2NsYXNzZXMvdHJ1LWF1dGgtY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFVL0MsTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFrQjtJQUM1QyxPQUFPLEVBQUUseUJBQXlCO0lBQ2xDLE9BQU8sRUFBRSxXQUFXO0lBQ3BCLElBQUksRUFBRSxPQUFPO0NBQ2QsQ0FBQztBQVlGLE1BQU0sQ0FBQyxNQUFNLGlCQUFpQixHQUFHLElBQUksY0FBYyxDQUNqRCxjQUFjLENBQ2YsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGlvblRva2VuIH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gXCJyeGpzXCI7XHJcbmltcG9ydCB7IFRydVVzZXIgfSBmcm9tIFwiLi4vLi4vLi4vc2VydmljZXMvdHJ1LXVzZXJcIjtcclxuXHJcbmV4cG9ydCBpbnRlcmZhY2UgVHJ1QXV0aENvbmZpZyB7XHJcbiAgYmFzZVVybDogc3RyaW5nO1xyXG4gIGF1dGhVcmw6IHN0cmluZztcclxuICBhdXRoOiBcInNlc3Npb25cIiB8IFwidG9rZW5cIjtcclxufVxyXG5cclxuZXhwb3J0IGNvbnN0IFRSVV9BVVRIX0NPTkZJRzogVHJ1QXV0aENvbmZpZyA9IHtcclxuICBiYXNlVXJsOiBcImh0dHBzOi8vbG9jYWxob3N0OjQ0MzAzXCIsXHJcbiAgYXV0aFVybDogXCIvYXBpL2F1dGhcIixcclxuICBhdXRoOiBcInRva2VuXCIsXHJcbn07XHJcblxyXG5leHBvcnQgaW50ZXJmYWNlIFRydUF1dGhTdHJhdGVneTxUPiB7XHJcbiAgZG9Mb2dpblVzZXIoZGF0YTogVCk6IHZvaWQ7XHJcblxyXG4gIGRvTG9nb3V0VXNlcigpOiB2b2lkO1xyXG5cclxuICBpc0xvZ2dlZEluKCk6IGJvb2xlYW47XHJcblxyXG4gIHNldFVzZXIodXNlcjogVHJ1VXNlcik6IHZvaWQ7XHJcbn1cclxuXHJcbmV4cG9ydCBjb25zdCBUUlVfQVVUSF9TVFJBVEVHWSA9IG5ldyBJbmplY3Rpb25Ub2tlbjxUcnVBdXRoU3RyYXRlZ3k8YW55Pj4oXHJcbiAgXCJBdXRoU3RyYXRlZ3lcIlxyXG4pO1xyXG4iXX0=
|
|
@@ -13,6 +13,19 @@ export class TruAuthJwtStrategy {
|
|
|
13
13
|
isLoggedIn() {
|
|
14
14
|
return !!this.getJwtToken();
|
|
15
15
|
}
|
|
16
|
+
setUser(user) {
|
|
17
|
+
let jwtData = this.getDecodedJwtJsonData();
|
|
18
|
+
console.log(jwtData);
|
|
19
|
+
let userData = {
|
|
20
|
+
activeUserRef: jwtData.UserRef,
|
|
21
|
+
firstName: jwtData.FirstName,
|
|
22
|
+
lastName: jwtData.LastName,
|
|
23
|
+
email: jwtData.Email,
|
|
24
|
+
username: jwtData['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'],
|
|
25
|
+
roles: jwtData['http://schemas.microsoft.com/ws/2008/06/identity/claims/role']
|
|
26
|
+
};
|
|
27
|
+
user.create(userData);
|
|
28
|
+
}
|
|
16
29
|
getJwtToken() {
|
|
17
30
|
return JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
18
31
|
}
|
|
@@ -43,4 +56,4 @@ export class TruAuthJwtStrategy {
|
|
|
43
56
|
return token;
|
|
44
57
|
}
|
|
45
58
|
}
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtand0LXN0cmF0ZWd5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jb21wb25lbnRzL2xvZ2luL2NsYXNzZXMvdHJ1LWF1dGgtand0LXN0cmF0ZWd5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE1BQU0sT0FBTyxrQkFBa0I7SUFBL0I7UUFDbUIscUJBQWdCLEdBQUcsY0FBYyxDQUFDO1FBQ2xDLHNCQUFpQixHQUFHLGVBQWUsQ0FBQztJQWtFdkQsQ0FBQztJQWhFQyxXQUFXLENBQUMsS0FBbUI7UUFDN0IsWUFBWSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztRQUMvRSxZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQ25GLENBQUM7SUFFRCxZQUFZO1FBQ1YsWUFBWSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQsVUFBVTtRQUNSLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUM5QixDQUFDO0lBRUQsT0FBTyxDQUFDLElBQWE7UUFDbkIsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFDLHFCQUFxQixFQUFTLENBQUM7UUFDbEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNyQixJQUFJLFFBQVEsR0FBYTtZQUN2QixhQUFhLEVBQUUsT0FBTyxDQUFDLE9BQU87WUFDOUIsU0FBUyxFQUFFLE9BQU8sQ0FBQyxTQUFTO1lBQzVCLFFBQVEsRUFBRSxPQUFPLENBQUMsUUFBUTtZQUMxQixLQUFLLEVBQUUsT0FBTyxDQUFDLEtBQUs7WUFDcEIsUUFBUSxFQUFFLE9BQU8sQ0FBQyw0REFBNEQsQ0FBQztZQUMvRSxLQUFLLEVBQUUsT0FBTyxDQUFDLDhEQUE4RCxDQUFDO1NBQy9FLENBQUE7UUFDRCxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3hCLENBQUM7SUFFRCxXQUFXO1FBQ1QsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFXLENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBRUQscUJBQXFCO1FBQ25CLElBQUksS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQVcsQ0FBQyxDQUFDO1FBQzlFLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQTtRQUNoQixJQUFJLEtBQUssSUFBSSxLQUFLLEtBQUssV0FBVyxFQUFFO1lBQ2xDLE1BQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDM0MsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztZQUUvQyxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztTQUNsQztRQUVELE9BQU8sT0FBTyxDQUFDO0lBQ2pCLENBQUM7SUFFRCxRQUFRO1FBQ04sSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBVyxDQUFDLENBQUM7UUFFOUUsSUFBSSxLQUFLLElBQUksS0FBSyxLQUFLLFdBQVcsRUFBRTtZQUNsQyxNQUFNLGNBQWMsR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzNDLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7WUFFL0MsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNyQyxJQUFJLEdBQUcsR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDekIsSUFBSSxDQUFDLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUNuQixJQUFJLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztZQUUzQyxJQUFJLEdBQUcsR0FBRyxLQUFLLEVBQUU7Z0JBQ2YsWUFBWSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztnQkFDL0MsT0FBTyxJQUFJLENBQUM7YUFDYjtTQUNGO1FBRUQsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBPYnNlcnZhYmxlLCBvZiB9IGZyb20gXCJyeGpzXCI7XHJcbmltcG9ydCB7IFRydUF1dGhUb2tlbiB9IGZyb20gXCIuL3RydS1hdXRoLXRva2VuXCI7XHJcbmltcG9ydCB7IElUcnVVc2VyLCBUcnVVc2VyIH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS11c2VyXCI7XHJcbmltcG9ydCB7IFRydUF1dGhTdHJhdGVneSB9IGZyb20gXCIuL3RydS1hdXRoLWNvbmZpZ1wiO1xyXG5cclxuZXhwb3J0IGNsYXNzIFRydUF1dGhKd3RTdHJhdGVneSBpbXBsZW1lbnRzIFRydUF1dGhTdHJhdGVneTxUcnVBdXRoVG9rZW4+IHtcclxuICBwcml2YXRlIHJlYWRvbmx5IEpXVF9BQ0NFU1NfVE9LRU4gPSBcIkFDQ0VTU19UT0tFTlwiO1xyXG4gIHByaXZhdGUgcmVhZG9ubHkgSldUX1JFRlJFU0hfVE9LRU4gPSBcIlJFRlJFU0hfVE9LRU5cIjtcclxuXHJcbiAgZG9Mb2dpblVzZXIodG9rZW46IFRydUF1dGhUb2tlbik6IHZvaWQge1xyXG4gICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0odGhpcy5KV1RfQUNDRVNTX1RPS0VOLCBKU09OLnN0cmluZ2lmeSh0b2tlbi5hY2Nlc3NUb2tlbikpO1xyXG4gICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0odGhpcy5KV1RfUkVGUkVTSF9UT0tFTiwgSlNPTi5zdHJpbmdpZnkodG9rZW4ucmVmcmVzaFRva2VuKSk7XHJcbiAgfVxyXG5cclxuICBkb0xvZ291dFVzZXIoKTogdm9pZCB7XHJcbiAgICBsb2NhbFN0b3JhZ2UucmVtb3ZlSXRlbSh0aGlzLkpXVF9BQ0NFU1NfVE9LRU4pO1xyXG4gIH1cclxuXHJcbiAgaXNMb2dnZWRJbigpOiBib29sZWFuIHtcclxuICAgIHJldHVybiAhIXRoaXMuZ2V0Snd0VG9rZW4oKTtcclxuICB9XHJcblxyXG4gIHNldFVzZXIodXNlcjogVHJ1VXNlcikge1xyXG4gICAgbGV0IGp3dERhdGEgPSB0aGlzLmdldERlY29kZWRKd3RKc29uRGF0YSgpIGFzIGFueTtcclxuICAgIGNvbnNvbGUubG9nKGp3dERhdGEpO1xyXG4gICAgbGV0IHVzZXJEYXRhOiBJVHJ1VXNlciA9IHtcclxuICAgICAgYWN0aXZlVXNlclJlZjogand0RGF0YS5Vc2VyUmVmLFxyXG4gICAgICBmaXJzdE5hbWU6IGp3dERhdGEuRmlyc3ROYW1lLFxyXG4gICAgICBsYXN0TmFtZTogand0RGF0YS5MYXN0TmFtZSxcclxuICAgICAgZW1haWw6IGp3dERhdGEuRW1haWwsXHJcbiAgICAgIHVzZXJuYW1lOiBqd3REYXRhWydodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lJ10sXHJcbiAgICAgIHJvbGVzOiBqd3REYXRhWydodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUnXVxyXG4gICAgfVxyXG4gICAgdXNlci5jcmVhdGUodXNlckRhdGEpO1xyXG4gIH1cclxuXHJcbiAgZ2V0Snd0VG9rZW4oKSB7XHJcbiAgICByZXR1cm4gSlNPTi5wYXJzZShsb2NhbFN0b3JhZ2UuZ2V0SXRlbSh0aGlzLkpXVF9BQ0NFU1NfVE9LRU4pIGFzIHN0cmluZyk7XHJcbiAgfVxyXG5cclxuICBnZXREZWNvZGVkSnd0SnNvbkRhdGEoKSB7XHJcbiAgICBsZXQgdG9rZW4gPSBKU09OLnBhcnNlKGxvY2FsU3RvcmFnZS5nZXRJdGVtKHRoaXMuSldUX0FDQ0VTU19UT0tFTikgYXMgc3RyaW5nKTtcclxuICAgIGxldCBwYXlsb2FkID0ge31cclxuICAgIGlmICh0b2tlbiAmJiB0b2tlbiAhPT0gXCJ1bmRlZmluZWRcIikge1xyXG4gICAgICBjb25zdCBlbmNvZGVkUGF5bG9hZCA9IHRva2VuLnNwbGl0KFwiLlwiKVsxXTtcclxuICAgICAgY29uc3QgcGF5bG9hZFN0ciA9IHdpbmRvdy5hdG9iKGVuY29kZWRQYXlsb2FkKTtcclxuXHJcbiAgICAgIHBheWxvYWQgPSBKU09OLnBhcnNlKHBheWxvYWRTdHIpO1xyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiBwYXlsb2FkO1xyXG4gIH1cclxuXHJcbiAgZ2V0VG9rZW4oKSB7XHJcbiAgICB2YXIgdG9rZW4gPSBKU09OLnBhcnNlKGxvY2FsU3RvcmFnZS5nZXRJdGVtKHRoaXMuSldUX0FDQ0VTU19UT0tFTikgYXMgc3RyaW5nKTtcclxuXHJcbiAgICBpZiAodG9rZW4gJiYgdG9rZW4gIT09IFwidW5kZWZpbmVkXCIpIHtcclxuICAgICAgY29uc3QgZW5jb2RlZFBheWxvYWQgPSB0b2tlbi5zcGxpdChcIi5cIilbMV07XHJcbiAgICAgIGNvbnN0IHBheWxvYWRTdHIgPSB3aW5kb3cuYXRvYihlbmNvZGVkUGF5bG9hZCk7XHJcblxyXG4gICAgICB2YXIgcGF5bG9hZCA9IEpTT04ucGFyc2UocGF5bG9hZFN0cik7XHJcbiAgICAgIHZhciBleHAgPSBwYXlsb2FkW1wiZXhwXCJdO1xyXG4gICAgICB2YXIgZCA9IG5ldyBEYXRlKCk7XHJcbiAgICAgIHZhciBlcG9jaCA9IE1hdGgucm91bmQoZC5nZXRUaW1lKCkgLyAxMDAwKTtcclxuXHJcbiAgICAgIGlmIChleHAgPCBlcG9jaCkge1xyXG4gICAgICAgIGxvY2FsU3RvcmFnZS5yZW1vdmVJdGVtKHRoaXMuSldUX0FDQ0VTU19UT0tFTik7XHJcbiAgICAgICAgcmV0dXJuIG51bGw7XHJcbiAgICAgIH1cclxuICAgIH1cclxuICAgIFxyXG4gICAgcmV0dXJuIHRva2VuO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
export class TruAuthLogoutRequest {
|
|
2
|
+
}
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtbG9nb3V0LXJlcXVlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NvbXBvbmVudHMvbG9naW4vY2xhc3Nlcy90cnUtYXV0aC1sb2dvdXQtcmVxdWVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLE9BQU8sb0JBQW9CO0NBRWhDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNsYXNzIFRydUF1dGhMb2dvdXRSZXF1ZXN0IHtcclxuICB1c2VybmFtZSE6IHN0cmluZztcclxufVxyXG4iXX0=
|
|
@@ -8,12 +8,10 @@ export class TruAuthSessionStrategy {
|
|
|
8
8
|
doLogoutUser() {
|
|
9
9
|
this.loggedUser = undefined;
|
|
10
10
|
}
|
|
11
|
-
|
|
12
|
-
return {};
|
|
11
|
+
setUser(user) {
|
|
13
12
|
}
|
|
14
|
-
;
|
|
15
13
|
isLoggedIn() {
|
|
16
14
|
return false; //todo, implement this
|
|
17
15
|
}
|
|
18
16
|
}
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtc2Vzc2lvbi1zdHJhdGVneS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3RydS1jb21tb24tbGliL3NyYy9saWIvY29tcG9uZW50cy9sb2dpbi9jbGFzc2VzL3RydS1hdXRoLXNlc3Npb24tc3RyYXRlZ3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsTUFBTSxPQUFPLHNCQUFzQjtJQUdqQyxZQUFvQixJQUFnQjtRQUFoQixTQUFJLEdBQUosSUFBSSxDQUFZO0lBQUcsQ0FBQztJQUV4QyxXQUFXLENBQUMsSUFBYTtRQUN2QixJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQztJQUN6QixDQUFDO0lBRUQsWUFBWTtRQUNWLElBQUksQ0FBQyxVQUFVLEdBQUcsU0FBUyxDQUFDO0lBQzlCLENBQUM7SUFFRCxPQUFPLENBQUMsSUFBYTtJQUVyQixDQUFDO0lBRUQsVUFBVTtRQUNSLE9BQU8sS0FBSyxDQUFDLENBQUEsc0JBQXNCO0lBQ3JDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEh0dHBDbGllbnQgfSBmcm9tIFwiQGFuZ3VsYXIvY29tbW9uL2h0dHBcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aFN0cmF0ZWd5IH0gZnJvbSBcIi4vdHJ1LWF1dGgtY29uZmlnXCI7XHJcbmltcG9ydCB7IFRydVVzZXIgfSBmcm9tIFwiLi4vLi4vLi4vc2VydmljZXMvdHJ1LXVzZXJcIjtcclxuXHJcblxyXG5leHBvcnQgY2xhc3MgVHJ1QXV0aFNlc3Npb25TdHJhdGVneSBpbXBsZW1lbnRzIFRydUF1dGhTdHJhdGVneTxUcnVVc2VyPiB7XHJcbiAgcHJpdmF0ZSBsb2dnZWRVc2VyPzogVHJ1VXNlcjtcclxuXHJcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBodHRwOiBIdHRwQ2xpZW50KSB7fVxyXG5cclxuICBkb0xvZ2luVXNlcih1c2VyOiBUcnVVc2VyKTogdm9pZCB7XHJcbiAgICB0aGlzLmxvZ2dlZFVzZXIgPSB1c2VyO1xyXG4gIH1cclxuXHJcbiAgZG9Mb2dvdXRVc2VyKCk6IHZvaWQge1xyXG4gICAgdGhpcy5sb2dnZWRVc2VyID0gdW5kZWZpbmVkO1xyXG4gIH1cclxuXHJcbiAgc2V0VXNlcih1c2VyOiBUcnVVc2VyKSB7XHJcblxyXG4gIH1cclxuXHJcbiAgaXNMb2dnZWRJbigpOiBib29sZWFuIHtcclxuICAgIHJldHVybiBmYWxzZTsvL3RvZG8sIGltcGxlbWVudCB0aGlzXHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -1,18 +1,22 @@
|
|
|
1
1
|
import { Injectable, Inject } from "@angular/core";
|
|
2
2
|
import { throwError } from "rxjs";
|
|
3
3
|
import { catchError } from "rxjs/operators";
|
|
4
|
-
import {
|
|
4
|
+
import { TRU_AUTH_STRATEGY } from "../classes/tru-auth-config";
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
6
|
import * as i1 from "./tru-auth";
|
|
7
|
-
import * as i2 from "
|
|
7
|
+
import * as i2 from "../../../services/tru-app-environment";
|
|
8
|
+
import * as i3 from "../classes/tru-auth-jwt-strategy";
|
|
9
|
+
import * as i4 from "../classes/tru-auth-session-strategy";
|
|
8
10
|
// import { ConfigService } from "../config.service";
|
|
9
11
|
export class TruAuthInterceptor {
|
|
10
|
-
constructor(auth, jwt) {
|
|
12
|
+
constructor(auth, appEnvironment, jwt, session) {
|
|
11
13
|
this.auth = auth;
|
|
14
|
+
this.appEnvironment = appEnvironment;
|
|
12
15
|
this.jwt = jwt;
|
|
16
|
+
this.session = session;
|
|
13
17
|
}
|
|
14
18
|
intercept(request, next) {
|
|
15
|
-
if (
|
|
19
|
+
if (this.appEnvironment.authType === 'jwt') {
|
|
16
20
|
request = this.addToken(request, String(this.jwt.getToken()));
|
|
17
21
|
}
|
|
18
22
|
return next.handle(request).pipe(catchError((error) => {
|
|
@@ -28,12 +32,15 @@ export class TruAuthInterceptor {
|
|
|
28
32
|
});
|
|
29
33
|
}
|
|
30
34
|
}
|
|
31
|
-
TruAuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: i1.TruAuth }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
35
|
+
TruAuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: i1.TruAuth }, { token: i2.TruAppEnvironment }, { token: TRU_AUTH_STRATEGY }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
32
36
|
TruAuthInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor });
|
|
33
37
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, decorators: [{
|
|
34
38
|
type: Injectable
|
|
35
|
-
}], ctorParameters: function () { return [{ type: i1.TruAuth }, { type: i2.TruAuthJwtStrategy, decorators: [{
|
|
39
|
+
}], ctorParameters: function () { return [{ type: i1.TruAuth }, { type: i2.TruAppEnvironment }, { type: i3.TruAuthJwtStrategy, decorators: [{
|
|
40
|
+
type: Inject,
|
|
41
|
+
args: [TRU_AUTH_STRATEGY]
|
|
42
|
+
}] }, { type: i4.TruAuthSessionStrategy, decorators: [{
|
|
36
43
|
type: Inject,
|
|
37
44
|
args: [TRU_AUTH_STRATEGY]
|
|
38
45
|
}] }]; } });
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtaW50ZXJjZXB0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NvbXBvbmVudHMvbG9naW4vc2VydmljZXMvdHJ1LWF1dGgtaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFPbkQsT0FBTyxFQUFjLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUM5QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFJNUMsT0FBTyxFQUFtQixpQkFBaUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDOzs7Ozs7QUFHaEYscURBQXFEO0FBR3JELE1BQU0sT0FBTyxrQkFBa0I7SUFDN0IsWUFDVSxJQUFhLEVBQ2IsY0FBaUMsRUFDTixHQUF1QixFQUN2QixPQUErQjtRQUgxRCxTQUFJLEdBQUosSUFBSSxDQUFTO1FBQ2IsbUJBQWMsR0FBZCxjQUFjLENBQW1CO1FBQ04sUUFBRyxHQUFILEdBQUcsQ0FBb0I7UUFDdkIsWUFBTyxHQUFQLE9BQU8sQ0FBd0I7SUFDakUsQ0FBQztJQUVKLFNBQVMsQ0FDUCxPQUF5QixFQUN6QixJQUFpQjtRQUVqQixJQUFJLElBQUksQ0FBQyxjQUFjLENBQUMsUUFBUSxLQUFLLEtBQUssRUFBRTtZQUMxQyxPQUFPLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDO1NBQy9EO1FBRUQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FDOUIsVUFBVSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDbkIsSUFBSSxLQUFLLENBQUMsTUFBTSxLQUFLLEdBQUcsRUFBRTtnQkFDeEIsSUFBSSxDQUFDLElBQUksQ0FBQywwQkFBMEIsRUFBRSxDQUFDO2FBQ3hDO1lBQ0QsT0FBTyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDM0IsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7SUFFTyxRQUFRLENBQUMsT0FBeUIsRUFBRSxLQUFhO1FBQ3ZELE9BQU8sT0FBTyxDQUFDLEtBQUssQ0FBQztZQUNuQixVQUFVLEVBQUUsRUFBRSxhQUFhLEVBQUUsVUFBVSxLQUFLLEVBQUUsRUFBRTtTQUNqRCxDQUFDLENBQUM7SUFDTCxDQUFDOzsrR0E5QlUsa0JBQWtCLDBFQUluQixpQkFBaUIsYUFDakIsaUJBQWlCO21IQUxoQixrQkFBa0I7MkZBQWxCLGtCQUFrQjtrQkFEOUIsVUFBVTs7MEJBS04sTUFBTTsyQkFBQyxpQkFBaUI7OzBCQUN4QixNQUFNOzJCQUFDLGlCQUFpQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUsIEluamVjdCB9IGZyb20gXCJAYW5ndWxhci9jb3JlXCI7XHJcbmltcG9ydCB7XHJcbiAgSHR0cFJlcXVlc3QsXHJcbiAgSHR0cEhhbmRsZXIsXHJcbiAgSHR0cEV2ZW50LFxyXG4gIEh0dHBJbnRlcmNlcHRvcixcclxufSBmcm9tIFwiQGFuZ3VsYXIvY29tbW9uL2h0dHBcIjtcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgdGhyb3dFcnJvciB9IGZyb20gXCJyeGpzXCI7XHJcbmltcG9ydCB7IGNhdGNoRXJyb3IgfSBmcm9tIFwicnhqcy9vcGVyYXRvcnNcIjtcclxuXHJcbmltcG9ydCB7IFRydUF1dGggfSBmcm9tIFwiLi90cnUtYXV0aFwiO1xyXG5pbXBvcnQgeyBUcnVBdXRoSnd0U3RyYXRlZ3kgfSBmcm9tIFwiLi4vY2xhc3Nlcy90cnUtYXV0aC1qd3Qtc3RyYXRlZ3lcIjtcclxuaW1wb3J0IHsgVFJVX0FVVEhfQ09ORklHLCBUUlVfQVVUSF9TVFJBVEVHWSB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWNvbmZpZ1wiO1xyXG5pbXBvcnQgeyBUcnVBdXRoU2Vzc2lvblN0cmF0ZWd5IH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtc2Vzc2lvbi1zdHJhdGVneVwiO1xyXG5pbXBvcnQgeyBUcnVBcHBFbnZpcm9ubWVudCB9IGZyb20gXCIuLi8uLi8uLi9zZXJ2aWNlcy90cnUtYXBwLWVudmlyb25tZW50XCI7XHJcbi8vIGltcG9ydCB7IENvbmZpZ1NlcnZpY2UgfSBmcm9tIFwiLi4vY29uZmlnLnNlcnZpY2VcIjtcclxuXHJcbkBJbmplY3RhYmxlKClcclxuZXhwb3J0IGNsYXNzIFRydUF1dGhJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICBwcml2YXRlIGF1dGg6IFRydUF1dGgsXHJcbiAgICBwcml2YXRlIGFwcEVudmlyb25tZW50OiBUcnVBcHBFbnZpcm9ubWVudCxcclxuICAgIEBJbmplY3QoVFJVX0FVVEhfU1RSQVRFR1kpIHByaXZhdGUgand0OiBUcnVBdXRoSnd0U3RyYXRlZ3ksXHJcbiAgICBASW5qZWN0KFRSVV9BVVRIX1NUUkFURUdZKSBwcml2YXRlIHNlc3Npb246IFRydUF1dGhTZXNzaW9uU3RyYXRlZ3lcclxuICApIHt9XHJcblxyXG4gIGludGVyY2VwdChcclxuICAgIHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sXHJcbiAgICBuZXh0OiBIdHRwSGFuZGxlclxyXG4gICk6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcclxuICAgIGlmICh0aGlzLmFwcEVudmlyb25tZW50LmF1dGhUeXBlID09PSAnand0Jykge1xyXG4gICAgICByZXF1ZXN0ID0gdGhpcy5hZGRUb2tlbihyZXF1ZXN0LCBTdHJpbmcodGhpcy5qd3QuZ2V0VG9rZW4oKSkpO1xyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KS5waXBlKFxyXG4gICAgICBjYXRjaEVycm9yKChlcnJvcikgPT4ge1xyXG4gICAgICAgIGlmIChlcnJvci5zdGF0dXMgPT09IDQwMSkge1xyXG4gICAgICAgICAgdGhpcy5hdXRoLmRvTG9nb3V0QW5kUmVkaXJlY3RUb0xvZ2luKCk7XHJcbiAgICAgICAgfVxyXG4gICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGVycm9yKTtcclxuICAgICAgfSlcclxuICAgICk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIGFkZFRva2VuKHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIHRva2VuOiBzdHJpbmcpIHtcclxuICAgIHJldHVybiByZXF1ZXN0LmNsb25lKHtcclxuICAgICAgc2V0SGVhZGVyczogeyBBdXRob3JpemF0aW9uOiBgQmVhcmVyICR7dG9rZW59YCB9LFxyXG4gICAgfSk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -24,26 +24,20 @@ export class TruAuth {
|
|
|
24
24
|
login(loginRequest) {
|
|
25
25
|
return this.http
|
|
26
26
|
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/login`, loginRequest)
|
|
27
|
-
.pipe(tap((
|
|
28
|
-
this.auth.doLoginUser(
|
|
27
|
+
.pipe(tap((data) => {
|
|
28
|
+
this.auth.doLoginUser(data);
|
|
29
29
|
this.loggedIn.next(true);
|
|
30
30
|
}));
|
|
31
31
|
}
|
|
32
32
|
setUser() {
|
|
33
|
-
|
|
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);
|
|
33
|
+
this.auth.setUser(this.user);
|
|
44
34
|
}
|
|
45
|
-
logout() {
|
|
46
|
-
this.
|
|
35
|
+
logout(logoutRequest) {
|
|
36
|
+
return this.http
|
|
37
|
+
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/logout`, logoutRequest)
|
|
38
|
+
.pipe(tap(() => {
|
|
39
|
+
this.doLogoutAndRedirectToLogin();
|
|
40
|
+
}));
|
|
47
41
|
}
|
|
48
42
|
get isLoggedIn() {
|
|
49
43
|
if (!this.loggedIn.value) {
|
|
@@ -73,4 +67,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
73
67
|
type: Inject,
|
|
74
68
|
args: [TRU_AUTH_STRATEGY]
|
|
75
69
|
}] }]; } });
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NvbXBvbmVudHMvbG9naW4vc2VydmljZXMvdHJ1LWF1dGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFJbkQsT0FBTyxFQUFFLGVBQWUsRUFBYyxNQUFNLE1BQU0sQ0FBQztBQUduRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUUvRCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDN0QsT0FBTyxFQUFFLEdBQUcsRUFBOEIsTUFBTSxnQkFBZ0IsQ0FBQzs7Ozs7OztBQVVqRSxNQUFNLE9BQU8sT0FBTztJQUlsQixZQUNVLE1BQWMsRUFDZCxJQUFnQixFQUNoQixLQUFtQixFQUNuQixJQUFhLEVBQ2IsY0FBaUMsRUFDTixJQUEwQjtRQUxyRCxXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsU0FBSSxHQUFKLElBQUksQ0FBWTtRQUNoQixVQUFLLEdBQUwsS0FBSyxDQUFjO1FBQ25CLFNBQUksR0FBSixJQUFJLENBQVM7UUFDYixtQkFBYyxHQUFkLGNBQWMsQ0FBbUI7UUFDTixTQUFJLEdBQUosSUFBSSxDQUFzQjtRQVR2RCxhQUFRLEdBQUcsSUFBSSxlQUFlLENBQVUsS0FBSyxDQUFDLENBQUM7UUFDL0MsWUFBTyxHQUFXLEVBQUUsQ0FBQztRQVUzQixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDO0lBQzVDLENBQUM7SUFFRCxLQUFLLENBQUMsWUFBaUM7UUFDckMsT0FBTyxJQUFJLENBQUMsSUFBSTthQUNiLElBQUksQ0FBTSxHQUFHLElBQUksQ0FBQyxPQUFPLEdBQUcsZUFBZSxDQUFDLE9BQU8sUUFBUSxFQUFFLFlBQVksQ0FBQzthQUMxRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDZixJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUM1QixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMzQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ1YsQ0FBQztJQUVELE9BQU87UUFDTCxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELE1BQU0sQ0FBQyxhQUFtQztRQUN4QyxPQUFPLElBQUksQ0FBQyxJQUFJO2FBQ2IsSUFBSSxDQUFNLEdBQUcsSUFBSSxDQUFDLE9BQU8sR0FBRyxlQUFlLENBQUMsT0FBTyxTQUFTLEVBQUUsYUFBYSxDQUFDO2FBQzVFLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFO1lBQ2IsSUFBSSxDQUFDLDBCQUEwQixFQUFFLENBQUM7UUFDcEMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNSLENBQUM7SUFFRCxJQUFJLFVBQVU7UUFDWixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUU7WUFDeEIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO1NBQzVDO1FBQ0QsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3RDLENBQUM7SUFFRCwwQkFBMEI7UUFDeEIsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3BCLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzFCLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUM3QixDQUFDO0lBRU8sWUFBWTtRQUNsQixJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ3BCLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDdEIsSUFBSSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUMzQixDQUFDOztvR0FyRFUsT0FBTyxzSkFVUixpQkFBaUI7d0dBVmhCLE9BQU8sY0FGTixNQUFNOzJGQUVQLE9BQU87a0JBSG5CLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25COzswQkFXSSxNQUFNOzJCQUFDLGlCQUFpQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUsIEluamVjdCB9IGZyb20gXCJAYW5ndWxhci9jb3JlXCI7XHJcbmltcG9ydCB7IEh0dHBDbGllbnQgfSBmcm9tIFwiQGFuZ3VsYXIvY29tbW9uL2h0dHBcIjtcclxuaW1wb3J0IHsgUm91dGVyIH0gZnJvbSBcIkBhbmd1bGFyL3JvdXRlclwiO1xyXG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBvZiB9IGZyb20gXCJyeGpzXCI7XHJcbmltcG9ydCB7IEJlaGF2aW9yU3ViamVjdCwgdGhyb3dFcnJvciB9IGZyb20gXCJyeGpzXCI7XHJcbmltcG9ydCB7IFRydUF1dGhMb2dpblJlcXVlc3QgfSBmcm9tIFwiLi4vY2xhc3Nlcy90cnUtYXV0aC1sb2dpbi1yZXF1ZXN0XCI7XHJcbmltcG9ydCB7IFRydUF1dGhDYWNoZSB9IGZyb20gXCIuL3RydS1hdXRoLWNhY2hlXCI7XHJcbmltcG9ydCB7IFRSVV9BVVRIX1NUUkFURUdZIH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtY29uZmlnXCI7XHJcbmltcG9ydCB7IFRydUF1dGhTdHJhdGVneSB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWNvbmZpZ1wiO1xyXG5pbXBvcnQgeyBUUlVfQVVUSF9DT05GSUcgfSBmcm9tIFwiLi4vY2xhc3Nlcy90cnUtYXV0aC1jb25maWdcIjtcclxuaW1wb3J0IHsgdGFwLCBtYXAsIGNhdGNoRXJyb3IsIHN3aXRjaE1hcCB9IGZyb20gXCJyeGpzL29wZXJhdG9yc1wiO1xyXG5pbXBvcnQgeyBJVHJ1VXNlciwgVHJ1VXNlciB9IGZyb20gXCIuLi8uLi8uLi9zZXJ2aWNlcy90cnUtdXNlclwiO1xyXG5pbXBvcnQgeyBUcnVBcHBFbnZpcm9ubWVudCB9IGZyb20gXCIuLi8uLi8uLi9zZXJ2aWNlcy90cnUtYXBwLWVudmlyb25tZW50XCI7XHJcbmltcG9ydCB7IFRydUF1dGhVc2VyUmVxdWVzdCB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLXVzZXItcmVxdWVzdFwiO1xyXG5pbXBvcnQgeyBmbGF0TWFwIH0gZnJvbSBcImxvZGFzaFwiO1xyXG5pbXBvcnQgeyBUcnVBdXRoTG9nb3V0UmVxdWVzdCB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWxvZ291dC1yZXF1ZXN0XCI7XHJcblxyXG5ASW5qZWN0YWJsZSh7XHJcbiAgcHJvdmlkZWRJbjogXCJyb290XCIsXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBUcnVBdXRoIHtcclxuICBwcml2YXRlIGxvZ2dlZEluID0gbmV3IEJlaGF2aW9yU3ViamVjdDxib29sZWFuPihmYWxzZSk7XHJcbiAgcHJpdmF0ZSBiYXNlVXJsOiBzdHJpbmcgPSAnJztcclxuXHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICBwcml2YXRlIHJvdXRlcjogUm91dGVyLFxyXG4gICAgcHJpdmF0ZSBodHRwOiBIdHRwQ2xpZW50LFxyXG4gICAgcHJpdmF0ZSBjYWNoZTogVHJ1QXV0aENhY2hlLFxyXG4gICAgcHJpdmF0ZSB1c2VyOiBUcnVVc2VyLFxyXG4gICAgcHJpdmF0ZSBhcHBFbnZpcm9ubWVudDogVHJ1QXBwRW52aXJvbm1lbnQsXHJcbiAgICBASW5qZWN0KFRSVV9BVVRIX1NUUkFURUdZKSBwcml2YXRlIGF1dGg6IFRydUF1dGhTdHJhdGVneTxhbnk+XHJcbiAgKSB7XHJcbiAgICB0aGlzLmJhc2VVcmwgPSB0aGlzLmFwcEVudmlyb25tZW50LmFwcFVyaTtcclxuICB9XHJcblxyXG4gIGxvZ2luKGxvZ2luUmVxdWVzdDogVHJ1QXV0aExvZ2luUmVxdWVzdCk6IE9ic2VydmFibGU8YW55PiB7XHJcbiAgICByZXR1cm4gdGhpcy5odHRwXHJcbiAgICAgIC5wb3N0PGFueT4oYCR7dGhpcy5iYXNlVXJsfSR7VFJVX0FVVEhfQ09ORklHLmF1dGhVcmx9L2xvZ2luYCwgbG9naW5SZXF1ZXN0KVxyXG4gICAgICAucGlwZSh0YXAoKGRhdGEpID0+IHsgXHJcbiAgICAgICAgICB0aGlzLmF1dGguZG9Mb2dpblVzZXIoZGF0YSk7XHJcbiAgICAgICAgICB0aGlzLmxvZ2dlZEluLm5leHQodHJ1ZSk7XHJcbiAgICAgICAgfSkpO1xyXG4gIH1cclxuXHJcbiAgc2V0VXNlcigpIHtcclxuICAgIHRoaXMuYXV0aC5zZXRVc2VyKHRoaXMudXNlcik7XHJcbiAgfVxyXG5cclxuICBsb2dvdXQobG9nb3V0UmVxdWVzdDogVHJ1QXV0aExvZ291dFJlcXVlc3QpIHtcclxuICAgIHJldHVybiB0aGlzLmh0dHBcclxuICAgICAgLnBvc3Q8YW55PihgJHt0aGlzLmJhc2VVcmx9JHtUUlVfQVVUSF9DT05GSUcuYXV0aFVybH0vbG9nb3V0YCwgbG9nb3V0UmVxdWVzdClcclxuICAgICAgLnBpcGUodGFwKCgpID0+IHtcclxuICAgICAgICB0aGlzLmRvTG9nb3V0QW5kUmVkaXJlY3RUb0xvZ2luKCk7XHJcbiAgICAgIH0pKTtcclxuICB9XHJcblxyXG4gIGdldCBpc0xvZ2dlZEluKCkge1xyXG4gICAgaWYgKCF0aGlzLmxvZ2dlZEluLnZhbHVlKSB7XHJcbiAgICAgIHRoaXMubG9nZ2VkSW4ubmV4dCh0aGlzLmF1dGguaXNMb2dnZWRJbigpKTtcclxuICAgIH1cclxuICAgIHJldHVybiB0aGlzLmxvZ2dlZEluLmFzT2JzZXJ2YWJsZSgpO1xyXG4gIH1cclxuXHJcbiAgZG9Mb2dvdXRBbmRSZWRpcmVjdFRvTG9naW4oKSB7XHJcbiAgICB0aGlzLmRvTG9nb3V0VXNlcigpO1xyXG4gICAgdGhpcy5sb2dnZWRJbi5uZXh0KGZhbHNlKTtcclxuICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKFtcIlwiXSk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIGRvTG9nb3V0VXNlcigpIHtcclxuICAgIHRoaXMudXNlci5kZXN0cm95KCk7XHJcbiAgICB0aGlzLmNhY2hlLnBydW5lQWxsKCk7XHJcbiAgICB0aGlzLmF1dGguZG9Mb2dvdXRVc2VyKCk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -19,7 +19,7 @@ export class TruToolbarUserProfile {
|
|
|
19
19
|
this.uiNotification.changePassword();
|
|
20
20
|
};
|
|
21
21
|
this.onLogoutButtonClicked = () => {
|
|
22
|
-
this.auth.
|
|
22
|
+
this.auth.logout({ username: this.user.username });
|
|
23
23
|
};
|
|
24
24
|
this.initial = user?.firstName ? user?.firstName.slice(0, 1).toUpperCase() : user?.username?.slice(0, 1).toUpperCase();
|
|
25
25
|
this.name = user?.firstName && user?.lastName ? user?.firstName + ' ' + user?.lastName : user?.username;
|
|
@@ -32,4 +32,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
32
32
|
type: Component,
|
|
33
33
|
args: [{ selector: 'tru-toolbar-user-profile', encapsulation: ViewEncapsulation.None, template: "<div class=\"tru-toolbar-user-profile\">\r\n <button mat-mini-fab color=\"primary\" class=\"tru-toolbar-user-profile-user-button\" [matMenuTriggerFor]=\"userMenu\">\r\n {{initial}}\r\n </button>\r\n</div>\r\n<mat-menu #userMenu=\"matMenu\">\r\n <div class=\"tru-toolbar-user-profile-menu-container\">\r\n <mat-icon class=\"tru-toolbar-user-profile-menu-circle-icon\" [svgIcon]=\"'circle-icon'\"></mat-icon>\r\n <span class=\"tru-toolbar-user-profile-menu-circle-icon-text\">{{initial}}</span>\r\n <div class=\"tru-toolbar-user-profile-menu-text-container\">\r\n <p>{{name}}</p>\r\n <p *ngIf=\"email\">{{email}}</p>\r\n </div>\r\n <button mat-menu-item\r\n (click)=\"onChangePasswordButtonClicked()\"\r\n class=\"tru-toolbar-user-profile-menu-logout-button\">\r\n Change Password\r\n </button>\r\n <button mat-menu-item\r\n (click)=\"onLogoutButtonClicked()\"\r\n class=\"tru-toolbar-user-profile-menu-logout-button\">\r\n Logout\r\n </button>\r\n </div>\r\n</mat-menu>\r\n", styles: [".tru-toolbar-user-profile{height:25px;float:right}.tru-toolbar-user-profile button{height:23px;width:23px;margin-right:10px;margin-top:1px;font-size:12px;box-shadow:none}.tru-toolbar-user-profile-menu-container{width:250px}.tru-toolbar-user-profile-menu-container mat-icon{height:50px;width:50px;margin:auto;display:flex;justify-content:center;color:#006dcc}.tru-toolbar-user-profile-menu-container p{margin:5px;font-size:14px;text-align:center}.tru-toolbar-user-profile-menu-container .tru-toolbar-user-profile-menu-logout-button{display:flex;justify-content:center}.tru-toolbar-user-profile-menu-text-container{margin-top:-15px}.tru-toolbar-user-profile-menu-circle-icon-text{color:#fff;font-weight:200;font-size:30px;margin-right:12px;display:block;margin-left:12px;display:flex;justify-content:center;position:relative;z-index:100;top:-35px}\n"] }]
|
|
34
34
|
}], ctorParameters: function () { return [{ type: i1.TruUser }, { type: i2.TruAuth }, { type: i3.TruUiNotification }]; } });
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jb21wb25lbnRzL3Rvb2xiYXIvdXNlci1wcm9maWxlL3RydS10b29sYmFyLXVzZXItcHJvZmlsZS50cyIsIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3RydS1jb21tb24tbGliL3NyYy9saWIvY29tcG9uZW50cy90b29sYmFyL3VzZXItcHJvZmlsZS90cnUtdG9vbGJhci11c2VyLXByb2ZpbGUuaHRtbCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sZUFBZSxDQUFDOzs7Ozs7Ozs7QUFZN0QsTUFBTSxPQUFPLHFCQUFxQjtJQUtoQyxZQUNVLElBQWEsRUFDYixJQUFhLEVBQ2IsY0FBaUM7UUFGakMsU0FBSSxHQUFKLElBQUksQ0FBUztRQUNiLFNBQUksR0FBSixJQUFJLENBQVM7UUFDYixtQkFBYyxHQUFkLGNBQWMsQ0FBbUI7UUFQM0MsWUFBTyxHQUE4QixJQUFJLENBQUM7UUFDMUMsU0FBSSxHQUE4QixJQUFJLENBQUM7UUFDdkMsVUFBSyxHQUE4QixJQUFJLENBQUM7UUFXeEMsa0NBQTZCLEdBQUcsR0FBRyxFQUFFO1lBQ25DLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDdkMsQ0FBQyxDQUFBO1FBRUQsMEJBQXFCLEdBQUcsR0FBRyxFQUFFO1lBQzNCLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBa0IsRUFBRSxDQUFDLENBQUM7UUFDL0QsQ0FBQyxDQUFBO1FBWEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQTtRQUN0SCxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksRUFBRSxTQUFTLElBQUksSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLFNBQVMsR0FBRyxHQUFHLEdBQUcsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQztRQUN4RyxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksRUFBRSxLQUFLLENBQUM7SUFDM0IsQ0FBQzs7a0hBWlUscUJBQXFCO3NHQUFyQixxQkFBcUIsZ0VDWmxDLDZpQ0F5QkE7MkZEYmEscUJBQXFCO2tCQU5qQyxTQUFTOytCQUNFLDBCQUEwQixpQkFHckIsaUJBQWlCLENBQUMsSUFBSSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbXBvbmVudCwgVmlld0VuY2Fwc3VsYXRpb24gfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgVHJ1VWlOb3RpZmljYXRpb24gfSBmcm9tICcuLi8uLi8uLi9zZXJ2aWNlcy90cnUtdWktbm90aWZpY2F0aW9uJztcclxuaW1wb3J0IHsgVHJ1VXNlciB9IGZyb20gJy4uLy4uLy4uL3NlcnZpY2VzL3RydS11c2VyJztcclxuaW1wb3J0IHsgVHJ1QXV0aCB9IGZyb20gJy4uLy4uL2xvZ2luL3NlcnZpY2VzL3RydS1hdXRoJztcclxuXHJcblxyXG5AQ29tcG9uZW50KHtcclxuICBzZWxlY3RvcjogJ3RydS10b29sYmFyLXVzZXItcHJvZmlsZScsXHJcbiAgdGVtcGxhdGVVcmw6ICcuL3RydS10b29sYmFyLXVzZXItcHJvZmlsZS5odG1sJyxcclxuICBzdHlsZVVybHM6IFsnLi90cnUtdG9vbGJhci11c2VyLXByb2ZpbGUuY3NzJ10sXHJcbiAgZW5jYXBzdWxhdGlvbjogVmlld0VuY2Fwc3VsYXRpb24uTm9uZVxyXG59KVxyXG5leHBvcnQgY2xhc3MgVHJ1VG9vbGJhclVzZXJQcm9maWxlIHtcclxuICBpbml0aWFsOiBzdHJpbmcgfCBudWxsIHwgdW5kZWZpbmVkID0gbnVsbDtcclxuICBuYW1lOiBzdHJpbmcgfCBudWxsIHwgdW5kZWZpbmVkID0gbnVsbDtcclxuICBlbWFpbDogc3RyaW5nIHwgbnVsbCB8IHVuZGVmaW5lZCA9IG51bGw7XHJcblxyXG4gIGNvbnN0cnVjdG9yKFxyXG4gICAgcHJpdmF0ZSB1c2VyOiBUcnVVc2VyLFxyXG4gICAgcHJpdmF0ZSBhdXRoOiBUcnVBdXRoLFxyXG4gICAgcHJpdmF0ZSB1aU5vdGlmaWNhdGlvbjogVHJ1VWlOb3RpZmljYXRpb24pIHtcclxuICAgIHRoaXMuaW5pdGlhbCA9IHVzZXI/LmZpcnN0TmFtZSA/IHVzZXI/LmZpcnN0TmFtZS5zbGljZSgwLCAxKS50b1VwcGVyQ2FzZSgpIDogdXNlcj8udXNlcm5hbWU/LnNsaWNlKDAsIDEpLnRvVXBwZXJDYXNlKClcclxuICAgIHRoaXMubmFtZSA9IHVzZXI/LmZpcnN0TmFtZSAmJiB1c2VyPy5sYXN0TmFtZSA/IHVzZXI/LmZpcnN0TmFtZSArICcgJyArIHVzZXI/Lmxhc3ROYW1lIDogdXNlcj8udXNlcm5hbWU7XHJcbiAgICB0aGlzLmVtYWlsID0gdXNlcj8uZW1haWw7XHJcbiAgfVxyXG5cclxuICBvbkNoYW5nZVBhc3N3b3JkQnV0dG9uQ2xpY2tlZCA9ICgpID0+IHtcclxuICAgIHRoaXMudWlOb3RpZmljYXRpb24uY2hhbmdlUGFzc3dvcmQoKTtcclxuICB9XHJcblxyXG4gIG9uTG9nb3V0QnV0dG9uQ2xpY2tlZCA9ICgpID0+IHtcclxuICAgIHRoaXMuYXV0aC5sb2dvdXQoeyB1c2VybmFtZTogdGhpcy51c2VyLnVzZXJuYW1lIGFzIHN0cmluZyB9KTtcclxuICB9XHJcbn1cclxuIiwiPGRpdiBjbGFzcz1cInRydS10b29sYmFyLXVzZXItcHJvZmlsZVwiPlxyXG4gIDxidXR0b24gbWF0LW1pbmktZmFiIGNvbG9yPVwicHJpbWFyeVwiIGNsYXNzPVwidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLXVzZXItYnV0dG9uXCIgW21hdE1lbnVUcmlnZ2VyRm9yXT1cInVzZXJNZW51XCI+XHJcbiAgICB7e2luaXRpYWx9fVxyXG4gIDwvYnV0dG9uPlxyXG48L2Rpdj5cclxuPG1hdC1tZW51ICN1c2VyTWVudT1cIm1hdE1lbnVcIj5cclxuICA8ZGl2IGNsYXNzPVwidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLW1lbnUtY29udGFpbmVyXCI+XHJcbiAgICA8bWF0LWljb24gY2xhc3M9XCJ0cnUtdG9vbGJhci11c2VyLXByb2ZpbGUtbWVudS1jaXJjbGUtaWNvblwiIFtzdmdJY29uXT1cIidjaXJjbGUtaWNvbidcIj48L21hdC1pY29uPlxyXG4gICAgPHNwYW4gY2xhc3M9XCJ0cnUtdG9vbGJhci11c2VyLXByb2ZpbGUtbWVudS1jaXJjbGUtaWNvbi10ZXh0XCI+e3tpbml0aWFsfX08L3NwYW4+XHJcbiAgICA8ZGl2IGNsYXNzPVwidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLW1lbnUtdGV4dC1jb250YWluZXJcIj5cclxuICAgICAgPHA+e3tuYW1lfX08L3A+XHJcbiAgICAgIDxwICpuZ0lmPVwiZW1haWxcIj57e2VtYWlsfX08L3A+XHJcbiAgICA8L2Rpdj5cclxuICAgIDxidXR0b24gbWF0LW1lbnUtaXRlbVxyXG4gICAgICAgICAgICAoY2xpY2spPVwib25DaGFuZ2VQYXNzd29yZEJ1dHRvbkNsaWNrZWQoKVwiXHJcbiAgICAgICAgICAgIGNsYXNzPVwidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLW1lbnUtbG9nb3V0LWJ1dHRvblwiPlxyXG4gICAgICBDaGFuZ2UgUGFzc3dvcmRcclxuICAgIDwvYnV0dG9uPlxyXG4gICAgPGJ1dHRvbiBtYXQtbWVudS1pdGVtXHJcbiAgICAgICAgICAgIChjbGljayk9XCJvbkxvZ291dEJ1dHRvbkNsaWNrZWQoKVwiXHJcbiAgICAgICAgICAgIGNsYXNzPVwidHJ1LXRvb2xiYXItdXNlci1wcm9maWxlLW1lbnUtbG9nb3V0LWJ1dHRvblwiPlxyXG4gICAgICBMb2dvdXRcclxuICAgIDwvYnV0dG9uPlxyXG4gIDwvZGl2PlxyXG48L21hdC1tZW51PlxyXG4iXX0=
|
|
@@ -3734,26 +3734,20 @@ class TruAuth {
|
|
|
3734
3734
|
login(loginRequest) {
|
|
3735
3735
|
return this.http
|
|
3736
3736
|
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/login`, loginRequest)
|
|
3737
|
-
.pipe(tap((
|
|
3738
|
-
this.auth.doLoginUser(
|
|
3737
|
+
.pipe(tap((data) => {
|
|
3738
|
+
this.auth.doLoginUser(data);
|
|
3739
3739
|
this.loggedIn.next(true);
|
|
3740
3740
|
}));
|
|
3741
3741
|
}
|
|
3742
3742
|
setUser() {
|
|
3743
|
-
|
|
3744
|
-
console.log(jwtData);
|
|
3745
|
-
let user = {
|
|
3746
|
-
activeUserRef: jwtData.UserRef,
|
|
3747
|
-
firstName: jwtData.FirstName,
|
|
3748
|
-
lastName: jwtData.LastName,
|
|
3749
|
-
email: jwtData.Email,
|
|
3750
|
-
username: jwtData['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'],
|
|
3751
|
-
roles: jwtData['http://schemas.microsoft.com/ws/2008/06/identity/claims/role']
|
|
3752
|
-
};
|
|
3753
|
-
this.user.create(user);
|
|
3743
|
+
this.auth.setUser(this.user);
|
|
3754
3744
|
}
|
|
3755
|
-
logout() {
|
|
3756
|
-
this.
|
|
3745
|
+
logout(logoutRequest) {
|
|
3746
|
+
return this.http
|
|
3747
|
+
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/logout`, logoutRequest)
|
|
3748
|
+
.pipe(tap(() => {
|
|
3749
|
+
this.doLogoutAndRedirectToLogin();
|
|
3750
|
+
}));
|
|
3757
3751
|
}
|
|
3758
3752
|
get isLoggedIn() {
|
|
3759
3753
|
if (!this.loggedIn.value) {
|
|
@@ -3799,7 +3793,7 @@ class TruToolbarUserProfile {
|
|
|
3799
3793
|
this.uiNotification.changePassword();
|
|
3800
3794
|
};
|
|
3801
3795
|
this.onLogoutButtonClicked = () => {
|
|
3802
|
-
this.auth.
|
|
3796
|
+
this.auth.logout({ username: this.user.username });
|
|
3803
3797
|
};
|
|
3804
3798
|
this.initial = (user === null || user === void 0 ? void 0 : user.firstName) ? user === null || user === void 0 ? void 0 : user.firstName.slice(0, 1).toUpperCase() : (_a = user === null || user === void 0 ? void 0 : user.username) === null || _a === void 0 ? void 0 : _a.slice(0, 1).toUpperCase();
|
|
3805
3799
|
this.name = (user === null || user === void 0 ? void 0 : user.firstName) && (user === null || user === void 0 ? void 0 : user.lastName) ? (user === null || user === void 0 ? void 0 : user.firstName) + ' ' + (user === null || user === void 0 ? void 0 : user.lastName) : user === null || user === void 0 ? void 0 : user.username;
|
|
@@ -6014,6 +6008,19 @@ class TruAuthJwtStrategy {
|
|
|
6014
6008
|
isLoggedIn() {
|
|
6015
6009
|
return !!this.getJwtToken();
|
|
6016
6010
|
}
|
|
6011
|
+
setUser(user) {
|
|
6012
|
+
let jwtData = this.getDecodedJwtJsonData();
|
|
6013
|
+
console.log(jwtData);
|
|
6014
|
+
let userData = {
|
|
6015
|
+
activeUserRef: jwtData.UserRef,
|
|
6016
|
+
firstName: jwtData.FirstName,
|
|
6017
|
+
lastName: jwtData.LastName,
|
|
6018
|
+
email: jwtData.Email,
|
|
6019
|
+
username: jwtData['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'],
|
|
6020
|
+
roles: jwtData['http://schemas.microsoft.com/ws/2008/06/identity/claims/role']
|
|
6021
|
+
};
|
|
6022
|
+
user.create(userData);
|
|
6023
|
+
}
|
|
6017
6024
|
getJwtToken() {
|
|
6018
6025
|
return JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
6019
6026
|
}
|
|
@@ -6045,14 +6052,33 @@ class TruAuthJwtStrategy {
|
|
|
6045
6052
|
}
|
|
6046
6053
|
}
|
|
6047
6054
|
|
|
6055
|
+
class TruAuthSessionStrategy {
|
|
6056
|
+
constructor(http) {
|
|
6057
|
+
this.http = http;
|
|
6058
|
+
}
|
|
6059
|
+
doLoginUser(user) {
|
|
6060
|
+
this.loggedUser = user;
|
|
6061
|
+
}
|
|
6062
|
+
doLogoutUser() {
|
|
6063
|
+
this.loggedUser = undefined;
|
|
6064
|
+
}
|
|
6065
|
+
setUser(user) {
|
|
6066
|
+
}
|
|
6067
|
+
isLoggedIn() {
|
|
6068
|
+
return false; //todo, implement this
|
|
6069
|
+
}
|
|
6070
|
+
}
|
|
6071
|
+
|
|
6048
6072
|
// import { ConfigService } from "../config.service";
|
|
6049
6073
|
class TruAuthInterceptor {
|
|
6050
|
-
constructor(auth, jwt) {
|
|
6074
|
+
constructor(auth, appEnvironment, jwt, session) {
|
|
6051
6075
|
this.auth = auth;
|
|
6076
|
+
this.appEnvironment = appEnvironment;
|
|
6052
6077
|
this.jwt = jwt;
|
|
6078
|
+
this.session = session;
|
|
6053
6079
|
}
|
|
6054
6080
|
intercept(request, next) {
|
|
6055
|
-
if (
|
|
6081
|
+
if (this.appEnvironment.authType === 'jwt') {
|
|
6056
6082
|
request = this.addToken(request, String(this.jwt.getToken()));
|
|
6057
6083
|
}
|
|
6058
6084
|
return next.handle(request).pipe(catchError((error) => {
|
|
@@ -6068,36 +6094,20 @@ class TruAuthInterceptor {
|
|
|
6068
6094
|
});
|
|
6069
6095
|
}
|
|
6070
6096
|
}
|
|
6071
|
-
TruAuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: TruAuth }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
6097
|
+
TruAuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: TruAuth }, { token: TruAppEnvironment }, { token: TRU_AUTH_STRATEGY }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
6072
6098
|
TruAuthInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor });
|
|
6073
6099
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, decorators: [{
|
|
6074
6100
|
type: Injectable
|
|
6075
6101
|
}], ctorParameters: function () {
|
|
6076
|
-
return [{ type: TruAuth }, { type: TruAuthJwtStrategy, decorators: [{
|
|
6102
|
+
return [{ type: TruAuth }, { type: TruAppEnvironment }, { type: TruAuthJwtStrategy, decorators: [{
|
|
6103
|
+
type: Inject,
|
|
6104
|
+
args: [TRU_AUTH_STRATEGY]
|
|
6105
|
+
}] }, { type: TruAuthSessionStrategy, decorators: [{
|
|
6077
6106
|
type: Inject,
|
|
6078
6107
|
args: [TRU_AUTH_STRATEGY]
|
|
6079
6108
|
}] }];
|
|
6080
6109
|
} });
|
|
6081
6110
|
|
|
6082
|
-
class TruAuthSessionStrategy {
|
|
6083
|
-
constructor(http) {
|
|
6084
|
-
this.http = http;
|
|
6085
|
-
}
|
|
6086
|
-
doLoginUser(user) {
|
|
6087
|
-
this.loggedUser = user;
|
|
6088
|
-
}
|
|
6089
|
-
doLogoutUser() {
|
|
6090
|
-
this.loggedUser = undefined;
|
|
6091
|
-
}
|
|
6092
|
-
getDecodedJwtJsonData() {
|
|
6093
|
-
return {};
|
|
6094
|
-
}
|
|
6095
|
-
;
|
|
6096
|
-
isLoggedIn() {
|
|
6097
|
-
return false; //todo, implement this
|
|
6098
|
-
}
|
|
6099
|
-
}
|
|
6100
|
-
|
|
6101
6111
|
const TruAuthStrategyProvider = {
|
|
6102
6112
|
provide: TRU_AUTH_STRATEGY,
|
|
6103
6113
|
deps: [HttpClient, TruAppEnvironment],
|