@trudb/tru-common-lib 0.0.356 → 0.0.358
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/assets/tru-icon-module.mjs +2 -2
- package/esm2020/lib/components/login/services/tru-auth.mjs +12 -9
- package/fesm2015/trudb-tru-common-lib.mjs +11 -9
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +11 -9
- package/fesm2020/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/components/login/services/tru-auth.d.ts +4 -2
- package/package.json +1 -1
|
@@ -5,7 +5,7 @@ import * as i0 from "@angular/core";
|
|
|
5
5
|
import * as i1 from "@angular/platform-browser";
|
|
6
6
|
import * as i2 from "@angular/material/icon";
|
|
7
7
|
const GO_TO_ICON = `
|
|
8
|
-
<svg xmlns="http://www.w3.org/2000/svg" height="
|
|
8
|
+
<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M216-144q-29.7 0-50.85-21.15Q144-186.3 144-216v-528q0-29.7 21.15-50.85Q186.3-816 216-816h264v72H216v528h528v-264h72v264q0 29.7-21.15 50.85Q773.7-144 744-144H216Zm171-192-51-51 357-357H576v-72h240v240h-72v-117L387-336Z"/></svg>
|
|
9
9
|
`;
|
|
10
10
|
export class TruIconModule {
|
|
11
11
|
constructor(sanitizer, iconRegistry) {
|
|
@@ -23,4 +23,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
23
23
|
exports: []
|
|
24
24
|
}]
|
|
25
25
|
}], ctorParameters: function () { return [{ type: i1.DomSanitizer }, { type: i2.MatIconRegistry }]; } });
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWljb24tbW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9hc3NldHMvdHJ1LWljb24tbW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7OztBQUk3QyxNQUFNLFVBQVUsR0FBRzs7Q0FFbEIsQ0FBQztBQU9GLE1BQU0sT0FBTyxhQUFhO0lBQ3hCLFlBQVksU0FBdUIsRUFBRSxZQUE2QjtRQUNoRSxZQUFZLENBQUMsaUJBQWlCLENBQzVCLFlBQVksRUFDWixTQUFTLENBQUMsdUJBQXVCLENBQUMsVUFBVSxDQUFDLENBQzlDLENBQUM7SUFDSixDQUFDOzswR0FOVSxhQUFhOzJHQUFiLGFBQWEsWUFKZCxZQUFZLEVBQUUsV0FBVzsyR0FJeEIsYUFBYSxZQUpkLFlBQVksRUFBRSxXQUFXOzJGQUl4QixhQUFhO2tCQUx6QixRQUFRO21CQUFDO29CQUNSLE9BQU8sRUFBRSxDQUFDLFlBQVksRUFBRSxXQUFXLENBQUM7b0JBQ3BDLFlBQVksRUFBRSxFQUFFO29CQUNoQixPQUFPLEVBQUUsRUFBRTtpQkFDWiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5nTW9kdWxlIH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcbmltcG9ydCB7IENvbW1vbk1vZHVsZSB9IGZyb20gXCJAYW5ndWxhci9jb21tb25cIjtcbmltcG9ydCB7IEZvcm1zTW9kdWxlIH0gZnJvbSBcIkBhbmd1bGFyL2Zvcm1zXCI7XG5pbXBvcnQgeyBEb21TYW5pdGl6ZXIgfSBmcm9tIFwiQGFuZ3VsYXIvcGxhdGZvcm0tYnJvd3NlclwiO1xuaW1wb3J0IHsgTWF0SWNvblJlZ2lzdHJ5IH0gZnJvbSBcIkBhbmd1bGFyL21hdGVyaWFsL2ljb25cIjtcblxuY29uc3QgR09fVE9fSUNPTiA9IGBcbiAgPHN2ZyB4bWxucz1cImh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnXCIgaGVpZ2h0PVwiMjBcIiB2aWV3Qm94PVwiMCAtOTYwIDk2MCA5NjBcIiB3aWR0aD1cIjIwXCI+PHBhdGggZD1cIk0yMTYtMTQ0cS0yOS43IDAtNTAuODUtMjEuMTVRMTQ0LTE4Ni4zIDE0NC0yMTZ2LTUyOHEwLTI5LjcgMjEuMTUtNTAuODVRMTg2LjMtODE2IDIxNi04MTZoMjY0djcySDIxNnY1MjhoNTI4di0yNjRoNzJ2MjY0cTAgMjkuNy0yMS4xNSA1MC44NVE3NzMuNy0xNDQgNzQ0LTE0NEgyMTZabTE3MS0xOTItNTEtNTEgMzU3LTM1N0g1NzZ2LTcyaDI0MHYyNDBoLTcydi0xMTdMMzg3LTMzNlpcIi8+PC9zdmc+XG5gO1xuXG5ATmdNb2R1bGUoe1xuICBpbXBvcnRzOiBbQ29tbW9uTW9kdWxlLCBGb3Jtc01vZHVsZV0sXG4gIGRlY2xhcmF0aW9uczogW10sXG4gIGV4cG9ydHM6IFtdXG59KVxuZXhwb3J0IGNsYXNzIFRydUljb25Nb2R1bGUge1xuICBjb25zdHJ1Y3RvcihzYW5pdGl6ZXI6IERvbVNhbml0aXplciwgaWNvblJlZ2lzdHJ5OiBNYXRJY29uUmVnaXN0cnkpIHtcbiAgICBpY29uUmVnaXN0cnkuYWRkU3ZnSWNvbkxpdGVyYWwoXG4gICAgICBcImdvLXRvLWljb25cIixcbiAgICAgIHNhbml0aXplci5ieXBhc3NTZWN1cml0eVRydXN0SHRtbChHT19UT19JQ09OKVxuICAgICk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -8,18 +8,23 @@ import * as i0 from "@angular/core";
|
|
|
8
8
|
import * as i1 from "@angular/router";
|
|
9
9
|
import * as i2 from "@angular/common/http";
|
|
10
10
|
import * as i3 from "./tru-auth-cache";
|
|
11
|
+
import * as i4 from "../../../services/tru-app-environment";
|
|
11
12
|
export class TruAuth {
|
|
12
|
-
constructor(router, http, cache, auth) {
|
|
13
|
+
constructor(router, http, cache, environment, auth) {
|
|
13
14
|
this.router = router;
|
|
14
15
|
this.http = http;
|
|
15
16
|
this.cache = cache;
|
|
17
|
+
this.environment = environment;
|
|
16
18
|
this.auth = auth;
|
|
17
19
|
this.loggedIn = new BehaviorSubject(false);
|
|
18
|
-
this.baseUrl =
|
|
20
|
+
this.baseUrl = '';
|
|
21
|
+
if (location.hostname === 'localhost' || location.hostname === '127.0.0.1' || location.hostname === '')
|
|
22
|
+
this.baseUrl = 'https://localhost:44303';
|
|
23
|
+
else
|
|
24
|
+
this.baseUrl = '';
|
|
19
25
|
}
|
|
20
26
|
login(loginRequest) {
|
|
21
27
|
return this.http
|
|
22
|
-
//.post<any>(this.baseUrl + "/auth/Login", loginRequest)
|
|
23
28
|
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/login`, loginRequest)
|
|
24
29
|
.pipe(tap((data) => {
|
|
25
30
|
this.auth.doLoginUser(data);
|
|
@@ -30,9 +35,7 @@ export class TruAuth {
|
|
|
30
35
|
this.doLogoutUser();
|
|
31
36
|
}
|
|
32
37
|
isLoggedIn$() {
|
|
33
|
-
return this.auth.getCurrentUser().pipe(map(() => true),
|
|
34
|
-
//map((user) => !!user),
|
|
35
|
-
catchError(() => of(false)));
|
|
38
|
+
return this.auth.getCurrentUser().pipe(map(() => true), catchError(() => of(false)));
|
|
36
39
|
}
|
|
37
40
|
get isLoggedIn() {
|
|
38
41
|
if (!this.loggedIn.value) {
|
|
@@ -52,15 +55,15 @@ export class TruAuth {
|
|
|
52
55
|
this.auth.doLogoutUser();
|
|
53
56
|
}
|
|
54
57
|
}
|
|
55
|
-
TruAuth.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, deps: [{ token: i1.Router }, { token: i2.HttpClient }, { token: i3.TruAuthCache }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
58
|
+
TruAuth.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, deps: [{ token: i1.Router }, { token: i2.HttpClient }, { token: i3.TruAuthCache }, { token: i4.TruAppEnvironment }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
56
59
|
TruAuth.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, providedIn: "root" });
|
|
57
60
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, decorators: [{
|
|
58
61
|
type: Injectable,
|
|
59
62
|
args: [{
|
|
60
63
|
providedIn: "root",
|
|
61
64
|
}]
|
|
62
|
-
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i2.HttpClient }, { type: i3.TruAuthCache }, { type: undefined, decorators: [{
|
|
65
|
+
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i2.HttpClient }, { type: i3.TruAuthCache }, { type: i4.TruAppEnvironment }, { type: undefined, decorators: [{
|
|
63
66
|
type: Inject,
|
|
64
67
|
args: [TRU_AUTH_STRATEGY]
|
|
65
68
|
}] }]; } });
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWF1dGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NvbXBvbmVudHMvbG9naW4vc2VydmljZXMvdHJ1LWF1dGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHbkQsT0FBTyxFQUFjLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUN0QyxPQUFPLEVBQUUsZUFBZSxFQUFjLE1BQU0sTUFBTSxDQUFDO0FBR25ELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRS9ELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7Ozs7O0FBT3RELE1BQU0sT0FBTyxPQUFPO0lBSWxCLFlBQ1UsTUFBYyxFQUNkLElBQWdCLEVBQ2hCLEtBQW1CLEVBQ25CLFdBQThCLEVBQ0gsSUFBMEI7UUFKckQsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUNkLFNBQUksR0FBSixJQUFJLENBQVk7UUFDaEIsVUFBSyxHQUFMLEtBQUssQ0FBYztRQUNuQixnQkFBVyxHQUFYLFdBQVcsQ0FBbUI7UUFDSCxTQUFJLEdBQUosSUFBSSxDQUFzQjtRQVJ2RCxhQUFRLEdBQUcsSUFBSSxlQUFlLENBQVUsS0FBSyxDQUFDLENBQUM7UUFDL0MsWUFBTyxHQUFXLEVBQUUsQ0FBQztRQVMzQixJQUFJLFFBQVEsQ0FBQyxRQUFRLEtBQUssV0FBVyxJQUFJLFFBQVEsQ0FBQyxRQUFRLEtBQUssV0FBVyxJQUFJLFFBQVEsQ0FBQyxRQUFRLEtBQUssRUFBRTtZQUNwRyxJQUFJLENBQUMsT0FBTyxHQUFHLHlCQUF5QixDQUFDOztZQUV6QyxJQUFJLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztJQUN0QixDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQWlDO1FBQ3JDLE9BQU8sSUFBSSxDQUFDLElBQUk7YUFDYixJQUFJLENBQU0sR0FBRyxJQUFJLENBQUMsT0FBTyxHQUFHLGVBQWUsQ0FBQyxPQUFPLFFBQVEsRUFBRSxZQUFZLENBQUM7YUFDMUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1lBQ2pCLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzVCLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzNCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDUixDQUFDO0lBRUQsTUFBTTtRQUNKLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUN0QixDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQyxJQUFJLENBQ3BDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFDZixVQUFVLENBQUMsR0FBRyxFQUFFLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQzVCLENBQUM7SUFDSixDQUFDO0lBRUQsSUFBSSxVQUFVO1FBQ1osSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFO1lBQ3hCLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQztTQUM1QztRQUNELE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxZQUFZLEVBQUUsQ0FBQztJQUN0QyxDQUFDO0lBRUQsZUFBZTtRQUNiLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztJQUNwQyxDQUFDO0lBRUQsMEJBQTBCO1FBQ3hCLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUNwQixJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUVPLFlBQVk7UUFDbEIsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN0QixJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQzNCLENBQUM7O29HQXhEVSxPQUFPLCtIQVNSLGlCQUFpQjt3R0FUaEIsT0FBTyxjQUZOLE1BQU07MkZBRVAsT0FBTztrQkFIbkIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkI7OzBCQVVJLE1BQU07MkJBQUMsaUJBQWlCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSwgSW5qZWN0IH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcclxuaW1wb3J0IHsgSHR0cENsaWVudCB9IGZyb20gXCJAYW5ndWxhci9jb21tb24vaHR0cFwiO1xyXG5pbXBvcnQgeyBSb3V0ZXIgfSBmcm9tIFwiQGFuZ3VsYXIvcm91dGVyXCI7XHJcbmltcG9ydCB7IE9ic2VydmFibGUsIG9mIH0gZnJvbSBcInJ4anNcIjtcclxuaW1wb3J0IHsgQmVoYXZpb3JTdWJqZWN0LCB0aHJvd0Vycm9yIH0gZnJvbSBcInJ4anNcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aExvZ2luUmVxdWVzdCB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWxvZ2luLXJlcXVlc3RcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aENhY2hlIH0gZnJvbSBcIi4vdHJ1LWF1dGgtY2FjaGVcIjtcclxuaW1wb3J0IHsgVFJVX0FVVEhfU1RSQVRFR1kgfSBmcm9tIFwiLi4vY2xhc3Nlcy90cnUtYXV0aC1jb25maWdcIjtcclxuaW1wb3J0IHsgVHJ1QXV0aFN0cmF0ZWd5IH0gZnJvbSBcIi4uL2NsYXNzZXMvdHJ1LWF1dGgtY29uZmlnXCI7XHJcbmltcG9ydCB7IFRSVV9BVVRIX0NPTkZJRyB9IGZyb20gXCIuLi9jbGFzc2VzL3RydS1hdXRoLWNvbmZpZ1wiO1xyXG5pbXBvcnQgeyB0YXAsIG1hcCwgY2F0Y2hFcnJvciB9IGZyb20gXCJyeGpzL29wZXJhdG9yc1wiO1xyXG5pbXBvcnQgeyBUcnVVc2VyIH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS11c2VyXCI7XHJcbmltcG9ydCB7IFRydUFwcEVudmlyb25tZW50IH0gZnJvbSBcIi4uLy4uLy4uL3NlcnZpY2VzL3RydS1hcHAtZW52aXJvbm1lbnRcIjtcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICBwcm92aWRlZEluOiBcInJvb3RcIixcclxufSlcclxuZXhwb3J0IGNsYXNzIFRydUF1dGgge1xyXG4gIHByaXZhdGUgbG9nZ2VkSW4gPSBuZXcgQmVoYXZpb3JTdWJqZWN0PGJvb2xlYW4+KGZhbHNlKTtcclxuICBwcml2YXRlIGJhc2VVcmw6IHN0cmluZyA9ICcnO1xyXG5cclxuICBjb25zdHJ1Y3RvcihcclxuICAgIHByaXZhdGUgcm91dGVyOiBSb3V0ZXIsXHJcbiAgICBwcml2YXRlIGh0dHA6IEh0dHBDbGllbnQsXHJcbiAgICBwcml2YXRlIGNhY2hlOiBUcnVBdXRoQ2FjaGUsXHJcbiAgICBwcml2YXRlIGVudmlyb25tZW50OiBUcnVBcHBFbnZpcm9ubWVudCxcclxuICAgIEBJbmplY3QoVFJVX0FVVEhfU1RSQVRFR1kpIHByaXZhdGUgYXV0aDogVHJ1QXV0aFN0cmF0ZWd5PGFueT5cclxuICApIHtcclxuICAgIGlmIChsb2NhdGlvbi5ob3N0bmFtZSA9PT0gJ2xvY2FsaG9zdCcgfHwgbG9jYXRpb24uaG9zdG5hbWUgPT09ICcxMjcuMC4wLjEnIHx8IGxvY2F0aW9uLmhvc3RuYW1lID09PSAnJylcclxuICAgICAgdGhpcy5iYXNlVXJsID0gJ2h0dHBzOi8vbG9jYWxob3N0OjQ0MzAzJztcclxuICAgIGVsc2VcclxuICAgICAgdGhpcy5iYXNlVXJsID0gJyc7XHJcbiAgfVxyXG5cclxuICBsb2dpbihsb2dpblJlcXVlc3Q6IFRydUF1dGhMb2dpblJlcXVlc3QpOiBPYnNlcnZhYmxlPFRydVVzZXI+IHtcclxuICAgIHJldHVybiB0aGlzLmh0dHBcclxuICAgICAgLnBvc3Q8YW55PihgJHt0aGlzLmJhc2VVcmx9JHtUUlVfQVVUSF9DT05GSUcuYXV0aFVybH0vbG9naW5gLCBsb2dpblJlcXVlc3QpXHJcbiAgICAgIC5waXBlKHRhcCgoZGF0YSkgPT4ge1xyXG4gICAgICAgIHRoaXMuYXV0aC5kb0xvZ2luVXNlcihkYXRhKTtcclxuICAgICAgICB0aGlzLmxvZ2dlZEluLm5leHQodHJ1ZSk7XHJcbiAgICAgIH0pKTtcclxuICB9XHJcblxyXG4gIGxvZ291dCgpIHtcclxuICAgIHRoaXMuZG9Mb2dvdXRVc2VyKCk7XHJcbiAgfVxyXG5cclxuICBpc0xvZ2dlZEluJCgpOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHtcclxuICAgIHJldHVybiB0aGlzLmF1dGguZ2V0Q3VycmVudFVzZXIoKS5waXBlKFxyXG4gICAgICBtYXAoKCkgPT4gdHJ1ZSksXHJcbiAgICAgIGNhdGNoRXJyb3IoKCkgPT4gb2YoZmFsc2UpKVxyXG4gICAgKTtcclxuICB9XHJcblxyXG4gIGdldCBpc0xvZ2dlZEluKCkge1xyXG4gICAgaWYgKCF0aGlzLmxvZ2dlZEluLnZhbHVlKSB7XHJcbiAgICAgIHRoaXMubG9nZ2VkSW4ubmV4dCh0aGlzLmF1dGguaXNMb2dnZWRJbigpKTtcclxuICAgIH1cclxuICAgIHJldHVybiB0aGlzLmxvZ2dlZEluLmFzT2JzZXJ2YWJsZSgpO1xyXG4gIH1cclxuXHJcbiAgZ2V0Q3VycmVudFVzZXIkKCk6IE9ic2VydmFibGU8VHJ1VXNlciB8IHVuZGVmaW5lZD4ge1xyXG4gICAgcmV0dXJuIHRoaXMuYXV0aC5nZXRDdXJyZW50VXNlcigpO1xyXG4gIH1cclxuXHJcbiAgZG9Mb2dvdXRBbmRSZWRpcmVjdFRvTG9naW4oKSB7XHJcbiAgICB0aGlzLmRvTG9nb3V0VXNlcigpO1xyXG4gICAgdGhpcy5yb3V0ZXIubmF2aWdhdGUoW1wiXCJdKTtcclxuICB9XHJcblxyXG4gIHByaXZhdGUgZG9Mb2dvdXRVc2VyKCkge1xyXG4gICAgdGhpcy5jYWNoZS5wcnVuZUFsbCgpO1xyXG4gICAgdGhpcy5hdXRoLmRvTG9nb3V0VXNlcigpO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -4515,17 +4515,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
4515
4515
|
}] });
|
|
4516
4516
|
|
|
4517
4517
|
class TruAuth {
|
|
4518
|
-
constructor(router, http, cache, auth) {
|
|
4518
|
+
constructor(router, http, cache, environment, auth) {
|
|
4519
4519
|
this.router = router;
|
|
4520
4520
|
this.http = http;
|
|
4521
4521
|
this.cache = cache;
|
|
4522
|
+
this.environment = environment;
|
|
4522
4523
|
this.auth = auth;
|
|
4523
4524
|
this.loggedIn = new BehaviorSubject(false);
|
|
4524
|
-
this.baseUrl =
|
|
4525
|
+
this.baseUrl = '';
|
|
4526
|
+
if (location.hostname === 'localhost' || location.hostname === '127.0.0.1' || location.hostname === '')
|
|
4527
|
+
this.baseUrl = 'https://localhost:44303';
|
|
4528
|
+
else
|
|
4529
|
+
this.baseUrl = '';
|
|
4525
4530
|
}
|
|
4526
4531
|
login(loginRequest) {
|
|
4527
4532
|
return this.http
|
|
4528
|
-
//.post<any>(this.baseUrl + "/auth/Login", loginRequest)
|
|
4529
4533
|
.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/login`, loginRequest)
|
|
4530
4534
|
.pipe(tap((data) => {
|
|
4531
4535
|
this.auth.doLoginUser(data);
|
|
@@ -4536,9 +4540,7 @@ class TruAuth {
|
|
|
4536
4540
|
this.doLogoutUser();
|
|
4537
4541
|
}
|
|
4538
4542
|
isLoggedIn$() {
|
|
4539
|
-
return this.auth.getCurrentUser().pipe(map(() => true),
|
|
4540
|
-
//map((user) => !!user),
|
|
4541
|
-
catchError(() => of(false)));
|
|
4543
|
+
return this.auth.getCurrentUser().pipe(map(() => true), catchError(() => of(false)));
|
|
4542
4544
|
}
|
|
4543
4545
|
get isLoggedIn() {
|
|
4544
4546
|
if (!this.loggedIn.value) {
|
|
@@ -4558,7 +4560,7 @@ class TruAuth {
|
|
|
4558
4560
|
this.auth.doLogoutUser();
|
|
4559
4561
|
}
|
|
4560
4562
|
}
|
|
4561
|
-
TruAuth.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, deps: [{ token: i1$5.Router }, { token: i1$2.HttpClient }, { token: TruAuthCache }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
4563
|
+
TruAuth.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, deps: [{ token: i1$5.Router }, { token: i1$2.HttpClient }, { token: TruAuthCache }, { token: TruAppEnvironment }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
4562
4564
|
TruAuth.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, providedIn: "root" });
|
|
4563
4565
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuth, decorators: [{
|
|
4564
4566
|
type: Injectable,
|
|
@@ -4566,7 +4568,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
4566
4568
|
providedIn: "root",
|
|
4567
4569
|
}]
|
|
4568
4570
|
}], ctorParameters: function () {
|
|
4569
|
-
return [{ type: i1$5.Router }, { type: i1$2.HttpClient }, { type: TruAuthCache }, { type: undefined, decorators: [{
|
|
4571
|
+
return [{ type: i1$5.Router }, { type: i1$2.HttpClient }, { type: TruAuthCache }, { type: TruAppEnvironment }, { type: undefined, decorators: [{
|
|
4570
4572
|
type: Inject,
|
|
4571
4573
|
args: [TRU_AUTH_STRATEGY]
|
|
4572
4574
|
}] }];
|
|
@@ -5552,7 +5554,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
5552
5554
|
}], ctorParameters: function () { return []; } });
|
|
5553
5555
|
|
|
5554
5556
|
const GO_TO_ICON = `
|
|
5555
|
-
<svg xmlns="http://www.w3.org/2000/svg" height="
|
|
5557
|
+
<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M216-144q-29.7 0-50.85-21.15Q144-186.3 144-216v-528q0-29.7 21.15-50.85Q186.3-816 216-816h264v72H216v528h528v-264h72v264q0 29.7-21.15 50.85Q773.7-144 744-144H216Zm171-192-51-51 357-357H576v-72h240v240h-72v-117L387-336Z"/></svg>
|
|
5556
5558
|
`;
|
|
5557
5559
|
class TruIconModule {
|
|
5558
5560
|
constructor(sanitizer, iconRegistry) {
|