@trudb/tru-common-lib 0.0.710 → 0.0.714
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-session-strategy.mjs +2 -4
- package/esm2020/lib/components/login/classes/tru-auth-strategy-provider.mjs +3 -2
- package/esm2020/lib/components/login/services/tru-auth-interceptor.mjs +14 -7
- package/esm2020/lib/components/login/services/tru-auth.mjs +4 -14
- package/fesm2015/trudb-tru-common-lib.mjs +43 -37
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +43 -37
- 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-session-strategy.d.ts +1 -1
- package/lib/components/login/classes/tru-auth-strategy-provider.d.ts +1 -1
- package/lib/components/login/services/tru-auth-interceptor.d.ts +5 -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=
|
|
@@ -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,10 +1,11 @@
|
|
|
1
1
|
import { HttpClient } from "@angular/common/http";
|
|
2
|
+
import { TruAppEnvironment } from "../../../services/tru-app-environment";
|
|
2
3
|
import { TRU_AUTH_STRATEGY } from "./tru-auth-config";
|
|
3
4
|
import { TruAuthJwtStrategy } from "./tru-auth-jwt-strategy";
|
|
4
5
|
import { TruAuthSessionStrategy } from "./tru-auth-session-strategy";
|
|
5
6
|
export const TruAuthStrategyProvider = {
|
|
6
7
|
provide: TRU_AUTH_STRATEGY,
|
|
7
|
-
deps: [HttpClient],
|
|
8
|
+
deps: [HttpClient, TruAppEnvironment],
|
|
8
9
|
useFactory: (http, appEnvironment) => {
|
|
9
10
|
switch (appEnvironment.authType) {
|
|
10
11
|
case "session":
|
|
@@ -16,4 +17,4 @@ export const TruAuthStrategyProvider = {
|
|
|
16
17
|
}
|
|
17
18
|
},
|
|
18
19
|
};
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGgtc3RyYXRlZ3ktcHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NvbXBvbmVudHMvbG9naW4vY2xhc3Nlcy90cnUtYXV0aC1zdHJhdGVneS1wcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDMUUsT0FBTyxFQUFtQixpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzdELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRXJFLE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUFHO0lBQ3JDLE9BQU8sRUFBRSxpQkFBaUI7SUFDMUIsSUFBSSxFQUFFLENBQUMsVUFBVSxFQUFFLGlCQUFpQixDQUFDO0lBQ3JDLFVBQVUsRUFBRSxDQUFDLElBQWdCLEVBQUUsY0FBaUMsRUFBRSxFQUFFO1FBQ2xFLFFBQVEsY0FBYyxDQUFDLFFBQVEsRUFBRTtZQUMvQixLQUFLLFNBQVM7Z0JBQ1osT0FBTyxJQUFJLHNCQUFzQixDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzFDLEtBQUssS0FBSztnQkFDUixPQUFPLElBQUksa0JBQWtCLEVBQUUsQ0FBQztZQUNsQztnQkFDRSxNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUM7U0FDNUM7SUFDSCxDQUFDO0NBQ0YsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEh0dHBDbGllbnQgfSBmcm9tIFwiQGFuZ3VsYXIvY29tbW9uL2h0dHBcIjtcclxuaW1wb3J0IHsgVHJ1QXBwRW52aXJvbm1lbnQgfSBmcm9tIFwiLi4vLi4vLi4vc2VydmljZXMvdHJ1LWFwcC1lbnZpcm9ubWVudFwiO1xyXG5pbXBvcnQgeyBUUlVfQVVUSF9DT05GSUcsIFRSVV9BVVRIX1NUUkFURUdZIH0gZnJvbSBcIi4vdHJ1LWF1dGgtY29uZmlnXCI7XHJcbmltcG9ydCB7IFRydUF1dGhKd3RTdHJhdGVneSB9IGZyb20gXCIuL3RydS1hdXRoLWp3dC1zdHJhdGVneVwiO1xyXG5pbXBvcnQgeyBUcnVBdXRoU2Vzc2lvblN0cmF0ZWd5IH0gZnJvbSBcIi4vdHJ1LWF1dGgtc2Vzc2lvbi1zdHJhdGVneVwiO1xyXG5cclxuZXhwb3J0IGNvbnN0IFRydUF1dGhTdHJhdGVneVByb3ZpZGVyID0ge1xyXG4gIHByb3ZpZGU6IFRSVV9BVVRIX1NUUkFURUdZLFxyXG4gIGRlcHM6IFtIdHRwQ2xpZW50LCBUcnVBcHBFbnZpcm9ubWVudF0sXHJcbiAgdXNlRmFjdG9yeTogKGh0dHA6IEh0dHBDbGllbnQsIGFwcEVudmlyb25tZW50OiBUcnVBcHBFbnZpcm9ubWVudCkgPT4ge1xyXG4gICAgc3dpdGNoIChhcHBFbnZpcm9ubWVudC5hdXRoVHlwZSkge1xyXG4gICAgICBjYXNlIFwic2Vzc2lvblwiOlxyXG4gICAgICAgIHJldHVybiBuZXcgVHJ1QXV0aFNlc3Npb25TdHJhdGVneShodHRwKTtcclxuICAgICAgY2FzZSBcImp3dFwiOlxyXG4gICAgICAgIHJldHVybiBuZXcgVHJ1QXV0aEp3dFN0cmF0ZWd5KCk7XHJcbiAgICAgIGRlZmF1bHQ6XHJcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKFwiSW52YWxpZCBhdXRoIHN0cmF0ZWd5XCIpO1xyXG4gICAgfVxyXG4gIH0sXHJcbn07XHJcbiJdfQ==
|
|
@@ -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,23 +24,13 @@ 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
35
|
logout() {
|
|
46
36
|
this.doLogoutUser();
|
|
@@ -73,4 +63,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
73
63
|
type: Inject,
|
|
74
64
|
args: [TRU_AUTH_STRATEGY]
|
|
75
65
|
}] }]; } });
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NvbXBvbmVudHMvbG9naW4vc2VydmljZXMvdHJ1LWF1dGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFJbkQsT0FBTyxFQUFFLGVBQWUsRUFBYyxNQUFNLE1BQU0sQ0FBQztBQUduRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUUvRCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDN0QsT0FBTyxFQUFFLEdBQUcsRUFBOEIsTUFBTSxnQkFBZ0IsQ0FBQzs7Ozs7OztBQVNqRSxNQUFNLE9BQU8sT0FBTztJQUlsQixZQUNVLE1BQWMsRUFDZCxJQUFnQixFQUNoQixLQUFtQixFQUNuQixJQUFhLEVBQ2IsY0FBaUMsRUFDTixJQUEwQjtRQUxyRCxXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsU0FBSSxHQUFKLElBQUksQ0FBWTtRQUNoQixVQUFLLEdBQUwsS0FBSyxDQUFjO1FBQ25CLFNBQUksR0FBSixJQUFJLENBQVM7UUFDYixtQkFBYyxHQUFkLGNBQWMsQ0FBbUI7UUFDTixTQUFJLEdBQUosSUFBSSxDQUFzQjtRQVR2RCxhQUFRLEdBQUcsSUFBSSxlQUFlLENBQVUsS0FBSyxDQUFDLENBQUM7UUFDL0MsWUFBTyxHQUFXLEVBQUUsQ0FBQztRQVUzQixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDO0lBQzVDLENBQUM7SUFFRCxLQUFLLENBQUMsWUFBaUM7UUFDckMsT0FBTyxJQUFJLENBQUMsSUFBSTthQUNiLElBQUksQ0FBTSxHQUFHLElBQUksQ0FBQyxPQUFPLEdBQUcsZUFBZSxDQUFDLE9BQU8sUUFBUSxFQUFFLFlBQVksQ0FBQzthQUMxRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDZixJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUM1QixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMzQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ1YsQ0FBQztJQUVELE9BQU87UUFDTCxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELE1BQU07UUFDSixJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDdEIsQ0FBQztJQUVELElBQUksVUFBVTtRQUNaLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRTtZQUN4QixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUM7U0FDNUM7UUFDRCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDdEMsQ0FBQztJQUVELDBCQUEwQjtRQUN4QixJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDcEIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDMUIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFFTyxZQUFZO1FBQ2xCLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDcEIsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN0QixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQzNCLENBQUM7O29HQWpEVSxPQUFPLHNKQVVSLGlCQUFpQjt3R0FWaEIsT0FBTyxjQUZOLE1BQU07MkZBRVAsT0FBTztrQkFIbkIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkI7OzBCQVdJLE1BQU07MkJBQUMsaUJBQWlCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSwgSW5qZWN0IH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcclxuaW1wb3J0IHsgSHR0cENsaWVudCB9IGZyb20gXCJAYW5ndWxhci9jb21tb24vaHR0cFwiO1xyXG5pbXBvcnQgeyBSb3V0ZXIgfSBmcm9tIFwiQGFuZ3VsYXIvcm91dGVyXCI7XHJcbmltcG9ydCB7IE9ic2VydmFibGUsIG9mIH0gZnJvbSBcInJ4anNcIjtcclxuaW1wb3J0IHsgQmVoYXZpb3JTdWJqZWN0LCB0aHJvd0Vycm9yIH0gZnJvbSBcInJ4anNcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aExvZ2luUmVxdWVzdCB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWxvZ2luLXJlcXVlc3RcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aENhY2hlIH0gZnJvbSBcIi4vdHJ1LWF1dGgtY2FjaGVcIjtcclxuaW1wb3J0IHsgVFJVX0FVVEhfU1RSQVRFR1kgfSBmcm9tIFwiLi4vY2xhc3Nlcy90cnUtYXV0aC1jb25maWdcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aFN0cmF0ZWd5IH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtY29uZmlnXCI7XHJcbmltcG9ydCB7IFRSVV9BVVRIX0NPTkZJRyB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWNvbmZpZ1wiO1xyXG5pbXBvcnQgeyB0YXAsIG1hcCwgY2F0Y2hFcnJvciwgc3dpdGNoTWFwIH0gZnJvbSBcInJ4anMvb3BlcmF0b3JzXCI7XHJcbmltcG9ydCB7IElUcnVVc2VyLCBUcnVVc2VyIH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS11c2VyXCI7XHJcbmltcG9ydCB7IFRydUFwcEVudmlyb25tZW50IH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS1hcHAtZW52aXJvbm1lbnRcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aFVzZXJSZXF1ZXN0IH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtdXNlci1yZXF1ZXN0XCI7XHJcbmltcG9ydCB7IGZsYXRNYXAgfSBmcm9tIFwibG9kYXNoXCI7XHJcblxyXG5ASW5qZWN0YWJsZSh7XHJcbiAgcHJvdmlkZWRJbjogXCJyb290XCIsXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBUcnVBdXRoIHtcclxuICBwcml2YXRlIGxvZ2dlZEluID0gbmV3IEJlaGF2aW9yU3ViamVjdDxib29sZWFuPihmYWxzZSk7XHJcbiAgcHJpdmF0ZSBiYXNlVXJsOiBzdHJpbmcgPSAnJztcclxuXHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICBwcml2YXRlIHJvdXRlcjogUm91dGVyLFxyXG4gICAgcHJpdmF0ZSBodHRwOiBIdHRwQ2xpZW50LFxyXG4gICAgcHJpdmF0ZSBjYWNoZTogVHJ1QXV0aENhY2hlLFxyXG4gICAgcHJpdmF0ZSB1c2VyOiBUcnVVc2VyLFxyXG4gICAgcHJpdmF0ZSBhcHBFbnZpcm9ubWVudDogVHJ1QXBwRW52aXJvbm1lbnQsXHJcbiAgICBASW5qZWN0KFRSVV9BVVRIX1NUUkFURUdZKSBwcml2YXRlIGF1dGg6IFRydUF1dGhTdHJhdGVneTxhbnk+XHJcbiAgKSB7XHJcbiAgICB0aGlzLmJhc2VVcmwgPSB0aGlzLmFwcEVudmlyb25tZW50LmFwcFVyaTtcclxuICB9XHJcblxyXG4gIGxvZ2luKGxvZ2luUmVxdWVzdDogVHJ1QXV0aExvZ2luUmVxdWVzdCk6IE9ic2VydmFibGU8YW55PiB7XHJcbiAgICByZXR1cm4gdGhpcy5odHRwXHJcbiAgICAgIC5wb3N0PGFueT4oYCR7dGhpcy5iYXNlVXJsfSR7VFJVX0FVVEhfQ09ORklHLmF1dGhVcmx9L2xvZ2luYCwgbG9naW5SZXF1ZXN0KVxyXG4gICAgICAucGlwZSh0YXAoKGRhdGEpID0+IHsgXHJcbiAgICAgICAgICB0aGlzLmF1dGguZG9Mb2dpblVzZXIoZGF0YSk7XHJcbiAgICAgICAgICB0aGlzLmxvZ2dlZEluLm5leHQodHJ1ZSk7XHJcbiAgICAgICAgfSkpO1xyXG4gIH1cclxuXHJcbiAgc2V0VXNlcigpIHtcclxuICAgIHRoaXMuYXV0aC5zZXRVc2VyKHRoaXMudXNlcik7XHJcbiAgfVxyXG5cclxuICBsb2dvdXQoKSB7XHJcbiAgICB0aGlzLmRvTG9nb3V0VXNlcigpO1xyXG4gIH1cclxuXHJcbiAgZ2V0IGlzTG9nZ2VkSW4oKSB7XHJcbiAgICBpZiAoIXRoaXMubG9nZ2VkSW4udmFsdWUpIHtcclxuICAgICAgdGhpcy5sb2dnZWRJbi5uZXh0KHRoaXMuYXV0aC5pc0xvZ2dlZEluKCkpO1xyXG4gICAgfVxyXG4gICAgcmV0dXJuIHRoaXMubG9nZ2VkSW4uYXNPYnNlcnZhYmxlKCk7XHJcbiAgfVxyXG5cclxuICBkb0xvZ291dEFuZFJlZGlyZWN0VG9Mb2dpbigpIHtcclxuICAgIHRoaXMuZG9Mb2dvdXRVc2VyKCk7XHJcbiAgICB0aGlzLmxvZ2dlZEluLm5leHQoZmFsc2UpO1xyXG4gICAgdGhpcy5yb3V0ZXIubmF2aWdhdGUoW1wiXCJdKTtcclxuICB9XHJcblxyXG4gIHByaXZhdGUgZG9Mb2dvdXRVc2VyKCkge1xyXG4gICAgdGhpcy51c2VyLmRlc3Ryb3koKTtcclxuICAgIHRoaXMuY2FjaGUucHJ1bmVBbGwoKTtcclxuICAgIHRoaXMuYXV0aC5kb0xvZ291dFVzZXIoKTtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -3734,23 +3734,13 @@ 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
3745
|
logout() {
|
|
3756
3746
|
this.doLogoutUser();
|
|
@@ -6014,6 +6004,19 @@ class TruAuthJwtStrategy {
|
|
|
6014
6004
|
isLoggedIn() {
|
|
6015
6005
|
return !!this.getJwtToken();
|
|
6016
6006
|
}
|
|
6007
|
+
setUser(user) {
|
|
6008
|
+
let jwtData = this.getDecodedJwtJsonData();
|
|
6009
|
+
console.log(jwtData);
|
|
6010
|
+
let userData = {
|
|
6011
|
+
activeUserRef: jwtData.UserRef,
|
|
6012
|
+
firstName: jwtData.FirstName,
|
|
6013
|
+
lastName: jwtData.LastName,
|
|
6014
|
+
email: jwtData.Email,
|
|
6015
|
+
username: jwtData['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'],
|
|
6016
|
+
roles: jwtData['http://schemas.microsoft.com/ws/2008/06/identity/claims/role']
|
|
6017
|
+
};
|
|
6018
|
+
user.create(userData);
|
|
6019
|
+
}
|
|
6017
6020
|
getJwtToken() {
|
|
6018
6021
|
return JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
|
|
6019
6022
|
}
|
|
@@ -6045,14 +6048,33 @@ class TruAuthJwtStrategy {
|
|
|
6045
6048
|
}
|
|
6046
6049
|
}
|
|
6047
6050
|
|
|
6051
|
+
class TruAuthSessionStrategy {
|
|
6052
|
+
constructor(http) {
|
|
6053
|
+
this.http = http;
|
|
6054
|
+
}
|
|
6055
|
+
doLoginUser(user) {
|
|
6056
|
+
this.loggedUser = user;
|
|
6057
|
+
}
|
|
6058
|
+
doLogoutUser() {
|
|
6059
|
+
this.loggedUser = undefined;
|
|
6060
|
+
}
|
|
6061
|
+
setUser(user) {
|
|
6062
|
+
}
|
|
6063
|
+
isLoggedIn() {
|
|
6064
|
+
return false; //todo, implement this
|
|
6065
|
+
}
|
|
6066
|
+
}
|
|
6067
|
+
|
|
6048
6068
|
// import { ConfigService } from "../config.service";
|
|
6049
6069
|
class TruAuthInterceptor {
|
|
6050
|
-
constructor(auth, jwt) {
|
|
6070
|
+
constructor(auth, appEnvironment, jwt, session) {
|
|
6051
6071
|
this.auth = auth;
|
|
6072
|
+
this.appEnvironment = appEnvironment;
|
|
6052
6073
|
this.jwt = jwt;
|
|
6074
|
+
this.session = session;
|
|
6053
6075
|
}
|
|
6054
6076
|
intercept(request, next) {
|
|
6055
|
-
if (
|
|
6077
|
+
if (this.appEnvironment.authType === 'jwt') {
|
|
6056
6078
|
request = this.addToken(request, String(this.jwt.getToken()));
|
|
6057
6079
|
}
|
|
6058
6080
|
return next.handle(request).pipe(catchError((error) => {
|
|
@@ -6068,39 +6090,23 @@ class TruAuthInterceptor {
|
|
|
6068
6090
|
});
|
|
6069
6091
|
}
|
|
6070
6092
|
}
|
|
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 });
|
|
6093
|
+
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
6094
|
TruAuthInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor });
|
|
6073
6095
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, decorators: [{
|
|
6074
6096
|
type: Injectable
|
|
6075
6097
|
}], ctorParameters: function () {
|
|
6076
|
-
return [{ type: TruAuth }, { type: TruAuthJwtStrategy, decorators: [{
|
|
6098
|
+
return [{ type: TruAuth }, { type: TruAppEnvironment }, { type: TruAuthJwtStrategy, decorators: [{
|
|
6099
|
+
type: Inject,
|
|
6100
|
+
args: [TRU_AUTH_STRATEGY]
|
|
6101
|
+
}] }, { type: TruAuthSessionStrategy, decorators: [{
|
|
6077
6102
|
type: Inject,
|
|
6078
6103
|
args: [TRU_AUTH_STRATEGY]
|
|
6079
6104
|
}] }];
|
|
6080
6105
|
} });
|
|
6081
6106
|
|
|
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
6107
|
const TruAuthStrategyProvider = {
|
|
6102
6108
|
provide: TRU_AUTH_STRATEGY,
|
|
6103
|
-
deps: [HttpClient],
|
|
6109
|
+
deps: [HttpClient, TruAppEnvironment],
|
|
6104
6110
|
useFactory: (http, appEnvironment) => {
|
|
6105
6111
|
switch (appEnvironment.authType) {
|
|
6106
6112
|
case "session":
|