@osovitny/anatoly 3.16.49 → 3.16.51

package/fesm2022/osovitny-anatoly.mjs

@@ -6,7 +6,7 @@ import { NavigationEnd, NavigationStart, NavigationCancel, NavigationError, Rout
 import * as i1$1 from '@angular/common/http';
 import { HttpResponse, HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { map, tap, mergeMap, catchError as catchError$1 } from 'rxjs/operators';
-import { Subject, filter, takeUntil, map as map$1, catchError, of, BehaviorSubject, timer, merge, fromEvent, forkJoin } from 'rxjs';
+import { BehaviorSubject, Subject, filter, takeUntil, map as map$1, catchError, of, timer, merge, fromEvent, forkJoin } from 'rxjs';
 import * as i4 from '@azure/msal-angular';
 import { MSAL_GUARD_CONFIG, MsalGuard, MsalInterceptor, MSAL_INTERCEPTOR_CONFIG, MSAL_INSTANCE, MsalService, MsalBroadcastService, MsalModule } from '@azure/msal-angular';
 import { BrowserUtils, EventType, InteractionStatus, InteractionType, InteractionRequiredAuthError, PromptValue, PublicClientApplication, LogLevel } from '@azure/msal-browser';
@@ -674,12 +674,10 @@ class AppContextService extends ApiServiceBase {
     http;
     localStorage;
     sessionStorage;
-    //Consts
     storageKeyName = 'appContext';
     subscription = null;
-    successes = [];
     //Private Streams
-    _updated = new Subject();
+    _updated = new BehaviorSubject(null);
     //Public Streams
     updated$ = this._updated.asObservable();
     constructor(http, localStorage, sessionStorage) {
@@ -689,64 +687,36 @@ class AppContextService extends ApiServiceBase {
         this.sessionStorage = sessionStorage;
         this.baseUrl = `${ApiUrl}/appContext`;
     }
+    fireUpdated(data) {
+        if (!data) {
+            return;
+        }
+        let now = new Date();
+        console.log('AppContext has been updated at ' + now);
+        this._updated.next(data);
+    }
     //Session
-    getCurrentFromSession() {
+    getCurrent4Session() {
         return this.sessionStorage.getObject(this.storageKeyName);
     }
-    setCurrentFromSession(value) {
+    setCurrent2Session(value) {
         this.sessionStorage.setObject(this.storageKeyName, value);
     }
-    updateCurrentIfExpired() {
-        let context = this.getCurrentFromSession();
-        if (!context) {
-            return;
-        }
-        let shouldBeUpdated = false;
-        let lr = context.lastRequested;
-        if (lr) {
-            let now = new Date();
-            let lastRequested = new Date(context.lastRequested);
-            let in3Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 3, 0, 0);
-            if (in3Mins.getTime() < now.getTime()) {
-                shouldBeUpdated = true;
-            }
-        }
-        else {
-            shouldBeUpdated = true;
-        }
-        if (shouldBeUpdated) {
-            this.updateCurrent();
-        }
-    }
     dataReceived(data) {
         this.current = data;
-        for (let i = 0; i < this.successes.length; i++) {
-            let success = this.successes[i];
-            if (success) {
-                success(data);
-            }
-        }
-        this.successes = [];
         this.subscription.unsubscribe();
         this.subscription = null;
-        if (data) {
-            let now = new Date();
-            console.log('AppContext has been updated at ' + now);
-            this._updated.next(data);
-        }
     }
     getCurrentPrivate(success = null, getCachedIfExist = true) {
         if (getCachedIfExist) {
-            let context = this.getCurrentFromSession();
+            let context = this.getCurrent4Session();
             if (context != null) {
-                if (success)
+                if (success) {
                     success(context);
+                }
                 return;
             }
         }
-        if (success) {
-            this.successes.push(success);
-        }
         if (this.subscription != null) {
             return;
         }
@@ -758,23 +728,34 @@ class AppContextService extends ApiServiceBase {
             }
         });
     }
+    updateCurrentIfExpired() {
+        let context = this.getCurrent4Session();
+        if (!context) {
+            return;
+        }
+        let shouldBeUpdated = false;
+        let lr = context.lastRequested;
+        if (lr) {
+            let now = new Date();
+            let lastRequested = new Date(context.lastRequested);
+            let in3Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 3, 0, 0);
+            if (in3Mins.getTime() < now.getTime()) {
+                shouldBeUpdated = true;
+            }
+        }
+        else {
+            shouldBeUpdated = true;
+        }
+        if (shouldBeUpdated) {
+            this.updateCurrent();
+        }
+    }
     //Public
     init(context) {
         this.current = context;
     }
-    getLatestCurrent(success = null) {
-        this.getCurrentPrivate(success, false);
-    }
-    getCurrent(success = null) {
-        this.getCurrentPrivate(success, true);
-    }
     updateCurrent(success = null) {
-        //VadimOS: make dropping current & isAdmin throw 403
-        //this.clearCurrent();
-        this.getLatestCurrent(success);
-    }
-    clearCurrent() {
-        this.sessionStorage.remove(this.storageKeyName);
+        this.getCurrentPrivate(success, false);
     }
     //Storage
     clearLocalStorage() {
@@ -790,10 +771,11 @@ class AppContextService extends ApiServiceBase {
     //current
     get current() {
         this.updateCurrentIfExpired();
-        return this.getCurrentFromSession();
+        return this.getCurrent4Session();
     }
     set current(value) {
-        this.setCurrentFromSession(value);
+        this.setCurrent2Session(value);
+        this.fireUpdated(value);
     }
     //currentUser
     get currentUser() {
@@ -1125,15 +1107,16 @@ class AuthService extends ApiServiceBase {
         if (!this.isUserAuthenticated()) {
             return false;
         }
-        let currentUser = this.appContext.currentUser;
-        return currentUser && currentUser.UserID;
+        if (this.appContext.current.isUserSignedIn && this.appContext.currentUser) {
+            return true;
+        }
+        return false;
     }
     isUserAdmin() {
         if (!this.isUserSignedIn()) {
             return false;
         }
-        let currentUser = this.appContext.currentUser;
-        return currentUser && currentUser.isUserAdmin;
+        return this.appContext.current.isUserAdmin;
     }
     static ɵfac = function AuthService_Factory(t) { return new (t || AuthService)(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i1.Router), i0.ɵɵinject(AppContextService), i0.ɵɵinject(MSAL_GUARD_CONFIG), i0.ɵɵinject(i4.MsalService), i0.ɵɵinject(i4.MsalBroadcastService)); };
     static ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: AuthService, factory: AuthService.ɵfac, providedIn: 'root' });
@@ -3222,11 +3205,14 @@ class BuyAccessButtonComponent {
         this.appContext = appContext;
     }
     ngOnInit() {
-        this.appContext.getCurrent((current) => {
-            this.isUserSignedIn = current.isUserSignedIn;
+        this.appContext.updated$.subscribe((context) => {
+            if (!context) {
+                return;
+            }
+            this.isUserSignedIn = context.isUserSignedIn;
             if (this.isUserSignedIn) {
-                this.currentPlan = current.account.billingPlan;
-                this.currentPlanTitle = current.account.billingPlanAsString;
+                this.currentPlan = context.account.billingPlan;
+                this.currentPlanTitle = context.account.billingPlanAsString;
             }
             this.contextUpdated = true;
         });
@@ -3336,13 +3322,16 @@ class SubscribePlanButtonComponent {
         this.appContext = appContext;
     }
     ngOnInit() {
-        this.appContext.getCurrent((current) => {
-            this.isUserSignedIn = current.isUserSignedIn;
+        this.appContext.updated$.subscribe((context) => {
+            if (!context) {
+                return;
+            }
+            this.isUserSignedIn = context.isUserSignedIn;
             if (this.isUserSignedIn) {
-                this.currentPlan = current.account.billingPlan;
-                this.currentPlanTitle = current.account.billingPlanAsString;
-                this.requestedPlan = current.account.requestedBillingPlan;
-                this.requestedPlanTitle = current.account.requestedBillingPlanAsString;
+                this.currentPlan = context.account.billingPlan;
+                this.currentPlanTitle = context.account.billingPlanAsString;
+                this.requestedPlan = context.account.requestedBillingPlan;
+                this.requestedPlanTitle = context.account.requestedBillingPlanAsString;
             }
             this.contextUpdated = true;
         });
@@ -5048,8 +5037,18 @@ class ContactUsForm extends BaseEditComponent {
     }
     ngOnInit() {
         this.createFormGroup();
-        this.appContext.getCurrent(context => {
-            this.setContext(context);
+        this.appContext.updated$.subscribe((context) => {
+            if (!context) {
+                return;
+            }
+            this.isUserSignedIn = context.isUserSignedIn;
+            this.reCaptchaSiteKey = context.reCaptchaSiteKeyV3;
+            this.selectedTopic = this.topicList[3].value;
+            this.setFormValue('topic', this.selectedTopic);
+            if (this.isUserSignedIn) {
+                this.setFormValue('name', context.user.displayNameOrFullName);
+                this.setFormValue('email', context.user.email);
+            }
         });
     }
     createFormGroup() {
@@ -5061,16 +5060,6 @@ class ContactUsForm extends BaseEditComponent {
             message: new FormControl('', [Validators.required])
         });
     }
-    setContext(context) {
-        this.isUserSignedIn = context.isUserSignedIn;
-        this.reCaptchaSiteKey = context.reCaptchaSiteKeyV3;
-        this.selectedTopic = this.topicList[3].value;
-        this.setFormValue('topic', this.selectedTopic);
-        if (this.isUserSignedIn) {
-            this.setFormValue('name', context.user.displayNameOrFullName);
-            this.setFormValue('email', context.user.email);
-        }
-    }
     isValid() {
         return this.formGroup.valid;
     }