zek 17.3.88 → 17.3.92
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/esm2022/lib/services/auth-guard.service.mjs +2 -2
- package/esm2022/lib/services/auth.service.mjs +54 -38
- package/esm2022/lib/services/web.api.mjs +16 -10
- package/fesm2022/zek.mjs +67 -46
- package/fesm2022/zek.mjs.map +1 -1
- package/lib/services/auth.service.d.ts +14 -5
- package/package.json +1 -1
|
@@ -4,10 +4,10 @@ import { AuthService } from './auth.service';
|
|
|
4
4
|
export const zekAuthGuard = (route, state) => {
|
|
5
5
|
const auth = inject(AuthService);
|
|
6
6
|
const router = inject(Router);
|
|
7
|
-
if (!auth.isAuthenticated
|
|
7
|
+
if (!auth.isAuthenticated) {
|
|
8
8
|
router.navigate(['/login'], { queryParams: { returnUrl: state.url } });
|
|
9
9
|
return false;
|
|
10
10
|
}
|
|
11
11
|
return auth.hasDataPermission(route.data);
|
|
12
12
|
};
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1ndWFyZC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvemVrL3NyYy9saWIvc2VydmljZXMvYXV0aC1ndWFyZC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDdkMsT0FBTyxFQUErQyxNQUFNLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFckcsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRzdDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBa0IsQ0FBQyxLQUE2QixFQUFFLEtBQTBCLEVBQUUsRUFBRTtJQUNyRyxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDakMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRTlCLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7UUFDeEIsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsV0FBVyxFQUFFLEVBQUUsU0FBUyxFQUFFLEtBQUssQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDdkUsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUVELE9BQU8sSUFBSSxDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztBQUM5QyxDQUFDLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBpbmplY3QgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgUm91dGVyU3RhdGVTbmFwc2hvdCwgUm91dGVyLCBDYW5BY3RpdmF0ZUZuIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuXHJcbmltcG9ydCB7IEF1dGhTZXJ2aWNlIH0gZnJvbSAnLi9hdXRoLnNlcnZpY2UnO1xyXG5cclxuXHJcbmV4cG9ydCBjb25zdCB6ZWtBdXRoR3VhcmQ6IENhbkFjdGl2YXRlRm4gPSAocm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIHN0YXRlOiBSb3V0ZXJTdGF0ZVNuYXBzaG90KSA9PiB7XHJcbiAgICBjb25zdCBhdXRoID0gaW5qZWN0KEF1dGhTZXJ2aWNlKTtcclxuICAgIGNvbnN0IHJvdXRlciA9IGluamVjdChSb3V0ZXIpO1xyXG5cclxuICAgIGlmICghYXV0aC5pc0F1dGhlbnRpY2F0ZWQpIHtcclxuICAgICAgICByb3V0ZXIubmF2aWdhdGUoWycvbG9naW4nXSwgeyBxdWVyeVBhcmFtczogeyByZXR1cm5Vcmw6IHN0YXRlLnVybCB9IH0pO1xyXG4gICAgICAgIHJldHVybiBmYWxzZTtcclxuICAgIH1cclxuXHJcbiAgICByZXR1cm4gYXV0aC5oYXNEYXRhUGVybWlzc2lvbihyb3V0ZS5kYXRhKTtcclxufSJdfQ==
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Injectable, } from '@angular/core';
|
|
2
2
|
import { BehaviorSubject, Subject } from 'rxjs';
|
|
3
|
-
import {
|
|
3
|
+
import { DateHelper, ObjectHelper, StorageHelper } from '../utils';
|
|
4
4
|
import { BitwiseHelper } from '../utils/bitwise-helper';
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
6
|
export class AuthService {
|
|
7
7
|
constructor() {
|
|
8
8
|
this._isInitialized = false;
|
|
9
|
-
this.
|
|
9
|
+
this._auth = false;
|
|
10
10
|
this._user = null;
|
|
11
11
|
}
|
|
12
12
|
static { this.USER_KEY = 'user'; }
|
|
@@ -14,20 +14,27 @@ export class AuthService {
|
|
|
14
14
|
get user() {
|
|
15
15
|
if (!this._isInitialized) {
|
|
16
16
|
const user = StorageHelper.get(AuthService.USER_KEY);
|
|
17
|
-
|
|
18
|
-
user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;
|
|
19
|
-
user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
|
|
20
|
-
user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
|
|
21
|
-
if (Array.isArray(user.roles)) {
|
|
22
|
-
user.roles = user.roles.map(function (e) { return e ? e.toUpperCase() : e; });
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
this._user = user;
|
|
26
|
-
this._isInitialized = true;
|
|
27
|
-
this._starRefreshTokenTimer();
|
|
17
|
+
this._init(user);
|
|
28
18
|
}
|
|
29
19
|
return this._user;
|
|
30
20
|
}
|
|
21
|
+
/**
|
|
22
|
+
* Inits user (parses fields and starts refresh token timer if needed)
|
|
23
|
+
* @param user user from json or storage
|
|
24
|
+
*/
|
|
25
|
+
_init(user) {
|
|
26
|
+
if (user) {
|
|
27
|
+
//convert string to specified types
|
|
28
|
+
user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
|
|
29
|
+
user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
|
|
30
|
+
if (Array.isArray(user.roles)) {
|
|
31
|
+
user.roles = user.roles.map(function (e) { return e ? e.toUpperCase() : e; });
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
this._user = user;
|
|
35
|
+
this._isInitialized = true;
|
|
36
|
+
this._starRefreshTokenTimer();
|
|
37
|
+
}
|
|
31
38
|
_starRefreshTokenTimer() {
|
|
32
39
|
this._stopRefreshTokenTimer();
|
|
33
40
|
const user = this._user;
|
|
@@ -55,15 +62,24 @@ export class AuthService {
|
|
|
55
62
|
this._onRefreshTokenSubject.next();
|
|
56
63
|
}
|
|
57
64
|
}
|
|
58
|
-
|
|
59
|
-
const expired = this.getExpired()
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
65
|
+
get _isAuthenticated() {
|
|
66
|
+
const expired = this.getExpired();
|
|
67
|
+
return new Date() < expired;
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Dynamic property. gets auth user and checks expired;
|
|
71
|
+
*/
|
|
72
|
+
get isAuthenticated() {
|
|
73
|
+
const newValue = this._isAuthenticated;
|
|
74
|
+
if (this._auth !== newValue) {
|
|
75
|
+
this._auth = newValue;
|
|
64
76
|
//if user is signed in and expired we need to logout (remove from localStorage)
|
|
65
77
|
if (!newValue) {
|
|
66
|
-
this.logout();
|
|
78
|
+
this.logout(); //this executes emitOnSignedIn so we don't need here execute emitOnSignedIn
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
//this line need if you already logged in and refresh page. (System will init user from storage and verify)
|
|
82
|
+
this.emitOnSignedIn();
|
|
67
83
|
}
|
|
68
84
|
return newValue;
|
|
69
85
|
}
|
|
@@ -71,7 +87,7 @@ export class AuthService {
|
|
|
71
87
|
}
|
|
72
88
|
emitOnSignedIn() {
|
|
73
89
|
if (this._onSignedInSubject) {
|
|
74
|
-
this._onSignedInSubject.next(this.
|
|
90
|
+
this._onSignedInSubject.next(this._auth);
|
|
75
91
|
}
|
|
76
92
|
}
|
|
77
93
|
get onSignedIn() {
|
|
@@ -92,29 +108,29 @@ export class AuthService {
|
|
|
92
108
|
throw new Error("onRefreshTokenObservable is undefined");
|
|
93
109
|
return this._onRefreshTokenObservable;
|
|
94
110
|
}
|
|
95
|
-
|
|
111
|
+
_login(user) {
|
|
96
112
|
StorageHelper.set(AuthService.USER_KEY, user);
|
|
97
|
-
this._user = null;
|
|
98
113
|
this._isInitialized = false; //user get method will init user
|
|
99
|
-
this.
|
|
114
|
+
this._init(user);
|
|
115
|
+
this._auth = ObjectHelper.isDefined(user);
|
|
116
|
+
this.emitOnSignedIn();
|
|
117
|
+
}
|
|
118
|
+
login(user) {
|
|
119
|
+
this._login(user);
|
|
100
120
|
}
|
|
101
121
|
logout() {
|
|
102
|
-
this.
|
|
122
|
+
this._login(null);
|
|
103
123
|
}
|
|
104
124
|
getExpired() {
|
|
105
|
-
|
|
106
|
-
if (user) {
|
|
107
|
-
return user.expired;
|
|
108
|
-
}
|
|
109
|
-
return null;
|
|
110
|
-
}
|
|
111
|
-
getRefreshTokenExpired() {
|
|
112
|
-
const user = this.user;
|
|
113
|
-
if (user) {
|
|
114
|
-
return user.refreshTokenTime;
|
|
115
|
-
}
|
|
116
|
-
return null;
|
|
125
|
+
return this.user?.expired ?? new Date(0); // if getExpired is null return min JS date;
|
|
117
126
|
}
|
|
127
|
+
// protected getRefreshTokenExpired(): Date | null | undefined {
|
|
128
|
+
// const user = this.user;
|
|
129
|
+
// if (user) {
|
|
130
|
+
// return user.refreshTokenTime;
|
|
131
|
+
// }
|
|
132
|
+
// return null;
|
|
133
|
+
// }
|
|
118
134
|
// isInRole(allowedRoles: string[]): boolean {
|
|
119
135
|
// if (!allowedRoles || allowedRoles.length === 0) {
|
|
120
136
|
// return true;
|
|
@@ -190,4 +206,4 @@ export class AuthService {
|
|
|
190
206
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuthService, decorators: [{
|
|
191
207
|
type: Injectable
|
|
192
208
|
}] });
|
|
193
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../projects/zek/src/lib/services/auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,GAAG,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;;AAGxD,MAAM,OAAO,WAAW;IADxB;QAEY,mBAAc,GAAG,KAAK,CAAC;QACvB,cAAS,GAAG,KAAK,CAAC;QAClB,UAAK,GAAqB,IAAI,CAAC;KAqO1C;aAnOU,aAAQ,GAAG,MAAM,AAAT,CAAU;IACzB,eAAe;IAEf,IAAI,IAAI;QACJ,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,IAAI,EAAE,CAAC;gBACP,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnF,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;gBACxG,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC;gBAE5I,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAM,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvF,CAAC;YACL,CAAC;YACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAIO,sBAAsB;QAC1B,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,IAAI,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAChC,IAAI,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA,iBAAiB;YAE5E,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;gBACd,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC9B,CAAC;YAED,MAAM,cAAc,GAAG,KAAM,CAAA,CAAA,QAAQ;YACrC,IAAI,OAAO,GAAG,cAAc,EAAE,CAAC;gBAC3B,OAAO,GAAG,cAAc,CAAC;YAC7B,CAAC;YAED,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;gBAC7B,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC9B,CAAC,EAAE,OAAO,CAAC,CAAC;QAChB,CAAC;IACL,CAAC;IACO,sBAAsB;QAC1B,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACpC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;IACD,kBAAkB;QACd,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9B,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;QACvC,CAAC;IACL,CAAC;IAGD,eAAe;QACX,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA,2CAA2C;QAE5F,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,GAAG,OAAO,CAAC;QACtC,IAAI,IAAI,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;YAE1B,IAAI,CAAC,cAAc,EAAE,CAAC;YAEtB,+EAA+E;YAC/E,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,IAAI,CAAC,MAAM,EAAE,CAAC;YAClB,CAAC;YACD,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,cAAc;QACV,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC;IACL,CAAC;IAID,IAAI,UAAU;QACV,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC3B,IAAI,CAAC,kBAAkB,GAAG,IAAI,eAAe,CAAU,KAAK,CAAC,CAAC;YAC9D,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,qBAAqB;YAC3B,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAEzD,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACtC,CAAC;IAKD,IAAI,cAAc;QACd,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC/B,IAAI,CAAC,sBAAsB,GAAG,IAAI,OAAO,EAAQ,CAAC;YAClD,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC;QAChF,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,yBAAyB;YAC/B,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC,yBAAyB,CAAC;IAC1C,CAAC;IAID,KAAK,CAAC,IAAmC;QACrC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC,CAAA,gCAAgC;QAC5D,IAAI,CAAC,eAAe,EAAE,CAAC,CAAA,qDAAqD;IAChF,CAAC;IACD,MAAM;QACF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAIS,UAAU;QAChB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAI,IAAI,EAAE,CAAC;YACP,OAAO,IAAI,CAAC,OAAO,CAAC;QACxB,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,sBAAsB;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAI,IAAI,EAAE,CAAC;YACP,OAAO,IAAI,CAAC,gBAAgB,CAAC;QACjC,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,8CAA8C;IAC9C,wDAAwD;IACxD,uBAAuB;IACvB,QAAQ;IAER,kCAAkC;IAClC,4CAA4C;IAC5C,0CAA0C;IAC1C,wBAAwB;IACxB,QAAQ;IAER,4EAA4E;IAC5E,uBAAuB;IACvB,IAAI;IAGJ,aAAa,CAAC,UAAoD;QAC9D,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,IAAI,KAAgC,CAAC;QACrC,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnE,GAAG,GAAG,CAAC,UAAU,CAAC;QACtB,CAAC,CAAA,wCAAwC;QACzC,IAAI;aACC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACtC,IAAI,CAAC,UAAU,CAAC,GAAG;gBACf,OAAO,IAAI,CAAC;YAEhB,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;YACrB,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAC7B,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAGD,cAAc,CAAC,WAA2B,EAAE,KAAqB;QAC7D,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,MAAM,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;QACvD,IAAI,CAAC,eAAe,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACR,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;gBACzB,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;gBACjC,IAAI,KAAK,EAAE,CAAC;oBACR,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC1D,IAAI,aAAa;wBACb,OAAO,IAAI,CAAC;gBACpB,CAAC;YACL,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;gBACzB,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;gBACjC,IAAI,KAAK;oBACL,OAAO,IAAI,CAAC;YACpB,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAGD,iBAAiB,CAAC,IAAS;QACvB,uDAAuD;QACvD,mCAAmC;QACnC,8CAA8C;QAE9C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAErD,oCAAoC;QACpC,OAAO,aAAa,CAAC;IACzB,CAAC;8GAvOQ,WAAW;kHAAX,WAAW;;2FAAX,WAAW;kBADvB,UAAU","sourcesContent":["import { Injectable, } from '@angular/core';\r\nimport { BehaviorSubject, Observable, Subject } from 'rxjs';\r\nimport { KeyPair, LoginToken, LoginUser } from '../models';\r\nimport { Convert, DateHelper, ObjectHelper, StorageHelper } from '../utils';\r\nimport { BitwiseHelper } from '../utils/bitwise-helper';\r\n\r\n@Injectable()\r\nexport class AuthService {\r\n    private _isInitialized = false;\r\n    private _oldValue = false;\r\n    private _user: LoginUser | null = null;\r\n\r\n    static USER_KEY = 'user';\r\n    // access_token\r\n\r\n    get user() {\r\n        if (!this._isInitialized) {\r\n            const user = StorageHelper.get(AuthService.USER_KEY);\r\n            if (user) {\r\n                user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;\r\n                user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;\r\n                user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;\r\n\r\n                if (Array.isArray(user.roles)) {\r\n                    user.roles = user.roles.map(function (e: any) { return e ? e.toUpperCase() : e; });\r\n                }\r\n            }\r\n            this._user = user;\r\n            this._isInitialized = true;\r\n            this._starRefreshTokenTimer();\r\n        }\r\n        return this._user;\r\n    }\r\n\r\n\r\n    private _timerId: any;\r\n    private _starRefreshTokenTimer() {\r\n        this._stopRefreshTokenTimer();\r\n\r\n        const user = this._user;\r\n        if (user && user.refreshTokenTime) {\r\n            let timeout = user.refreshTokenTime.getTime() - Date.now();// - (60 * 1000);\r\n\r\n            if (timeout < 0) {\r\n                this.emitOnRefreshToken();\r\n            }\r\n\r\n            const minRefreshTime = 60_000//1 min;\r\n            if (timeout < minRefreshTime) {\r\n                timeout = minRefreshTime;\r\n            }\r\n\r\n            this._timerId = setInterval(() => {\r\n                this.emitOnRefreshToken();\r\n            }, timeout);\r\n        }\r\n    }\r\n    private _stopRefreshTokenTimer() {\r\n        if (typeof this._timerId === 'number') {\r\n            clearInterval(this._timerId);\r\n        }\r\n    }\r\n    emitOnRefreshToken() {\r\n        if (this._onRefreshTokenSubject) {\r\n            this._onRefreshTokenSubject.next();\r\n        }\r\n    }\r\n\r\n\r\n    isAuthenticated() {\r\n        const expired = this.getExpired() || new Date(0);// if getExpired is null return min JS date\r\n\r\n        const newValue = new Date() < expired;\r\n        if (this._oldValue !== newValue) {\r\n            this._oldValue = newValue;\r\n\r\n            this.emitOnSignedIn();\r\n\r\n            //if user is signed in and expired we need to logout (remove from localStorage)\r\n            if (!newValue) {\r\n                this.logout();\r\n            }\r\n            return newValue;\r\n        }\r\n        return newValue;\r\n    }\r\n    emitOnSignedIn() {\r\n        if (this._onSignedInSubject) {\r\n            this._onSignedInSubject.next(this._oldValue);\r\n        }\r\n    }\r\n\r\n    private _onSignedInSubject?: BehaviorSubject<boolean>;//BehaviorSubject is for initial firt value = false\r\n    private _onSignedInObservable?: Observable<boolean>;\r\n    get onSignedIn(): Observable<boolean> {\r\n        if (!this._onSignedInSubject) {\r\n            this._onSignedInSubject = new BehaviorSubject<boolean>(false);\r\n            this._onSignedInObservable = this._onSignedInSubject.asObservable();\r\n        }\r\n\r\n        if (!this._onSignedInObservable)\r\n            throw new Error(\"_onExecuteObservable is undefined\");\r\n\r\n        return this._onSignedInObservable;\r\n    }\r\n\r\n\r\n    private _onRefreshTokenSubject?: Subject<void>;\r\n    private _onRefreshTokenObservable?: Observable<void>;\r\n    get onRefreshToken(): Observable<void> {\r\n        if (!this._onRefreshTokenSubject) {\r\n            this._onRefreshTokenSubject = new Subject<void>();\r\n            this._onRefreshTokenObservable = this._onRefreshTokenSubject.asObservable();\r\n        }\r\n\r\n        if (!this._onRefreshTokenObservable)\r\n            throw new Error(\"onRefreshTokenObservable is undefined\");\r\n\r\n        return this._onRefreshTokenObservable;\r\n    }\r\n\r\n\r\n\r\n    login(user: LoginToken | LoginUser | null) {\r\n        StorageHelper.set(AuthService.USER_KEY, user);\r\n        this._user = null;\r\n        this._isInitialized = false;//user get method will init user\r\n        this.isAuthenticated();//this method need to execute subject.next();        \r\n    }\r\n    logout() {\r\n        this.login(null);\r\n    }\r\n\r\n\r\n\r\n    protected getExpired(): Date | null | undefined {\r\n        const user = this.user;\r\n        if (user) {\r\n            return user.expired;\r\n        }\r\n\r\n        return null;\r\n    }\r\n\r\n    protected getRefreshTokenExpired(): Date | null | undefined {\r\n        const user = this.user;\r\n        if (user) {\r\n            return user.refreshTokenTime;\r\n        }\r\n\r\n        return null;\r\n    }\r\n\r\n\r\n    // isInRole(allowedRoles: string[]): boolean {\r\n    //     if (!allowedRoles || allowedRoles.length === 0) {\r\n    //         return true;\r\n    //     }\r\n\r\n    //     const tmp = this.getUser();\r\n    //     const roles = tmp ? tmp.roles : null;\r\n    //     if (!roles || roles.length === 0) {\r\n    //         return false;\r\n    //     }\r\n\r\n    //     let isInRole = allowedRoles.some(role => roles.indexOf(role) !== -1);\r\n    //     return isInRole;\r\n    // }\r\n\r\n\r\n    hasPermission(permission?: KeyPair<number, number> | number | null): boolean {\r\n        if (!permission) {\r\n            return true;\r\n        }\r\n\r\n        let key = 0;\r\n        let value: number | null | undefined;\r\n        if (typeof permission === 'number' || typeof permission === 'string') {\r\n            key = +permission;\r\n        }// else if (Array.isArray(permission)) {\r\n        // }\r\n        else if (typeof permission === 'object') {\r\n            if (!permission.key)\r\n                return true;\r\n\r\n            key = permission.key;\r\n            value = permission.value;\r\n        }\r\n\r\n        return this.hasPermissions([key], value);\r\n    }\r\n\r\n\r\n    hasPermissions(permissions?: Array<number>, value?: number | null): boolean {\r\n        if (!permissions || permissions.length === 0) {\r\n            return true;\r\n        }\r\n\r\n        const user = this.user;\r\n        const userPermissions = user ? user.permissions : null;\r\n        if (!userPermissions) {\r\n            return false;\r\n        }\r\n\r\n        if (value) {\r\n            for (let i = 0; i < permissions.length; i++) {\r\n                const p = permissions[i];\r\n                const found = userPermissions[p];\r\n                if (found) {\r\n                    const hasPermission = BitwiseHelper.hasFlag(found, value);\r\n                    if (hasPermission)\r\n                        return true;\r\n                }\r\n            }\r\n        } else {\r\n            for (let i = 0; i < permissions.length; i++) {\r\n                const p = permissions[i];\r\n                const found = userPermissions[p];\r\n                if (found)\r\n                    return true;\r\n            }\r\n        }\r\n\r\n        return false;\r\n    }\r\n\r\n\r\n    hasDataPermission(data: any) {\r\n        //if (data === undefined || data === null) return true;\r\n        // const allowedRoles = data.roles;\r\n        // let isInRole = this.isInRole(allowedRoles);\r\n\r\n        const permission = data.permission;\r\n\r\n        const hasPermission = this.hasPermission(permission);\r\n\r\n        // return isInRole && hasPermission;\r\n        return hasPermission;\r\n    }\r\n}"]}
|
|
209
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../projects/zek/src/lib/services/auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, } from '@angular/core';\r\nimport { BehaviorSubject, Observable, Subject } from 'rxjs';\r\nimport { KeyPair, LoginToken, LoginUser } from '../models';\r\nimport { Convert, DateHelper, ObjectHelper, StorageHelper } from '../utils';\r\nimport { BitwiseHelper } from '../utils/bitwise-helper';\r\n\r\n@Injectable()\r\nexport class AuthService {\r\n    private _isInitialized = false;\r\n    private _auth = false;\r\n    private _user: LoginUser | null = null;\r\n\r\n    static USER_KEY = 'user';\r\n    // access_token\r\n\r\n    get user() {\r\n        if (!this._isInitialized) {\r\n            const user = StorageHelper.get(AuthService.USER_KEY);\r\n            this._init(user);\r\n        }\r\n        return this._user;\r\n    }\r\n\r\n    /**\r\n     * Inits user (parses fields and starts refresh token timer if needed)\r\n     * @param user user from json or storage\r\n     */\r\n    private _init(user: any) {\r\n        if (user) {\r\n            //convert string to specified types\r\n            user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;\r\n            user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;\r\n\r\n            if (Array.isArray(user.roles)) {\r\n                user.roles = user.roles.map(function (e: any) { return e ? e.toUpperCase() : e; });\r\n            }\r\n        }\r\n        this._user = user;\r\n        this._isInitialized = true;\r\n        this._starRefreshTokenTimer();\r\n    }\r\n\r\n    private _timerId: any;\r\n    private _starRefreshTokenTimer() {\r\n        this._stopRefreshTokenTimer();\r\n\r\n        const user = this._user;\r\n        if (user && user.refreshTokenTime) {\r\n            let timeout = user.refreshTokenTime.getTime() - Date.now();// - (60 * 1000);\r\n\r\n            if (timeout < 0) {\r\n                this.emitOnRefreshToken();\r\n            }\r\n\r\n            const minRefreshTime = 60_000//1 min;\r\n            if (timeout < minRefreshTime) {\r\n                timeout = minRefreshTime;\r\n            }\r\n\r\n            this._timerId = setInterval(() => {\r\n                this.emitOnRefreshToken();\r\n            }, timeout);\r\n        }\r\n    }\r\n    private _stopRefreshTokenTimer() {\r\n        if (typeof this._timerId === 'number') {\r\n            clearInterval(this._timerId);\r\n        }\r\n    }\r\n    emitOnRefreshToken() {\r\n        if (this._onRefreshTokenSubject) {\r\n            this._onRefreshTokenSubject.next();\r\n        }\r\n    }\r\n\r\n\r\n    private get _isAuthenticated() {\r\n        const expired = this.getExpired()\r\n        return new Date() < expired;\r\n    }\r\n    /**\r\n     * Dynamic property. gets auth user and checks expired;\r\n     */\r\n    get isAuthenticated() {\r\n        const newValue = this._isAuthenticated;\r\n        if (this._auth !== newValue) {\r\n            this._auth = newValue;\r\n\r\n\r\n            //if user is signed in and expired we need to logout (remove from localStorage)\r\n            if (!newValue) {\r\n                this.logout();//this executes emitOnSignedIn so we don't need here execute emitOnSignedIn\r\n            }\r\n            else {\r\n                //this line need if you already logged in and refresh page. (System will init user from storage and verify)\r\n                this.emitOnSignedIn();\r\n            }\r\n            return newValue;\r\n        }\r\n        return newValue;\r\n    }\r\n\r\n    emitOnSignedIn() {\r\n        if (this._onSignedInSubject) {\r\n            this._onSignedInSubject.next(this._auth);\r\n        }\r\n    }\r\n\r\n    private _onSignedInSubject?: BehaviorSubject<boolean>;//BehaviorSubject is for initial firt value = false\r\n    private _onSignedInObservable?: Observable<boolean>;\r\n    get onSignedIn(): Observable<boolean> {\r\n        if (!this._onSignedInSubject) {\r\n            this._onSignedInSubject = new BehaviorSubject<boolean>(false);\r\n            this._onSignedInObservable = this._onSignedInSubject.asObservable();\r\n        }\r\n\r\n        if (!this._onSignedInObservable)\r\n            throw new Error(\"_onExecuteObservable is undefined\");\r\n\r\n        return this._onSignedInObservable;\r\n    }\r\n\r\n\r\n    private _onRefreshTokenSubject?: Subject<void>;\r\n    private _onRefreshTokenObservable?: Observable<void>;\r\n    get onRefreshToken(): Observable<void> {\r\n        if (!this._onRefreshTokenSubject) {\r\n            this._onRefreshTokenSubject = new Subject<void>();\r\n            this._onRefreshTokenObservable = this._onRefreshTokenSubject.asObservable();\r\n        }\r\n\r\n        if (!this._onRefreshTokenObservable)\r\n            throw new Error(\"onRefreshTokenObservable is undefined\");\r\n\r\n        return this._onRefreshTokenObservable;\r\n    }\r\n\r\n\r\n\r\n    private _login(user: any) {\r\n        StorageHelper.set(AuthService.USER_KEY, user);\r\n        this._isInitialized = false;//user get method will init user\r\n        this._init(user);\r\n        this._auth = ObjectHelper.isDefined(user);\r\n        this.emitOnSignedIn();\r\n    }\r\n    login(user: LoginToken | LoginUser) {\r\n        this._login(user);\r\n    }\r\n    logout() {\r\n        this._login(null);\r\n    }\r\n\r\n\r\n    protected getExpired() {\r\n        return this.user?.expired ?? new Date(0);// if getExpired is null return min JS date;\r\n    }\r\n\r\n    // protected getRefreshTokenExpired(): Date | null | undefined {\r\n    //     const user = this.user;\r\n    //     if (user) {\r\n    //         return user.refreshTokenTime;\r\n    //     }\r\n\r\n    //     return null;\r\n    // }\r\n\r\n\r\n    // isInRole(allowedRoles: string[]): boolean {\r\n    //     if (!allowedRoles || allowedRoles.length === 0) {\r\n    //         return true;\r\n    //     }\r\n\r\n    //     const tmp = this.getUser();\r\n    //     const roles = tmp ? tmp.roles : null;\r\n    //     if (!roles || roles.length === 0) {\r\n    //         return false;\r\n    //     }\r\n\r\n    //     let isInRole = allowedRoles.some(role => roles.indexOf(role) !== -1);\r\n    //     return isInRole;\r\n    // }\r\n\r\n\r\n    hasPermission(permission?: KeyPair<number, number> | number | null): boolean {\r\n        if (!permission) {\r\n            return true;\r\n        }\r\n\r\n        let key = 0;\r\n        let value: number | null | undefined;\r\n        if (typeof permission === 'number' || typeof permission === 'string') {\r\n            key = +permission;\r\n        }// else if (Array.isArray(permission)) {\r\n        // }\r\n        else if (typeof permission === 'object') {\r\n            if (!permission.key)\r\n                return true;\r\n\r\n            key = permission.key;\r\n            value = permission.value;\r\n        }\r\n\r\n        return this.hasPermissions([key], value);\r\n    }\r\n\r\n\r\n    hasPermissions(permissions?: Array<number>, value?: number | null): boolean {\r\n        if (!permissions || permissions.length === 0) {\r\n            return true;\r\n        }\r\n\r\n        const user = this.user;\r\n        const userPermissions = user ? user.permissions : null;\r\n        if (!userPermissions) {\r\n            return false;\r\n        }\r\n\r\n        if (value) {\r\n            for (let i = 0; i < permissions.length; i++) {\r\n                const p = permissions[i];\r\n                const found = userPermissions[p];\r\n                if (found) {\r\n                    const hasPermission = BitwiseHelper.hasFlag(found, value);\r\n                    if (hasPermission)\r\n                        return true;\r\n                }\r\n            }\r\n        } else {\r\n            for (let i = 0; i < permissions.length; i++) {\r\n                const p = permissions[i];\r\n                const found = userPermissions[p];\r\n                if (found)\r\n                    return true;\r\n            }\r\n        }\r\n\r\n        return false;\r\n    }\r\n\r\n\r\n    hasDataPermission(data: any) {\r\n        //if (data === undefined || data === null) return true;\r\n        // const allowedRoles = data.roles;\r\n        // let isInRole = this.isInRole(allowedRoles);\r\n\r\n        const permission = data.permission;\r\n\r\n        const hasPermission = this.hasPermission(permission);\r\n\r\n        // return isInRole && hasPermission;\r\n        return hasPermission;\r\n    }\r\n}"]}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Injectable, Inject } from '@angular/core';
|
|
2
2
|
import { HttpHeaders, HttpParams /*, HttpErrorResponse*/ } from '@angular/common/http';
|
|
3
3
|
import { API_BASE_URL } from '../tokens';
|
|
4
|
+
import { UrlHelper } from '../utils';
|
|
4
5
|
import * as i0 from "@angular/core";
|
|
5
6
|
import * as i1 from "@angular/common/http";
|
|
6
7
|
import * as i2 from "./auth.service";
|
|
@@ -11,7 +12,8 @@ export class WebApiClient {
|
|
|
11
12
|
this.baseUrl = baseUrl;
|
|
12
13
|
}
|
|
13
14
|
get(url, params) {
|
|
14
|
-
|
|
15
|
+
const combinedUrl = UrlHelper.combine(this.baseUrl, url);
|
|
16
|
+
return this.http.get(combinedUrl, { headers: this.getHeaders(), params: this.toHttpParams(params) });
|
|
15
17
|
/*.catch(catchError(this.handleError(url)))
|
|
16
18
|
.do((res: Response) => {
|
|
17
19
|
// Handle success, maybe display notification
|
|
@@ -24,16 +26,20 @@ export class WebApiClient {
|
|
|
24
26
|
*/
|
|
25
27
|
}
|
|
26
28
|
getString(url, params) {
|
|
27
|
-
|
|
29
|
+
const combinedUrl = UrlHelper.combine(this.baseUrl, url);
|
|
30
|
+
return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'text', params: this.toHttpParams(params) });
|
|
28
31
|
}
|
|
29
32
|
getBytes(url, params) {
|
|
30
|
-
|
|
33
|
+
const combinedUrl = UrlHelper.combine(this.baseUrl, url);
|
|
34
|
+
return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'arraybuffer', params: this.toHttpParams(params) });
|
|
31
35
|
}
|
|
32
36
|
getBlob(url, params) {
|
|
33
|
-
|
|
37
|
+
const combinedUrl = UrlHelper.combine(this.baseUrl, url);
|
|
38
|
+
return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'blob', params: this.toHttpParams(params) });
|
|
34
39
|
}
|
|
35
40
|
postBlob(url, body) {
|
|
36
|
-
|
|
41
|
+
const combinedUrl = UrlHelper.combine(this.baseUrl, url);
|
|
42
|
+
return this.http.post(combinedUrl, body, { headers: this.getHeaders(), responseType: 'blob' });
|
|
37
43
|
}
|
|
38
44
|
toHttpParams(obj) {
|
|
39
45
|
if (!obj)
|
|
@@ -76,26 +82,26 @@ export class WebApiClient {
|
|
|
76
82
|
// return undefined;
|
|
77
83
|
//}
|
|
78
84
|
post(url, body) {
|
|
79
|
-
return this.http.post(this.baseUrl
|
|
85
|
+
return this.http.post(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });
|
|
80
86
|
//.pipe(
|
|
81
87
|
//catchError(this.handleError(url))
|
|
82
88
|
//);
|
|
83
89
|
}
|
|
84
90
|
put(url, body) {
|
|
85
|
-
return this.http.put(this.baseUrl
|
|
91
|
+
return this.http.put(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });
|
|
86
92
|
//.pipe(
|
|
87
93
|
//catchError(this.handleError(url))
|
|
88
94
|
//);
|
|
89
95
|
}
|
|
90
96
|
delete(url, body) {
|
|
91
|
-
return this.http.request('delete', this.baseUrl
|
|
97
|
+
return this.http.request('delete', UrlHelper.combine(this.baseUrl, url), { body, headers: this.getHeaders(body) });
|
|
92
98
|
//return this.http.delete(environment.url + url, { headers: this.getHeaders() });
|
|
93
99
|
//.pipe(
|
|
94
100
|
//catchError(this.handleError(url))
|
|
95
101
|
//);
|
|
96
102
|
}
|
|
97
103
|
patch(url, body) {
|
|
98
|
-
return this.http.patch(this.baseUrl
|
|
104
|
+
return this.http.patch(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });
|
|
99
105
|
}
|
|
100
106
|
getHeaders(body) {
|
|
101
107
|
let httpHeaders = new HttpHeaders();
|
|
@@ -130,4 +136,4 @@ export class CustomHttpParamEncoder {
|
|
|
130
136
|
return decodeURIComponent(value);
|
|
131
137
|
}
|
|
132
138
|
}
|
|
133
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"web.api.js","sourceRoot":"","sources":["../../../../../projects/zek/src/lib/services/web.api.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Inject } from '@angular/core';\r\nimport { HttpClient, HttpHeaders, HttpParams/*, HttpErrorResponse*/ } from '@angular/common/http';\r\nimport { Observable } from 'rxjs';\r\n//import { of } from 'rxjs/observable/of';\r\n//import { catchError } from 'rxjs/operators';\r\n\r\nimport { AuthService } from './auth.service';\r\n//import { deleteNullProperties } from '../utils';\r\n//import { HttpErrorHandler, HandleError } from './http-error-handler.service';\r\nimport { HttpParameterCodec } from '@angular/common/http';\r\nimport { API_BASE_URL } from '../tokens';\r\n\r\nexport interface WebApiConfig {\r\n    baseUrl: string;\r\n}\r\n\r\n@Injectable()\r\nexport class WebApiClient {\r\n    constructor(\r\n        protected readonly http: HttpClient,\r\n        protected readonly auth: AuthService,\r\n        @Inject(API_BASE_URL) private readonly baseUrl: string) {\r\n    }\r\n\r\n    get<T = any>(url: string, params?: any): Observable<T> {\r\n        return this.http.get<T>(this.baseUrl + url, { headers: this.getHeaders(), params: this.toHttpParams(params) });\r\n        /*.catch(catchError(this.handleError(url)))\r\n        .do((res: Response) => {\r\n            // Handle success, maybe display notification\r\n        }, (error: any) => {\r\n            // Handle errors\r\n        })\r\n        .finally(() => {\r\n            // Request completed\r\n        });\r\n    */\r\n    }\r\n\r\n    getString(url: string, params?: object): Observable<string | null> {\r\n        return this.http.get(this.baseUrl + url, { headers: this.getHeaders(), responseType: 'text', params: this.toHttpParams(params) });\r\n    }\r\n    getBytes(url: string, params?: any): Observable<ArrayBuffer> {\r\n        return this.http.get(this.baseUrl + url, { headers: this.getHeaders(), responseType: 'arraybuffer', params: this.toHttpParams(params) });\r\n    }\r\n    getBlob(url: string, params?: any): Observable<Blob> {\r\n        return this.http.get(this.baseUrl + url, { headers: this.getHeaders(), responseType: 'blob', params: this.toHttpParams(params) });\r\n    }\r\n    postBlob(url: string, body: any): Observable<Blob> {\r\n        return this.http.post(this.baseUrl + url, body, { headers: this.getHeaders(), responseType: 'blob' });\r\n    }\r\n\r\n\r\n    protected toHttpParams(obj: any) {\r\n        if (!obj)\r\n            return undefined;\r\n\r\n        let params = new HttpParams({ encoder: new CustomHttpParamEncoder() });\r\n        for (const key of Object.keys(obj)) {\r\n            const field = obj[key];\r\n\r\n            if (field === undefined || field === null || (typeof field === 'string' && field.length === 0))\r\n                continue;\r\n\r\n            const value = field;\r\n            // if (typeof field === 'string' && field.length > 0) {\r\n            //     value = field.replace(/\\+/gi, '%2B');\r\n            // }\r\n\r\n            params = params.append(key, value);\r\n            // if (field instanceof Array) {\r\n            //     field.forEach((item: any) => {\r\n            //         params = params.append(`${key}[]`, item);\r\n            //     });\r\n            // } else {\r\n            //     params = params.append(key, field);\r\n            // }\r\n        }\r\n        return params;\r\n\r\n\r\n        //deleteNullProperties(obj);\r\n        //comment because int[] not sending in c# it send \"1,2,3,4\"\r\n        // return obj\r\n        //     ? Object.getOwnPropertyNames(obj).reduce((p, key) => p.set(key, obj[key]), new HttpParams())\r\n        //     : undefined;\r\n    }\r\n\r\n    //toKeyPairs(obj: any): KeyPair[] | undefined {\r\n    //    if (obj instanceof Object) {\r\n    //        const properties = Object.getOwnPropertyNames(obj);\r\n    //        const result = new Array<KeyPair>();\r\n    //        for (let property of properties) {\r\n    //            const value = obj[property];\r\n    //            result.push({ key: property, value: value });\r\n    //        }\r\n    //        return result;\r\n    //    }\r\n    //    return undefined;\r\n    //}\r\n\r\n    post<T = any>(url: string, body?: any | null): Observable<T> {\r\n        return this.http.post<T>(this.baseUrl + url, body, { headers: this.getHeaders(body) });\r\n        //.pipe(\r\n        //catchError(this.handleError(url))\r\n        //);\r\n    }\r\n    put<T = any>(url: string, body?: any | null): Observable<T> {\r\n        return this.http.put<T>(this.baseUrl + url, body, { headers: this.getHeaders(body) });\r\n        //.pipe(\r\n        //catchError(this.handleError(url))\r\n        //);\r\n    }\r\n    delete(url: string, body?: any | null): Observable<any> {\r\n        return this.http.request('delete', this.baseUrl + url, { body, headers: this.getHeaders(body) });\r\n        //return this.http.delete(environment.url + url, { headers: this.getHeaders() });\r\n        //.pipe(\r\n        //catchError(this.handleError(url))\r\n        //);\r\n    }\r\n    patch<T = any>(url: string, body?: any | null): Observable<T> {\r\n        return this.http.patch<T>(this.baseUrl + url, body, { headers: this.getHeaders(body) });\r\n    }\r\n\r\n\r\n    protected getHeaders(body?: any | null): HttpHeaders {\r\n        let httpHeaders = new HttpHeaders();\r\n        if (!(body instanceof FormData))\r\n            httpHeaders = httpHeaders.set('Content-Type', 'application/json');\r\n        const tmp = this.auth.user;\r\n        const token = tmp ? tmp.token : undefined;\r\n        if (token)\r\n            httpHeaders = httpHeaders.set('Authorization', token);\r\n        return httpHeaders;\r\n    }\r\n\r\n\r\n\r\n    //private getParams(params?: KeyPair[] | null) {\r\n    //    if (!params || params.length === 0) {\r\n    //        return undefined;\r\n    //    }\r\n    //    let httpParams = new HttpParams();\r\n    //    if (params) {\r\n    //        for (let param of params) {\r\n    //            httpParams = httpParams.set(param.key, param.value);\r\n    //        }\r\n    //    }\r\n    //    return httpParams;\r\n    //}\r\n}\r\n\r\n\r\n\r\nexport class CustomHttpParamEncoder implements HttpParameterCodec {\r\n    encodeKey(key: string): string {\r\n        return encodeURIComponent(key);\r\n    }\r\n    encodeValue(value: string): string {\r\n        return encodeURIComponent(value);\r\n    }\r\n    decodeKey(key: string): string {\r\n        return decodeURIComponent(key);\r\n    }\r\n    decodeValue(value: string): string {\r\n        return decodeURIComponent(value);\r\n    }\r\n}"]}
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"web.api.js","sourceRoot":"","sources":["../../../../../projects/zek/src/lib/services/web.api.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Inject } from '@angular/core';\r\nimport { HttpClient, HttpHeaders, HttpParams/*, HttpErrorResponse*/ } from '@angular/common/http';\r\nimport { Observable } from 'rxjs';\r\n//import { of } from 'rxjs/observable/of';\r\n//import { catchError } from 'rxjs/operators';\r\n\r\nimport { AuthService } from './auth.service';\r\n//import { deleteNullProperties } from '../utils';\r\n//import { HttpErrorHandler, HandleError } from './http-error-handler.service';\r\nimport { HttpParameterCodec } from '@angular/common/http';\r\nimport { API_BASE_URL } from '../tokens';\r\nimport { UrlHelper } from '../utils';\r\n\r\nexport interface WebApiConfig {\r\n    baseUrl: string;\r\n}\r\n\r\n@Injectable()\r\nexport class WebApiClient {\r\n    constructor(\r\n        protected readonly http: HttpClient,\r\n        protected readonly auth: AuthService,\r\n        @Inject(API_BASE_URL) private readonly baseUrl: string) {\r\n    }\r\n\r\n    get<T = any>(url: string, params?: any): Observable<T> {\r\n        const combinedUrl = UrlHelper.combine(this.baseUrl, url);\r\n        return this.http.get<T>(combinedUrl, { headers: this.getHeaders(), params: this.toHttpParams(params) });\r\n        /*.catch(catchError(this.handleError(url)))\r\n        .do((res: Response) => {\r\n            // Handle success, maybe display notification\r\n        }, (error: any) => {\r\n            // Handle errors\r\n        })\r\n        .finally(() => {\r\n            // Request completed\r\n        });\r\n    */\r\n    }\r\n\r\n    getString(url: string, params?: object): Observable<string | null> {\r\n        const combinedUrl = UrlHelper.combine(this.baseUrl, url);\r\n        return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'text', params: this.toHttpParams(params) });\r\n    }\r\n    getBytes(url: string, params?: any): Observable<ArrayBuffer> {\r\n        const combinedUrl = UrlHelper.combine(this.baseUrl, url);\r\n        return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'arraybuffer', params: this.toHttpParams(params) });\r\n    }\r\n    getBlob(url: string, params?: any): Observable<Blob> {\r\n        const combinedUrl = UrlHelper.combine(this.baseUrl, url);\r\n        return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'blob', params: this.toHttpParams(params) });\r\n    }\r\n    postBlob(url: string, body: any): Observable<Blob> {\r\n        const combinedUrl = UrlHelper.combine(this.baseUrl, url);\r\n        return this.http.post(combinedUrl, body, { headers: this.getHeaders(), responseType: 'blob' });\r\n    }\r\n\r\n\r\n    protected toHttpParams(obj: any) {\r\n        if (!obj)\r\n            return undefined;\r\n\r\n        let params = new HttpParams({ encoder: new CustomHttpParamEncoder() });\r\n        for (const key of Object.keys(obj)) {\r\n            const field = obj[key];\r\n\r\n            if (field === undefined || field === null || (typeof field === 'string' && field.length === 0))\r\n                continue;\r\n\r\n            const value = field;\r\n            // if (typeof field === 'string' && field.length > 0) {\r\n            //     value = field.replace(/\\+/gi, '%2B');\r\n            // }\r\n\r\n            params = params.append(key, value);\r\n            // if (field instanceof Array) {\r\n            //     field.forEach((item: any) => {\r\n            //         params = params.append(`${key}[]`, item);\r\n            //     });\r\n            // } else {\r\n            //     params = params.append(key, field);\r\n            // }\r\n        }\r\n        return params;\r\n\r\n\r\n        //deleteNullProperties(obj);\r\n        //comment because int[] not sending in c# it send \"1,2,3,4\"\r\n        // return obj\r\n        //     ? Object.getOwnPropertyNames(obj).reduce((p, key) => p.set(key, obj[key]), new HttpParams())\r\n        //     : undefined;\r\n    }\r\n\r\n    //toKeyPairs(obj: any): KeyPair[] | undefined {\r\n    //    if (obj instanceof Object) {\r\n    //        const properties = Object.getOwnPropertyNames(obj);\r\n    //        const result = new Array<KeyPair>();\r\n    //        for (let property of properties) {\r\n    //            const value = obj[property];\r\n    //            result.push({ key: property, value: value });\r\n    //        }\r\n    //        return result;\r\n    //    }\r\n    //    return undefined;\r\n    //}\r\n\r\n    post<T = any>(url: string, body?: any | null): Observable<T> {\r\n        return this.http.post<T>(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });\r\n        //.pipe(\r\n        //catchError(this.handleError(url))\r\n        //);\r\n    }\r\n    put<T = any>(url: string, body?: any | null): Observable<T> {\r\n        return this.http.put<T>(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });\r\n        //.pipe(\r\n        //catchError(this.handleError(url))\r\n        //);\r\n    }\r\n    delete(url: string, body?: any | null): Observable<any> {\r\n        return this.http.request('delete', UrlHelper.combine(this.baseUrl, url), { body, headers: this.getHeaders(body) });\r\n        //return this.http.delete(environment.url + url, { headers: this.getHeaders() });\r\n        //.pipe(\r\n        //catchError(this.handleError(url))\r\n        //);\r\n    }\r\n    patch<T = any>(url: string, body?: any | null): Observable<T> {\r\n        return this.http.patch<T>(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });\r\n    }\r\n\r\n\r\n    protected getHeaders(body?: any | null): HttpHeaders {\r\n        let httpHeaders = new HttpHeaders();\r\n        if (!(body instanceof FormData))\r\n            httpHeaders = httpHeaders.set('Content-Type', 'application/json');\r\n        const tmp = this.auth.user;\r\n        const token = tmp ? tmp.token : undefined;\r\n        if (token)\r\n            httpHeaders = httpHeaders.set('Authorization', token);\r\n        return httpHeaders;\r\n    }\r\n\r\n\r\n\r\n    //private getParams(params?: KeyPair[] | null) {\r\n    //    if (!params || params.length === 0) {\r\n    //        return undefined;\r\n    //    }\r\n    //    let httpParams = new HttpParams();\r\n    //    if (params) {\r\n    //        for (let param of params) {\r\n    //            httpParams = httpParams.set(param.key, param.value);\r\n    //        }\r\n    //    }\r\n    //    return httpParams;\r\n    //}\r\n}\r\n\r\n\r\n\r\nexport class CustomHttpParamEncoder implements HttpParameterCodec {\r\n    encodeKey(key: string): string {\r\n        return encodeURIComponent(key);\r\n    }\r\n    encodeValue(value: string): string {\r\n        return encodeURIComponent(value);\r\n    }\r\n    decodeKey(key: string): string {\r\n        return decodeURIComponent(key);\r\n    }\r\n    decodeValue(value: string): string {\r\n        return decodeURIComponent(value);\r\n    }\r\n}"]}
|
package/fesm2022/zek.mjs
CHANGED
|
@@ -1436,7 +1436,7 @@ class ValidationHelper {
|
|
|
1436
1436
|
class AuthService {
|
|
1437
1437
|
constructor() {
|
|
1438
1438
|
this._isInitialized = false;
|
|
1439
|
-
this.
|
|
1439
|
+
this._auth = false;
|
|
1440
1440
|
this._user = null;
|
|
1441
1441
|
}
|
|
1442
1442
|
static { this.USER_KEY = 'user'; }
|
|
@@ -1444,20 +1444,27 @@ class AuthService {
|
|
|
1444
1444
|
get user() {
|
|
1445
1445
|
if (!this._isInitialized) {
|
|
1446
1446
|
const user = StorageHelper.get(AuthService.USER_KEY);
|
|
1447
|
-
|
|
1448
|
-
user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;
|
|
1449
|
-
user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
|
|
1450
|
-
user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
|
|
1451
|
-
if (Array.isArray(user.roles)) {
|
|
1452
|
-
user.roles = user.roles.map(function (e) { return e ? e.toUpperCase() : e; });
|
|
1453
|
-
}
|
|
1454
|
-
}
|
|
1455
|
-
this._user = user;
|
|
1456
|
-
this._isInitialized = true;
|
|
1457
|
-
this._starRefreshTokenTimer();
|
|
1447
|
+
this._init(user);
|
|
1458
1448
|
}
|
|
1459
1449
|
return this._user;
|
|
1460
1450
|
}
|
|
1451
|
+
/**
|
|
1452
|
+
* Inits user (parses fields and starts refresh token timer if needed)
|
|
1453
|
+
* @param user user from json or storage
|
|
1454
|
+
*/
|
|
1455
|
+
_init(user) {
|
|
1456
|
+
if (user) {
|
|
1457
|
+
//convert string to specified types
|
|
1458
|
+
user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
|
|
1459
|
+
user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
|
|
1460
|
+
if (Array.isArray(user.roles)) {
|
|
1461
|
+
user.roles = user.roles.map(function (e) { return e ? e.toUpperCase() : e; });
|
|
1462
|
+
}
|
|
1463
|
+
}
|
|
1464
|
+
this._user = user;
|
|
1465
|
+
this._isInitialized = true;
|
|
1466
|
+
this._starRefreshTokenTimer();
|
|
1467
|
+
}
|
|
1461
1468
|
_starRefreshTokenTimer() {
|
|
1462
1469
|
this._stopRefreshTokenTimer();
|
|
1463
1470
|
const user = this._user;
|
|
@@ -1485,15 +1492,24 @@ class AuthService {
|
|
|
1485
1492
|
this._onRefreshTokenSubject.next();
|
|
1486
1493
|
}
|
|
1487
1494
|
}
|
|
1488
|
-
|
|
1489
|
-
const expired = this.getExpired()
|
|
1490
|
-
|
|
1491
|
-
|
|
1492
|
-
|
|
1493
|
-
|
|
1495
|
+
get _isAuthenticated() {
|
|
1496
|
+
const expired = this.getExpired();
|
|
1497
|
+
return new Date() < expired;
|
|
1498
|
+
}
|
|
1499
|
+
/**
|
|
1500
|
+
* Dynamic property. gets auth user and checks expired;
|
|
1501
|
+
*/
|
|
1502
|
+
get isAuthenticated() {
|
|
1503
|
+
const newValue = this._isAuthenticated;
|
|
1504
|
+
if (this._auth !== newValue) {
|
|
1505
|
+
this._auth = newValue;
|
|
1494
1506
|
//if user is signed in and expired we need to logout (remove from localStorage)
|
|
1495
1507
|
if (!newValue) {
|
|
1496
|
-
this.logout();
|
|
1508
|
+
this.logout(); //this executes emitOnSignedIn so we don't need here execute emitOnSignedIn
|
|
1509
|
+
}
|
|
1510
|
+
else {
|
|
1511
|
+
//this line need if you already logged in and refresh page. (System will init user from storage and verify)
|
|
1512
|
+
this.emitOnSignedIn();
|
|
1497
1513
|
}
|
|
1498
1514
|
return newValue;
|
|
1499
1515
|
}
|
|
@@ -1501,7 +1517,7 @@ class AuthService {
|
|
|
1501
1517
|
}
|
|
1502
1518
|
emitOnSignedIn() {
|
|
1503
1519
|
if (this._onSignedInSubject) {
|
|
1504
|
-
this._onSignedInSubject.next(this.
|
|
1520
|
+
this._onSignedInSubject.next(this._auth);
|
|
1505
1521
|
}
|
|
1506
1522
|
}
|
|
1507
1523
|
get onSignedIn() {
|
|
@@ -1522,29 +1538,29 @@ class AuthService {
|
|
|
1522
1538
|
throw new Error("onRefreshTokenObservable is undefined");
|
|
1523
1539
|
return this._onRefreshTokenObservable;
|
|
1524
1540
|
}
|
|
1525
|
-
|
|
1541
|
+
_login(user) {
|
|
1526
1542
|
StorageHelper.set(AuthService.USER_KEY, user);
|
|
1527
|
-
this._user = null;
|
|
1528
1543
|
this._isInitialized = false; //user get method will init user
|
|
1529
|
-
this.
|
|
1544
|
+
this._init(user);
|
|
1545
|
+
this._auth = ObjectHelper.isDefined(user);
|
|
1546
|
+
this.emitOnSignedIn();
|
|
1547
|
+
}
|
|
1548
|
+
login(user) {
|
|
1549
|
+
this._login(user);
|
|
1530
1550
|
}
|
|
1531
1551
|
logout() {
|
|
1532
|
-
this.
|
|
1552
|
+
this._login(null);
|
|
1533
1553
|
}
|
|
1534
1554
|
getExpired() {
|
|
1535
|
-
|
|
1536
|
-
if (user) {
|
|
1537
|
-
return user.expired;
|
|
1538
|
-
}
|
|
1539
|
-
return null;
|
|
1540
|
-
}
|
|
1541
|
-
getRefreshTokenExpired() {
|
|
1542
|
-
const user = this.user;
|
|
1543
|
-
if (user) {
|
|
1544
|
-
return user.refreshTokenTime;
|
|
1545
|
-
}
|
|
1546
|
-
return null;
|
|
1555
|
+
return this.user?.expired ?? new Date(0); // if getExpired is null return min JS date;
|
|
1547
1556
|
}
|
|
1557
|
+
// protected getRefreshTokenExpired(): Date | null | undefined {
|
|
1558
|
+
// const user = this.user;
|
|
1559
|
+
// if (user) {
|
|
1560
|
+
// return user.refreshTokenTime;
|
|
1561
|
+
// }
|
|
1562
|
+
// return null;
|
|
1563
|
+
// }
|
|
1548
1564
|
// isInRole(allowedRoles: string[]): boolean {
|
|
1549
1565
|
// if (!allowedRoles || allowedRoles.length === 0) {
|
|
1550
1566
|
// return true;
|
|
@@ -1624,7 +1640,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImpor
|
|
|
1624
1640
|
const zekAuthGuard = (route, state) => {
|
|
1625
1641
|
const auth = inject(AuthService);
|
|
1626
1642
|
const router = inject(Router);
|
|
1627
|
-
if (!auth.isAuthenticated
|
|
1643
|
+
if (!auth.isAuthenticated) {
|
|
1628
1644
|
router.navigate(['/login'], { queryParams: { returnUrl: state.url } });
|
|
1629
1645
|
return false;
|
|
1630
1646
|
}
|
|
@@ -1934,7 +1950,8 @@ class WebApiClient {
|
|
|
1934
1950
|
this.baseUrl = baseUrl;
|
|
1935
1951
|
}
|
|
1936
1952
|
get(url, params) {
|
|
1937
|
-
|
|
1953
|
+
const combinedUrl = UrlHelper.combine(this.baseUrl, url);
|
|
1954
|
+
return this.http.get(combinedUrl, { headers: this.getHeaders(), params: this.toHttpParams(params) });
|
|
1938
1955
|
/*.catch(catchError(this.handleError(url)))
|
|
1939
1956
|
.do((res: Response) => {
|
|
1940
1957
|
// Handle success, maybe display notification
|
|
@@ -1947,16 +1964,20 @@ class WebApiClient {
|
|
|
1947
1964
|
*/
|
|
1948
1965
|
}
|
|
1949
1966
|
getString(url, params) {
|
|
1950
|
-
|
|
1967
|
+
const combinedUrl = UrlHelper.combine(this.baseUrl, url);
|
|
1968
|
+
return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'text', params: this.toHttpParams(params) });
|
|
1951
1969
|
}
|
|
1952
1970
|
getBytes(url, params) {
|
|
1953
|
-
|
|
1971
|
+
const combinedUrl = UrlHelper.combine(this.baseUrl, url);
|
|
1972
|
+
return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'arraybuffer', params: this.toHttpParams(params) });
|
|
1954
1973
|
}
|
|
1955
1974
|
getBlob(url, params) {
|
|
1956
|
-
|
|
1975
|
+
const combinedUrl = UrlHelper.combine(this.baseUrl, url);
|
|
1976
|
+
return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'blob', params: this.toHttpParams(params) });
|
|
1957
1977
|
}
|
|
1958
1978
|
postBlob(url, body) {
|
|
1959
|
-
|
|
1979
|
+
const combinedUrl = UrlHelper.combine(this.baseUrl, url);
|
|
1980
|
+
return this.http.post(combinedUrl, body, { headers: this.getHeaders(), responseType: 'blob' });
|
|
1960
1981
|
}
|
|
1961
1982
|
toHttpParams(obj) {
|
|
1962
1983
|
if (!obj)
|
|
@@ -1999,26 +2020,26 @@ class WebApiClient {
|
|
|
1999
2020
|
// return undefined;
|
|
2000
2021
|
//}
|
|
2001
2022
|
post(url, body) {
|
|
2002
|
-
return this.http.post(this.baseUrl
|
|
2023
|
+
return this.http.post(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });
|
|
2003
2024
|
//.pipe(
|
|
2004
2025
|
//catchError(this.handleError(url))
|
|
2005
2026
|
//);
|
|
2006
2027
|
}
|
|
2007
2028
|
put(url, body) {
|
|
2008
|
-
return this.http.put(this.baseUrl
|
|
2029
|
+
return this.http.put(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });
|
|
2009
2030
|
//.pipe(
|
|
2010
2031
|
//catchError(this.handleError(url))
|
|
2011
2032
|
//);
|
|
2012
2033
|
}
|
|
2013
2034
|
delete(url, body) {
|
|
2014
|
-
return this.http.request('delete', this.baseUrl
|
|
2035
|
+
return this.http.request('delete', UrlHelper.combine(this.baseUrl, url), { body, headers: this.getHeaders(body) });
|
|
2015
2036
|
//return this.http.delete(environment.url + url, { headers: this.getHeaders() });
|
|
2016
2037
|
//.pipe(
|
|
2017
2038
|
//catchError(this.handleError(url))
|
|
2018
2039
|
//);
|
|
2019
2040
|
}
|
|
2020
2041
|
patch(url, body) {
|
|
2021
|
-
return this.http.patch(this.baseUrl
|
|
2042
|
+
return this.http.patch(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });
|
|
2022
2043
|
}
|
|
2023
2044
|
getHeaders(body) {
|
|
2024
2045
|
let httpHeaders = new HttpHeaders();
|