@osovitny/anatoly 2.1.10 → 2.1.12
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/bundles/osovitny-anatoly.umd.js +23 -16
- package/bundles/osovitny-anatoly.umd.js.map +1 -1
- package/esm2015/lib/core/services/appcontext.service.js +20 -13
- package/esm2015/lib/ui/components/billing/buyaccess-button.component.js +5 -5
- package/fesm2015/osovitny-anatoly.js +23 -16
- package/fesm2015/osovitny-anatoly.js.map +1 -1
- package/lib/core/services/appcontext.service.d.ts +5 -3
- package/lib/ui/components/billing/buyaccess-button.component.d.ts +2 -2
- package/osovitny-anatoly.metadata.json +1 -1
- package/package.json +1 -1
|
@@ -31,8 +31,15 @@ export class AppContextService extends BaseApiService {
|
|
|
31
31
|
this.successes = [];
|
|
32
32
|
this.baseUrl = '/api/appContext';
|
|
33
33
|
}
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
//Session
|
|
35
|
+
getCurrentFromSession() {
|
|
36
|
+
return this.sessionStorage.getObject(this.storageKeyName);
|
|
37
|
+
}
|
|
38
|
+
setCurrentFromSession(value) {
|
|
39
|
+
this.sessionStorage.setObject(this.storageKeyName, value);
|
|
40
|
+
}
|
|
41
|
+
updateCurrentIfExpired() {
|
|
42
|
+
let context = this.getCurrentFromSession();
|
|
36
43
|
if (!context) {
|
|
37
44
|
return;
|
|
38
45
|
}
|
|
@@ -42,7 +49,7 @@ export class AppContextService extends BaseApiService {
|
|
|
42
49
|
let lastRequested = new Date(context.lastRequested);
|
|
43
50
|
let in2Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 2, 0, 0);
|
|
44
51
|
if (in2Mins.getTime() < now.getTime()) {
|
|
45
|
-
this.
|
|
52
|
+
this.updateCurrent();
|
|
46
53
|
}
|
|
47
54
|
}
|
|
48
55
|
}
|
|
@@ -57,13 +64,12 @@ export class AppContextService extends BaseApiService {
|
|
|
57
64
|
this.successes = [];
|
|
58
65
|
this.subscription.unsubscribe();
|
|
59
66
|
this.subscription = null;
|
|
60
|
-
this.current = null;
|
|
61
67
|
}
|
|
62
68
|
getCurrent(success = null, getCachedIfExist = true) {
|
|
63
|
-
let
|
|
64
|
-
if (getCachedIfExist &&
|
|
69
|
+
let context = this.getCurrentFromSession();
|
|
70
|
+
if (getCachedIfExist && context != null) {
|
|
65
71
|
if (success) {
|
|
66
|
-
success(
|
|
72
|
+
success(context);
|
|
67
73
|
}
|
|
68
74
|
return;
|
|
69
75
|
}
|
|
@@ -80,10 +86,10 @@ export class AppContextService extends BaseApiService {
|
|
|
80
86
|
}, (e) => {
|
|
81
87
|
});
|
|
82
88
|
}
|
|
83
|
-
|
|
89
|
+
updateCurrent(success = null) {
|
|
84
90
|
this.getCurrent(success, false);
|
|
85
91
|
}
|
|
86
|
-
|
|
92
|
+
clearCurrent() {
|
|
87
93
|
this.sessionStorage.remove(this.storageKeyName);
|
|
88
94
|
}
|
|
89
95
|
isUserSignedIn() {
|
|
@@ -92,13 +98,14 @@ export class AppContextService extends BaseApiService {
|
|
|
92
98
|
isUserAdmin() {
|
|
93
99
|
return ContextInitState.isUserAdmin;
|
|
94
100
|
}
|
|
101
|
+
//Properties
|
|
95
102
|
//current
|
|
96
103
|
get current() {
|
|
97
|
-
this.
|
|
98
|
-
return this.
|
|
104
|
+
this.updateCurrentIfExpired();
|
|
105
|
+
return this.getCurrentFromSession();
|
|
99
106
|
}
|
|
100
107
|
set current(value) {
|
|
101
|
-
this.
|
|
108
|
+
this.setCurrentFromSession(value);
|
|
102
109
|
}
|
|
103
110
|
}
|
|
104
111
|
AppContextService.decorators = [
|
|
@@ -108,4 +115,4 @@ AppContextService.ctorParameters = () => [
|
|
|
108
115
|
{ type: HttpClient },
|
|
109
116
|
{ type: SessionStorageService }
|
|
110
117
|
];
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"appcontext.service.js","sourceRoot":"","sources":["../../../../../../projects/anatoly/src/lib/core/services/appcontext.service.ts"],"names":[],"mappings":"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","sourcesContent":["/*\r\n<file>\r\n  Project:\r\n    @osovitny/anatoly\r\n\r\n  Authors:\r\n    Vadim Osovitny\r\n    Anatoly Osovitny\r\n\r\n  Created:\r\n    13 Nov 2017\r\n\r\n  Copyright (c) 2016-2021 Osovitny Inc. All rights reserved.\r\n</file>\r\n*/\r\n\r\n// Node\r\nimport { Injectable } from '@angular/core';\r\nimport { HttpClient } from '@angular/common/http';\r\nimport { Subscription } from 'rxjs';\r\n\r\n// App\r\nimport { ContextInitState } from '../consts/settings';\r\nimport { BaseApiService } from '../../data/base/base-api.service';\r\nimport { SessionStorageService } from './web-storage.service'\r\n\r\n@Injectable()\r\nexport class AppContextService extends BaseApiService {\r\n  //Consts\r\n  private storageKeyName = 'appContext';\r\n\r\n  private subscription: Subscription = null;\r\n  private successes = [];  \r\n\r\n  constructor(\r\n    protected http: HttpClient, \r\n    private sessionStorage: SessionStorageService) {\r\n    super(http);\r\n    this.baseUrl = '/api/appContext';\r\n  }\r\n\r\n  //Session\r\n  private getCurrentFromSession() {\r\n    return this.sessionStorage.getObject(this.storageKeyName);\r\n  }\r\n\r\n  public setCurrentFromSession(value: any) {\r\n    this.sessionStorage.setObject(this.storageKeyName, value);\r\n  }\r\n\r\n  private updateCurrentIfExpired() {\r\n    let context = this.getCurrentFromSession();\r\n\r\n    if (!context) {\r\n      return;\r\n    }\r\n\r\n    let lu = context.lastRequested;\r\n\r\n    if (lu) {\r\n      let now = new Date();\r\n      let lastRequested = new Date(context.lastRequested);\r\n      let in2Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(),\r\n        lastRequested.getHours(), lastRequested.getMinutes() + 2, 0, 0);\r\n\r\n      if (in2Mins.getTime() < now.getTime()) {\r\n        this.updateCurrent();\r\n      }\r\n    }    \r\n  }\r\n\r\n  private dataReceived(data) {\r\n    this.current = data;\r\n\r\n    for (let i = 0; i < this.successes.length; i++) {\r\n      let success = this.successes[i];\r\n      if (success) {\r\n        success(data);\r\n      }      \r\n    }\r\n\r\n    this.successes = [];\r\n    this.subscription.unsubscribe();\r\n    this.subscription = null;\r\n  }\r\n\r\n  getCurrent(success: Function = null, getCachedIfExist: boolean = true) {\r\n    let context = this.getCurrentFromSession();\r\n\r\n    if (getCachedIfExist && context != null) {    \r\n      if (success) {\r\n        success(context);\r\n      } \r\n\r\n      return;      \r\n    }\r\n\r\n    if (success) {\r\n      this.successes.push(success);\r\n    }    \r\n\r\n    if (this.subscription != null) {\r\n      return;\r\n    }\r\n\r\n    let now = new Date();\r\n    console.log('Requesting a new AppContext at ' + now);\r\n\r\n    this.subscription = this.get('getCurrentContext', null).subscribe(\r\n      (data) => {\r\n        this.dataReceived(data);\r\n      },\r\n      (e) => {\r\n      }\r\n    );\r\n  }\r\n\r\n  updateCurrent(success: Function = null) {\r\n    this.getCurrent(success, false);\r\n  }\r\n\r\n  clearCurrent() {\r\n    this.sessionStorage.remove(this.storageKeyName);\r\n  }\r\n\r\n  isUserSignedIn() {\r\n    return ContextInitState.isUserSignedIn;\r\n  }\r\n\r\n  isUserAdmin() {\r\n    return ContextInitState.isUserAdmin;\r\n  }\r\n\r\n  //Properties\r\n  //current\r\n  public get current() {\r\n    this.updateCurrentIfExpired();\r\n    return this.getCurrentFromSession();\r\n  }\r\n  public set current(value: any) {\r\n    this.setCurrentFromSession(value);\r\n  }\r\n}\r\n"]}
|
|
@@ -20,8 +20,8 @@ import { AppContextService } from '../../../core/services/appcontext.service';
|
|
|
20
20
|
import { BillingApiService } from '../../../data/services/billing-api.service';
|
|
21
21
|
import { Alerts } from '../../../core/notifications/alerts';
|
|
22
22
|
export class BuyAccessButtonComponent {
|
|
23
|
-
constructor(
|
|
24
|
-
this.
|
|
23
|
+
constructor(appContext, api) {
|
|
24
|
+
this.appContext = appContext;
|
|
25
25
|
this.api = api;
|
|
26
26
|
this.contextUpdated = false;
|
|
27
27
|
this.isUserSignedIn = false;
|
|
@@ -29,11 +29,11 @@ export class BuyAccessButtonComponent {
|
|
|
29
29
|
this.currentPlanTitle = '';
|
|
30
30
|
}
|
|
31
31
|
ngOnInit() {
|
|
32
|
-
if (!this.
|
|
32
|
+
if (!this.appContext.isUserSignedIn()) {
|
|
33
33
|
this.contextUpdated = true;
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
|
-
this.
|
|
36
|
+
this.appContext.getCurrent((current) => {
|
|
37
37
|
this.isUserSignedIn = current.isUserSignedIn;
|
|
38
38
|
if (this.isUserSignedIn) {
|
|
39
39
|
this.currentPlan = current.account.billingPlan;
|
|
@@ -68,4 +68,4 @@ BuyAccessButtonComponent.propDecorators = {
|
|
|
68
68
|
plan: [{ type: Input }],
|
|
69
69
|
plantitle: [{ type: Input }]
|
|
70
70
|
};
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnV5YWNjZXNzLWJ1dHRvbi5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmF0b2x5L3NyYy9saWIvdWkvY29tcG9uZW50cy9iaWxsaW5nL2J1eWFjY2Vzcy1idXR0b24uY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7OztFQWNFO0FBRUYsT0FBTztBQUNQLE9BQU8sRUFBQyxTQUFTLEVBQUUsS0FBSyxFQUFTLE1BQU0sZUFBZSxDQUFDO0FBRXZELE1BQU07QUFDTixPQUFPLEVBQUMsaUJBQWlCLEVBQUMsTUFBTSwyQ0FBMkMsQ0FBQztBQUM1RSxPQUFPLEVBQUMsaUJBQWlCLEVBQUMsTUFBTSw0Q0FBNEMsQ0FBQztBQUM3RSxPQUFPLEVBQUMsTUFBTSxFQUFDLE1BQU0sb0NBQW9DLENBQUM7QUFNMUQsTUFBTSxPQUFPLHdCQUF3QjtJQVNuQyxZQUNVLFVBQTZCLEVBQzdCLEdBQXNCO1FBRHRCLGVBQVUsR0FBVixVQUFVLENBQW1CO1FBQzdCLFFBQUcsR0FBSCxHQUFHLENBQW1CO1FBVnpCLG1CQUFjLEdBQUcsS0FBSyxDQUFDO1FBQ3ZCLG1CQUFjLEdBQUcsS0FBSyxDQUFDO1FBQ3ZCLGdCQUFXLEdBQUcsQ0FBQyxDQUFDO1FBQ2hCLHFCQUFnQixHQUFHLEVBQUUsQ0FBQztJQVU3QixDQUFDO0lBRUQsUUFBUTtRQUNOLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLGNBQWMsRUFBRSxFQUFFO1lBQ3JDLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDO1lBQzNCLE9BQU87U0FDUjtRQUVELElBQUksQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUU7WUFDckMsSUFBSSxDQUFDLGNBQWMsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDO1lBRTdDLElBQUksSUFBSSxDQUFDLGNBQWMsRUFBRTtnQkFDdkIsSUFBSSxDQUFDLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQztnQkFDL0MsSUFBSSxDQUFDLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsbUJBQW1CLENBQUM7YUFDN0Q7WUFFRCxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksQ0FBQztRQUM3QixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxTQUFTO1FBQ1AsTUFBTSxJQUFJLEdBQUcsbUJBQW1CLElBQUksQ0FBQyxTQUFTLEdBQUcsQ0FBQztRQUNsRCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUM7UUFFbEIsTUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixFQUFFLFFBQVEsRUFBRSxHQUFHLEVBQUU7WUFDeEUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUU7Z0JBQ2pDLE1BQU0sQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBQyxHQUFHLEVBQUU7b0JBQzlDLE1BQWMsQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUM7Z0JBQ3BDLENBQUMsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7OztZQWpERixTQUFTLFNBQUM7Z0JBQ1QsUUFBUSxFQUFFLDBCQUEwQjtnQkFDcEMsNGlCQUFnRDthQUNqRDs7O1lBUE8saUJBQWlCO1lBQ2pCLGlCQUFpQjs7O21CQWF0QixLQUFLO3dCQUNMLEtBQUsiLCJzb3VyY2VzQ29udGVudCI6WyIvKlxyXG48ZmlsZT5cclxuICBQcm9qZWN0OlxyXG4gICAgQG9zb3ZpdG55L2FuYXRvbHlcclxuXHJcbiAgQXV0aG9yczpcclxuICAgIFZhZGltIE9zb3ZpdG55XHJcbiAgICBBbmF0b2x5IE9zb3ZpdG55XHJcblxyXG4gIENyZWF0ZWQ6XHJcbiAgICAxNCBBdWcgMjAxOFxyXG5cclxuICBDb3B5cmlnaHQgKGMpIDIwMTYtMjAyMSBPc292aXRueSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuXHJcbjwvZmlsZT5cclxuKi9cclxuXHJcbi8vIE5vZGVcclxuaW1wb3J0IHtDb21wb25lbnQsIElucHV0LCBPbkluaXR9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5cclxuLy8gQXBwXHJcbmltcG9ydCB7QXBwQ29udGV4dFNlcnZpY2V9IGZyb20gJy4uLy4uLy4uL2NvcmUvc2VydmljZXMvYXBwY29udGV4dC5zZXJ2aWNlJztcclxuaW1wb3J0IHtCaWxsaW5nQXBpU2VydmljZX0gZnJvbSAnLi4vLi4vLi4vZGF0YS9zZXJ2aWNlcy9iaWxsaW5nLWFwaS5zZXJ2aWNlJztcclxuaW1wb3J0IHtBbGVydHN9IGZyb20gJy4uLy4uLy4uL2NvcmUvbm90aWZpY2F0aW9ucy9hbGVydHMnO1xyXG5cclxuQENvbXBvbmVudCh7XHJcbiAgc2VsZWN0b3I6ICdhbmF0b2x5LWJ1eWFjY2Vzcy1idXR0b24nLFxyXG4gIHRlbXBsYXRlVXJsOiAnLi9idXlhY2Nlc3MtYnV0dG9uLmNvbXBvbmVudC5odG1sJyxcclxufSlcclxuZXhwb3J0IGNsYXNzIEJ1eUFjY2Vzc0J1dHRvbkNvbXBvbmVudCBpbXBsZW1lbnRzIE9uSW5pdCB7XHJcbiAgcHVibGljIGNvbnRleHRVcGRhdGVkID0gZmFsc2U7XHJcbiAgcHVibGljIGlzVXNlclNpZ25lZEluID0gZmFsc2U7XHJcbiAgcHVibGljIGN1cnJlbnRQbGFuID0gMDtcclxuICBwdWJsaWMgY3VycmVudFBsYW5UaXRsZSA9ICcnO1xyXG5cclxuICBASW5wdXQoKSBwbGFuOiBudW1iZXI7XHJcbiAgQElucHV0KCkgcGxhbnRpdGxlOiBzdHJpbmc7XHJcblxyXG4gIGNvbnN0cnVjdG9yKFxyXG4gICAgcHJpdmF0ZSBhcHBDb250ZXh0OiBBcHBDb250ZXh0U2VydmljZSxcclxuICAgIHByaXZhdGUgYXBpOiBCaWxsaW5nQXBpU2VydmljZVxyXG4gICkge1xyXG5cclxuICB9XHJcblxyXG4gIG5nT25Jbml0KCkge1xyXG4gICAgaWYgKCF0aGlzLmFwcENvbnRleHQuaXNVc2VyU2lnbmVkSW4oKSkge1xyXG4gICAgICB0aGlzLmNvbnRleHRVcGRhdGVkID0gdHJ1ZTtcclxuICAgICAgcmV0dXJuO1xyXG4gICAgfVxyXG5cclxuICAgIHRoaXMuYXBwQ29udGV4dC5nZXRDdXJyZW50KChjdXJyZW50KSA9PiB7XHJcbiAgICAgIHRoaXMuaXNVc2VyU2lnbmVkSW4gPSBjdXJyZW50LmlzVXNlclNpZ25lZEluO1xyXG5cclxuICAgICAgaWYgKHRoaXMuaXNVc2VyU2lnbmVkSW4pIHtcclxuICAgICAgICB0aGlzLmN1cnJlbnRQbGFuID0gY3VycmVudC5hY2NvdW50LmJpbGxpbmdQbGFuO1xyXG4gICAgICAgIHRoaXMuY3VycmVudFBsYW5UaXRsZSA9IGN1cnJlbnQuYWNjb3VudC5iaWxsaW5nUGxhbkFzU3RyaW5nO1xyXG4gICAgICB9XHJcblxyXG4gICAgICB0aGlzLmNvbnRleHRVcGRhdGVkID0gdHJ1ZTtcclxuICAgIH0pO1xyXG4gIH1cclxuXHJcbiAgb25CdXlQbGFuKCkge1xyXG4gICAgY29uc3QgdGV4dCA9IGBSZXF1ZXN0ZWQgcGxhbjogJHt0aGlzLnBsYW50aXRsZX0gYDtcclxuICAgIGNvbnN0IHRoYXQgPSB0aGlzO1xyXG5cclxuICAgIEFsZXJ0cy5hcmVZb3VTdXJlKHRleHQsICdCdXlpbmcgYWNjZXNzJywgJ0NvbmZpcm0gY2hhbmdlJywgJ0NhbmNlbCcsICgpID0+IHtcclxuICAgICAgdGhhdC5hcGkuYnV5QWNjZXNzKHRoYXQucGxhbiwgKCkgPT4ge1xyXG4gICAgICAgIEFsZXJ0cy5zdWNjZXNzKCdBY2Nlc3MgR3JhbnRlZCcsIG51bGwsIG51bGwsKCkgPT4ge1xyXG4gICAgICAgICAgKHdpbmRvdyBhcyBhbnkpLmxvY2F0aW9uLnJlbG9hZCgpO1xyXG4gICAgICAgIH0pO1xyXG4gICAgICB9KTtcclxuICAgIH0pO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -1351,8 +1351,15 @@ class AppContextService extends BaseApiService {
|
|
|
1351
1351
|
this.successes = [];
|
|
1352
1352
|
this.baseUrl = '/api/appContext';
|
|
1353
1353
|
}
|
|
1354
|
-
|
|
1355
|
-
|
|
1354
|
+
//Session
|
|
1355
|
+
getCurrentFromSession() {
|
|
1356
|
+
return this.sessionStorage.getObject(this.storageKeyName);
|
|
1357
|
+
}
|
|
1358
|
+
setCurrentFromSession(value) {
|
|
1359
|
+
this.sessionStorage.setObject(this.storageKeyName, value);
|
|
1360
|
+
}
|
|
1361
|
+
updateCurrentIfExpired() {
|
|
1362
|
+
let context = this.getCurrentFromSession();
|
|
1356
1363
|
if (!context) {
|
|
1357
1364
|
return;
|
|
1358
1365
|
}
|
|
@@ -1362,7 +1369,7 @@ class AppContextService extends BaseApiService {
|
|
|
1362
1369
|
let lastRequested = new Date(context.lastRequested);
|
|
1363
1370
|
let in2Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 2, 0, 0);
|
|
1364
1371
|
if (in2Mins.getTime() < now.getTime()) {
|
|
1365
|
-
this.
|
|
1372
|
+
this.updateCurrent();
|
|
1366
1373
|
}
|
|
1367
1374
|
}
|
|
1368
1375
|
}
|
|
@@ -1377,13 +1384,12 @@ class AppContextService extends BaseApiService {
|
|
|
1377
1384
|
this.successes = [];
|
|
1378
1385
|
this.subscription.unsubscribe();
|
|
1379
1386
|
this.subscription = null;
|
|
1380
|
-
this.current = null;
|
|
1381
1387
|
}
|
|
1382
1388
|
getCurrent(success = null, getCachedIfExist = true) {
|
|
1383
|
-
let
|
|
1384
|
-
if (getCachedIfExist &&
|
|
1389
|
+
let context = this.getCurrentFromSession();
|
|
1390
|
+
if (getCachedIfExist && context != null) {
|
|
1385
1391
|
if (success) {
|
|
1386
|
-
success(
|
|
1392
|
+
success(context);
|
|
1387
1393
|
}
|
|
1388
1394
|
return;
|
|
1389
1395
|
}
|
|
@@ -1400,10 +1406,10 @@ class AppContextService extends BaseApiService {
|
|
|
1400
1406
|
}, (e) => {
|
|
1401
1407
|
});
|
|
1402
1408
|
}
|
|
1403
|
-
|
|
1409
|
+
updateCurrent(success = null) {
|
|
1404
1410
|
this.getCurrent(success, false);
|
|
1405
1411
|
}
|
|
1406
|
-
|
|
1412
|
+
clearCurrent() {
|
|
1407
1413
|
this.sessionStorage.remove(this.storageKeyName);
|
|
1408
1414
|
}
|
|
1409
1415
|
isUserSignedIn() {
|
|
@@ -1412,13 +1418,14 @@ class AppContextService extends BaseApiService {
|
|
|
1412
1418
|
isUserAdmin() {
|
|
1413
1419
|
return ContextInitState.isUserAdmin;
|
|
1414
1420
|
}
|
|
1421
|
+
//Properties
|
|
1415
1422
|
//current
|
|
1416
1423
|
get current() {
|
|
1417
|
-
this.
|
|
1418
|
-
return this.
|
|
1424
|
+
this.updateCurrentIfExpired();
|
|
1425
|
+
return this.getCurrentFromSession();
|
|
1419
1426
|
}
|
|
1420
1427
|
set current(value) {
|
|
1421
|
-
this.
|
|
1428
|
+
this.setCurrentFromSession(value);
|
|
1422
1429
|
}
|
|
1423
1430
|
}
|
|
1424
1431
|
AppContextService.decorators = [
|
|
@@ -2280,8 +2287,8 @@ BaseDialog.propDecorators = {
|
|
|
2280
2287
|
</file>
|
|
2281
2288
|
*/
|
|
2282
2289
|
class BuyAccessButtonComponent {
|
|
2283
|
-
constructor(
|
|
2284
|
-
this.
|
|
2290
|
+
constructor(appContext, api) {
|
|
2291
|
+
this.appContext = appContext;
|
|
2285
2292
|
this.api = api;
|
|
2286
2293
|
this.contextUpdated = false;
|
|
2287
2294
|
this.isUserSignedIn = false;
|
|
@@ -2289,11 +2296,11 @@ class BuyAccessButtonComponent {
|
|
|
2289
2296
|
this.currentPlanTitle = '';
|
|
2290
2297
|
}
|
|
2291
2298
|
ngOnInit() {
|
|
2292
|
-
if (!this.
|
|
2299
|
+
if (!this.appContext.isUserSignedIn()) {
|
|
2293
2300
|
this.contextUpdated = true;
|
|
2294
2301
|
return;
|
|
2295
2302
|
}
|
|
2296
|
-
this.
|
|
2303
|
+
this.appContext.getCurrent((current) => {
|
|
2297
2304
|
this.isUserSignedIn = current.isUserSignedIn;
|
|
2298
2305
|
if (this.isUserSignedIn) {
|
|
2299
2306
|
this.currentPlan = current.account.billingPlan;
|