@ts-core/angular 15.0.29 → 15.0.31
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/cookie/CookieService.d.ts +1 -0
- package/esm2020/cookie/CookieService.mjs +9 -1
- package/esm2020/login/LoginTokenStorage.mjs +10 -21
- package/fesm2015/ts-core-angular.mjs +17 -19
- package/fesm2015/ts-core-angular.mjs.map +1 -1
- package/fesm2020/ts-core-angular.mjs +17 -19
- package/fesm2020/ts-core-angular.mjs.map +1 -1
- package/login/LoginTokenStorage.d.ts +1 -1
- package/package.json +1 -1
|
@@ -8,6 +8,7 @@ export declare class CookieService extends Cookie.CookieService implements ICook
|
|
|
8
8
|
has(key: string): boolean;
|
|
9
9
|
get(key: string, defaultValue?: string): string;
|
|
10
10
|
getObject<T = any>(key: string, defaultValue?: T): T;
|
|
11
|
+
put(key: string, value: string, options?: CookieOptions): void;
|
|
11
12
|
putObject<T = any>(key: string, value: T, options?: CookieOptions): void;
|
|
12
13
|
update(key: string, value: string, options?: ICookieOptions): void;
|
|
13
14
|
updateObject(key: string, value: Object, options?: ICookieOptions): void;
|
|
@@ -40,6 +40,14 @@ export class CookieService extends Cookie.CookieService {
|
|
|
40
40
|
getObject(key, defaultValue) {
|
|
41
41
|
return this.has(key) ? super.getObject(key) : defaultValue;
|
|
42
42
|
}
|
|
43
|
+
put(key, value, options) {
|
|
44
|
+
if (!_.isNil(value)) {
|
|
45
|
+
super.put(key, value, options);
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
super.remove(key);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
43
51
|
putObject(key, value, options) {
|
|
44
52
|
super.putObject(key, value, options);
|
|
45
53
|
}
|
|
@@ -68,4 +76,4 @@ export class CookieService extends Cookie.CookieService {
|
|
|
68
76
|
return this._document;
|
|
69
77
|
}
|
|
70
78
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29va2llU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb29raWUvQ29va2llU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssQ0FBQyxNQUFNLFFBQVEsQ0FBQztBQUM1QixPQUFPLEtBQUssTUFBTSxNQUFNLFlBQVksQ0FBQztBQUtyQyxNQUFNLE9BQU8sYUFBYyxTQUFRLE1BQU0sQ0FBQyxhQUFhO0lBU25ELDZFQUE2RTtJQUM3RSxFQUFFO0lBQ0YsZUFBZTtJQUNmLEVBQUU7SUFDRiw2RUFBNkU7SUFFN0UsWUFBWSxPQUFzQixFQUFFLFFBQXlCLEVBQUUsSUFBZTtRQUMxRSxLQUFLLENBQUMsRUFBRSxPQUFPLEVBQTJCLENBQUMsQ0FBQztRQUM1QyxJQUFJLENBQUMsU0FBUyxHQUFHLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUM7UUFFbEQsSUFBSSxZQUFZLEdBQUcsRUFBRSxDQUFDO1FBQ3RCLE1BQU0sQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLGNBQWMsRUFBRTtZQUN4QyxHQUFHLEVBQUUsR0FBVyxFQUFFO2dCQUNkLE9BQU8sUUFBUSxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDO1lBQzVFLENBQUM7WUFDRCxHQUFHLEVBQUUsQ0FBQyxLQUFhLEVBQUUsRUFBRTtnQkFDbkIsSUFBSSxRQUFRLENBQUMsaUJBQWlCLEVBQUU7b0JBQzVCLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQztpQkFDaEM7cUJBQU07b0JBQ0gsWUFBWSxHQUFHLEtBQUssQ0FBQztpQkFDeEI7WUFDTCxDQUFDO1lBQ0QsVUFBVSxFQUFFLElBQUk7WUFDaEIsWUFBWSxFQUFFLElBQUk7U0FDckIsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUVELDZFQUE2RTtJQUM3RSxFQUFFO0lBQ0Ysa0JBQWtCO0lBQ2xCLEVBQUU7SUFDRiw2RUFBNkU7SUFFdEUsR0FBRyxDQUFDLEdBQVc7UUFDbEIsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFTSxHQUFHLENBQUMsR0FBVyxFQUFFLFlBQXFCO1FBQ3pDLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDO0lBQ3pELENBQUM7SUFFTSxTQUFTLENBQVUsR0FBVyxFQUFFLFlBQWdCO1FBQ25ELE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUUsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQVMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDO0lBQ3hFLENBQUM7SUFFTSxHQUFHLENBQUMsR0FBVyxFQUFFLEtBQWEsRUFBRSxPQUF1QjtRQUMxRCxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNqQixLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUM7U0FDbEM7YUFBTTtZQUNILEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDckI7SUFDTCxDQUFDO0lBRU0sU0FBUyxDQUFVLEdBQVcsRUFBRSxLQUFRLEVBQUUsT0FBdUI7UUFDcEUsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsS0FBWSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQ2hELENBQUM7SUFFTSxNQUFNLENBQUMsR0FBVyxFQUFFLEtBQWEsRUFBRSxPQUF3QjtRQUM5RCxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNqQixJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUM7U0FDakM7YUFBTTtZQUNILElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDcEI7SUFDTCxDQUFDO0lBRU0sWUFBWSxDQUFDLEdBQVcsRUFBRSxLQUFhLEVBQUUsT0FBd0I7UUFDcEUsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDakIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1NBQ3ZDO2FBQU07WUFDSCxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ3BCO0lBQ0wsQ0FBQztJQUVELDZFQUE2RTtJQUM3RSxFQUFFO0lBQ0Ysc0JBQXNCO0lBQ3RCLEVBQUU7SUFDRiw2RUFBNkU7SUFFN0UsSUFBWSxRQUFRO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQztJQUMxQixDQUFDO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJQ29va2llT3B0aW9ucywgSUNvb2tpZVNlcnZpY2UgfSBmcm9tICdAdHMtY29yZS9mcm9udGVuZCc7XG5pbXBvcnQgKiBhcyBfIGZyb20gJ2xvZGFzaCc7XG5pbXBvcnQgKiBhcyBDb29raWUgZnJvbSAnbmd4LWNvb2tpZSc7XG5pbXBvcnQgeyBDb29raWVPcHRpb25zUHJvdmlkZXIgfSBmcm9tICduZ3gtY29va2llJztcbmltcG9ydCB7IFBsYXRmb3JtU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2UvUGxhdGZvcm1TZXJ2aWNlJztcbmltcG9ydCB7IENvb2tpZU9wdGlvbnMgfSBmcm9tICcuL0Nvb2tpZU9wdGlvbnMnO1xuXG5leHBvcnQgY2xhc3MgQ29va2llU2VydmljZSBleHRlbmRzIENvb2tpZS5Db29raWVTZXJ2aWNlIGltcGxlbWVudHMgSUNvb2tpZVNlcnZpY2Uge1xuICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG4gICAgLy9cbiAgICAvLyBcdFByb3BlcnRpZXNcbiAgICAvL1xuICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cbiAgICBwcml2YXRlIF9kb2N1bWVudDogRG9jdW1lbnQ7XG5cbiAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRDb25zdHJ1Y3RvclxuICAgIC8vXG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cblxuICAgIGNvbnN0cnVjdG9yKG9wdGlvbnM6IENvb2tpZU9wdGlvbnMsIHBsYXRmb3JtOiBQbGF0Zm9ybVNlcnZpY2UsIGl0ZW0/OiBEb2N1bWVudCkge1xuICAgICAgICBzdXBlcih7IG9wdGlvbnMgfSBhcyBDb29raWVPcHRpb25zUHJvdmlkZXIpO1xuICAgICAgICB0aGlzLl9kb2N1bWVudCA9ICFfLmlzTmlsKGl0ZW0pID8gaXRlbSA6IGRvY3VtZW50O1xuXG4gICAgICAgIGxldCBjb29raWVTdHJpbmcgPSAnJztcbiAgICAgICAgT2JqZWN0LmRlZmluZVByb3BlcnR5KHRoaXMsICdjb29raWVTdHJpbmcnLCB7XG4gICAgICAgICAgICBnZXQ6ICgpOiBzdHJpbmcgPT4ge1xuICAgICAgICAgICAgICAgIHJldHVybiBwbGF0Zm9ybS5pc1BsYXRmb3JtQnJvd3NlciA/IHRoaXMuZG9jdW1lbnQuY29va2llIDogY29va2llU3RyaW5nO1xuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIHNldDogKHZhbHVlOiBzdHJpbmcpID0+IHtcbiAgICAgICAgICAgICAgICBpZiAocGxhdGZvcm0uaXNQbGF0Zm9ybUJyb3dzZXIpIHtcbiAgICAgICAgICAgICAgICAgICAgdGhpcy5kb2N1bWVudC5jb29raWUgPSB2YWx1ZTtcbiAgICAgICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICAgICAgICBjb29raWVTdHJpbmcgPSB2YWx1ZTtcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAgZW51bWVyYWJsZTogdHJ1ZSxcbiAgICAgICAgICAgIGNvbmZpZ3VyYWJsZTogdHJ1ZVxuICAgICAgICB9KTtcbiAgICB9XG5cbiAgICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRQdWJsaWMgTWV0aG9kc1xuICAgIC8vXG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cblxuICAgIHB1YmxpYyBoYXMoa2V5OiBzdHJpbmcpOiBib29sZWFuIHtcbiAgICAgICAgcmV0dXJuICFfLmlzTmlsKHN1cGVyLmdldChrZXkpKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgZ2V0KGtleTogc3RyaW5nLCBkZWZhdWx0VmFsdWU/OiBzdHJpbmcpOiBzdHJpbmcge1xuICAgICAgICByZXR1cm4gdGhpcy5oYXMoa2V5KSA/IHN1cGVyLmdldChrZXkpIDogZGVmYXVsdFZhbHVlO1xuICAgIH1cblxuICAgIHB1YmxpYyBnZXRPYmplY3Q8VCA9IGFueT4oa2V5OiBzdHJpbmcsIGRlZmF1bHRWYWx1ZT86IFQpOiBUIHtcbiAgICAgICAgcmV0dXJuIHRoaXMuaGFzKGtleSkgPyAoc3VwZXIuZ2V0T2JqZWN0KGtleSkgYXMgYW55KSA6IGRlZmF1bHRWYWx1ZTtcbiAgICB9XG5cbiAgICBwdWJsaWMgcHV0KGtleTogc3RyaW5nLCB2YWx1ZTogc3RyaW5nLCBvcHRpb25zPzogQ29va2llT3B0aW9ucyk6IHZvaWQge1xuICAgICAgICBpZiAoIV8uaXNOaWwodmFsdWUpKSB7XG4gICAgICAgICAgICBzdXBlci5wdXQoa2V5LCB2YWx1ZSwgb3B0aW9ucyk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICBzdXBlci5yZW1vdmUoa2V5KTtcbiAgICAgICAgfVxuICAgIH1cblxuICAgIHB1YmxpYyBwdXRPYmplY3Q8VCA9IGFueT4oa2V5OiBzdHJpbmcsIHZhbHVlOiBULCBvcHRpb25zPzogQ29va2llT3B0aW9ucyk6IHZvaWQge1xuICAgICAgICBzdXBlci5wdXRPYmplY3Qoa2V5LCB2YWx1ZSBhcyBhbnksIG9wdGlvbnMpO1xuICAgIH1cblxuICAgIHB1YmxpYyB1cGRhdGUoa2V5OiBzdHJpbmcsIHZhbHVlOiBzdHJpbmcsIG9wdGlvbnM/OiBJQ29va2llT3B0aW9ucyk6IHZvaWQge1xuICAgICAgICBpZiAoIV8uaXNOaWwodmFsdWUpKSB7XG4gICAgICAgICAgICB0aGlzLnB1dChrZXksIHZhbHVlLCBvcHRpb25zKTtcbiAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgIHRoaXMucmVtb3ZlKGtleSk7XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBwdWJsaWMgdXBkYXRlT2JqZWN0KGtleTogc3RyaW5nLCB2YWx1ZTogT2JqZWN0LCBvcHRpb25zPzogSUNvb2tpZU9wdGlvbnMpOiB2b2lkIHtcbiAgICAgICAgaWYgKCFfLmlzTmlsKHZhbHVlKSkge1xuICAgICAgICAgICAgdGhpcy5wdXRPYmplY3Qoa2V5LCB2YWx1ZSwgb3B0aW9ucyk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICB0aGlzLnJlbW92ZShrZXkpO1xuICAgICAgICB9XG4gICAgfVxuXG4gICAgLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgICAvL1xuICAgIC8vICBQcml2YXRlIFByb3BlcnRpZXNcbiAgICAvL1xuICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cbiAgICBwcml2YXRlIGdldCBkb2N1bWVudCgpOiBEb2N1bWVudCB7XG4gICAgICAgIHJldHVybiB0aGlzLl9kb2N1bWVudDtcbiAgICB9XG59XG4iXX0=
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { DestroyableContainer } from '@ts-core/common';
|
|
2
|
-
import * as _ from 'lodash';
|
|
3
2
|
export class LoginTokenStorage extends DestroyableContainer {
|
|
4
3
|
//--------------------------------------------------------------------------
|
|
5
4
|
//
|
|
@@ -10,7 +9,6 @@ export class LoginTokenStorage extends DestroyableContainer {
|
|
|
10
9
|
super();
|
|
11
10
|
this.storage = storage;
|
|
12
11
|
this.cookies = cookies;
|
|
13
|
-
console.log(storage.get);
|
|
14
12
|
}
|
|
15
13
|
//--------------------------------------------------------------------------
|
|
16
14
|
//
|
|
@@ -18,28 +16,19 @@ export class LoginTokenStorage extends DestroyableContainer {
|
|
|
18
16
|
//
|
|
19
17
|
//--------------------------------------------------------------------------
|
|
20
18
|
get() {
|
|
21
|
-
|
|
22
|
-
try {
|
|
23
|
-
value = this.storage.get(LoginTokenStorage.TOKEN_KEY);
|
|
24
|
-
}
|
|
25
|
-
catch (error) { }
|
|
26
|
-
return !_.isNil(value) ? value : this.cookies.get(LoginTokenStorage.TOKEN_KEY);
|
|
19
|
+
return this.storage.has(LoginTokenStorage.TOKEN_KEY) ? this.storage.get(LoginTokenStorage.TOKEN_KEY) : this.cookies.get(LoginTokenStorage.TOKEN_KEY);
|
|
27
20
|
}
|
|
28
21
|
save(value) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
finally {
|
|
33
|
-
this.cookies.put(LoginTokenStorage.TOKEN_KEY, value);
|
|
34
|
-
}
|
|
22
|
+
this.storage.set(LoginTokenStorage.TOKEN_KEY, value);
|
|
23
|
+
this.cookies.put(LoginTokenStorage.TOKEN_KEY, value);
|
|
35
24
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
}
|
|
40
|
-
finally {
|
|
41
|
-
this.cookies.remove(LoginTokenStorage.TOKEN_KEY);
|
|
25
|
+
destroy() {
|
|
26
|
+
if (this.isDestroyed) {
|
|
27
|
+
return;
|
|
42
28
|
}
|
|
29
|
+
super.destroy();
|
|
30
|
+
this.storage = null;
|
|
31
|
+
this.cookies = null;
|
|
43
32
|
}
|
|
44
33
|
}
|
|
45
34
|
//--------------------------------------------------------------------------
|
|
@@ -48,4 +37,4 @@ export class LoginTokenStorage extends DestroyableContainer {
|
|
|
48
37
|
//
|
|
49
38
|
//--------------------------------------------------------------------------
|
|
50
39
|
LoginTokenStorage.TOKEN_KEY = 'sid';
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naW5Ub2tlblN0b3JhZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbG9naW4vTG9naW5Ub2tlblN0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFLdkQsTUFBTSxPQUFPLGlCQUFrQixTQUFRLG9CQUFvQjtJQVN2RCw0RUFBNEU7SUFDNUUsRUFBRTtJQUNGLGVBQWU7SUFDZixFQUFFO0lBQ0YsNEVBQTRFO0lBRTVFLFlBQW9CLE9BQXVCLEVBQVUsT0FBc0I7UUFDdkUsS0FBSyxFQUFFLENBQUM7UUFEUSxZQUFPLEdBQVAsT0FBTyxDQUFnQjtRQUFVLFlBQU8sR0FBUCxPQUFPLENBQWU7SUFFM0UsQ0FBQztJQUVELDRFQUE0RTtJQUM1RSxFQUFFO0lBQ0Ysa0JBQWtCO0lBQ2xCLEVBQUU7SUFDRiw0RUFBNEU7SUFFckUsR0FBRztRQUNOLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUN6SixDQUFDO0lBRU0sSUFBSSxDQUFDLEtBQWE7UUFDckIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3JELElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN6RCxDQUFDO0lBRU0sT0FBTztRQUNWLElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRTtZQUNsQixPQUFPO1NBQ1Y7UUFDRCxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDaEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUM7UUFDcEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUM7SUFDeEIsQ0FBQzs7QUF4Q0QsNEVBQTRFO0FBQzVFLEVBQUU7QUFDRixjQUFjO0FBQ2QsRUFBRTtBQUNGLDRFQUE0RTtBQUU5RCwyQkFBUyxHQUFHLEtBQUssQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERlc3Ryb3lhYmxlQ29udGFpbmVyIH0gZnJvbSAnQHRzLWNvcmUvY29tbW9uJztcbmltcG9ydCB7IFN0b3JhZ2VTZXJ2aWNlIH0gZnJvbSAnLi4vc3RvcmFnZS9TdG9yYWdlU2VydmljZSc7XG5pbXBvcnQgeyBDb29raWVTZXJ2aWNlIH0gZnJvbSAnLi4vY29va2llL0Nvb2tpZVNlcnZpY2UnO1xuaW1wb3J0ICogYXMgXyBmcm9tICdsb2Rhc2gnO1xuXG5leHBvcnQgY2xhc3MgTG9naW5Ub2tlblN0b3JhZ2UgZXh0ZW5kcyBEZXN0cm95YWJsZUNvbnRhaW5lciB7XG4gICAgLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRQcm9wZXJ0aWVzXG4gICAgLy9cbiAgICAvLy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cbiAgICBwdWJsaWMgc3RhdGljIFRPS0VOX0tFWSA9ICdzaWQnO1xuXG4gICAgLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRDb25zdHJ1Y3RvclxuICAgIC8vXG4gICAgLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuXG4gICAgY29uc3RydWN0b3IocHJpdmF0ZSBzdG9yYWdlOiBTdG9yYWdlU2VydmljZSwgcHJpdmF0ZSBjb29raWVzOiBDb29raWVTZXJ2aWNlKSB7XG4gICAgICAgIHN1cGVyKCk7XG4gICAgfVxuXG4gICAgLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuICAgIC8vXG4gICAgLy8gXHRQdWJsaWMgTWV0aG9kc1xuICAgIC8vXG4gICAgLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuXG4gICAgcHVibGljIGdldCgpOiBzdHJpbmcge1xuICAgICAgICByZXR1cm4gdGhpcy5zdG9yYWdlLmhhcyhMb2dpblRva2VuU3RvcmFnZS5UT0tFTl9LRVkpID8gdGhpcy5zdG9yYWdlLmdldChMb2dpblRva2VuU3RvcmFnZS5UT0tFTl9LRVkpIDogdGhpcy5jb29raWVzLmdldChMb2dpblRva2VuU3RvcmFnZS5UT0tFTl9LRVkpO1xuICAgIH1cblxuICAgIHB1YmxpYyBzYXZlKHZhbHVlOiBzdHJpbmcpOiB2b2lkIHtcbiAgICAgICAgdGhpcy5zdG9yYWdlLnNldChMb2dpblRva2VuU3RvcmFnZS5UT0tFTl9LRVksIHZhbHVlKTtcbiAgICAgICAgdGhpcy5jb29raWVzLnB1dChMb2dpblRva2VuU3RvcmFnZS5UT0tFTl9LRVksIHZhbHVlKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgZGVzdHJveSgpOiB2b2lkIHtcbiAgICAgICAgaWYgKHRoaXMuaXNEZXN0cm95ZWQpIHtcbiAgICAgICAgICAgIHJldHVybjtcbiAgICAgICAgfVxuICAgICAgICBzdXBlci5kZXN0cm95KCk7XG4gICAgICAgIHRoaXMuc3RvcmFnZSA9IG51bGw7XG4gICAgICAgIHRoaXMuY29va2llcyA9IG51bGw7XG4gICAgfVxufVxuIl19
|
|
@@ -1095,6 +1095,14 @@ class CookieService extends Cookie.CookieService {
|
|
|
1095
1095
|
getObject(key, defaultValue) {
|
|
1096
1096
|
return this.has(key) ? super.getObject(key) : defaultValue;
|
|
1097
1097
|
}
|
|
1098
|
+
put(key, value, options) {
|
|
1099
|
+
if (!_.isNil(value)) {
|
|
1100
|
+
super.put(key, value, options);
|
|
1101
|
+
}
|
|
1102
|
+
else {
|
|
1103
|
+
super.remove(key);
|
|
1104
|
+
}
|
|
1105
|
+
}
|
|
1098
1106
|
putObject(key, value, options) {
|
|
1099
1107
|
super.putObject(key, value, options);
|
|
1100
1108
|
}
|
|
@@ -3328,7 +3336,6 @@ class LoginTokenStorage extends DestroyableContainer {
|
|
|
3328
3336
|
super();
|
|
3329
3337
|
this.storage = storage;
|
|
3330
3338
|
this.cookies = cookies;
|
|
3331
|
-
console.log(storage.get);
|
|
3332
3339
|
}
|
|
3333
3340
|
//--------------------------------------------------------------------------
|
|
3334
3341
|
//
|
|
@@ -3336,28 +3343,19 @@ class LoginTokenStorage extends DestroyableContainer {
|
|
|
3336
3343
|
//
|
|
3337
3344
|
//--------------------------------------------------------------------------
|
|
3338
3345
|
get() {
|
|
3339
|
-
|
|
3340
|
-
try {
|
|
3341
|
-
value = this.storage.get(LoginTokenStorage.TOKEN_KEY);
|
|
3342
|
-
}
|
|
3343
|
-
catch (error) { }
|
|
3344
|
-
return !_.isNil(value) ? value : this.cookies.get(LoginTokenStorage.TOKEN_KEY);
|
|
3346
|
+
return this.storage.has(LoginTokenStorage.TOKEN_KEY) ? this.storage.get(LoginTokenStorage.TOKEN_KEY) : this.cookies.get(LoginTokenStorage.TOKEN_KEY);
|
|
3345
3347
|
}
|
|
3346
3348
|
save(value) {
|
|
3347
|
-
|
|
3348
|
-
|
|
3349
|
-
}
|
|
3350
|
-
finally {
|
|
3351
|
-
this.cookies.put(LoginTokenStorage.TOKEN_KEY, value);
|
|
3352
|
-
}
|
|
3349
|
+
this.storage.set(LoginTokenStorage.TOKEN_KEY, value);
|
|
3350
|
+
this.cookies.put(LoginTokenStorage.TOKEN_KEY, value);
|
|
3353
3351
|
}
|
|
3354
|
-
|
|
3355
|
-
|
|
3356
|
-
|
|
3357
|
-
}
|
|
3358
|
-
finally {
|
|
3359
|
-
this.cookies.remove(LoginTokenStorage.TOKEN_KEY);
|
|
3352
|
+
destroy() {
|
|
3353
|
+
if (this.isDestroyed) {
|
|
3354
|
+
return;
|
|
3360
3355
|
}
|
|
3356
|
+
super.destroy();
|
|
3357
|
+
this.storage = null;
|
|
3358
|
+
this.cookies = null;
|
|
3361
3359
|
}
|
|
3362
3360
|
}
|
|
3363
3361
|
//--------------------------------------------------------------------------
|