@osovitny/anatoly 2.1.9 → 2.1.11

package/bundles/osovitny-anatoly.umd.js

@@ -45,9 +45,6 @@
     Created:
       26 Jun 2020
 
-    Version:
-      1.0
-
     Copyright (c) 2016-2021 Osovitny Inc. All rights reserved.
   </file>
   */
@@ -65,9 +62,6 @@
     Created:
       5 May 2020
 
-    Version:
-      1.0
-
     Copyright (c) 2020 Deloitte Tax. All rights reserved.
   </file>
   */
@@ -1592,44 +1586,127 @@
       { type: i1.HttpClient }
   ]; };
 
+  var WebStorageService = /** @class */ (function () {
+      function WebStorageService(storage) {
+          this.storage =
+              storage === 'local' || storage === 'localStorage'
+                  ? localStorage
+                  : sessionStorage;
+      }
+      WebStorageService.prototype.setItem = function (key, value) {
+          this.storage.setItem(key, value);
+      };
+      WebStorageService.prototype.setObject = function (key, value) {
+          this.storage.setItem(key, JSON.stringify(value));
+      };
+      WebStorageService.prototype.getItem = function (key) {
+          return this.storage.getItem(key);
+      };
+      WebStorageService.prototype.getObject = function (key) {
+          var value = this.storage.getItem(key);
+          if (!value) {
+              return null;
+          }
+          return JSON.parse(value);
+      };
+      WebStorageService.prototype.remove = function (key) {
+          this.storage.removeItem(key);
+      };
+      return WebStorageService;
+  }());
+  var LocalStorageService = /** @class */ (function (_super) {
+      __extends(LocalStorageService, _super);
+      function LocalStorageService() {
+          return _super.call(this, 'localStorage') || this;
+      }
+      return LocalStorageService;
+  }(WebStorageService));
+  LocalStorageService.decorators = [
+      { type: i0.Injectable }
+  ];
+  LocalStorageService.ctorParameters = function () { return []; };
+  var SessionStorageService = /** @class */ (function (_super) {
+      __extends(SessionStorageService, _super);
+      function SessionStorageService() {
+          return _super.call(this, 'sessionStorage') || this;
+      }
+      return SessionStorageService;
+  }(WebStorageService));
+  SessionStorageService.decorators = [
+      { type: i0.Injectable }
+  ];
+  SessionStorageService.ctorParameters = function () { return []; };
+
   var AppContextService = /** @class */ (function (_super) {
       __extends(AppContextService, _super);
-      function AppContextService(http) {
+      function AppContextService(http, sessionStorage) {
           var _this = _super.call(this, http) || this;
           _this.http = http;
-          _this.current = null;
-          _this.successes = [];
+          _this.sessionStorage = sessionStorage;
+          //Consts
+          _this.storageKeyName = 'appContext';
           _this.subscription = null;
+          _this.successes = [];
           _this.baseUrl = '/api/appContext';
           return _this;
       }
-      AppContextService.prototype.getCurrent = function (success) {
-          var _this = this;
-          if (typeof success == 'undefined') {
+      AppContextService.prototype.updateCurrentIfExpired = function () {
+          var context = this.sessionStorage.getObject(this.storageKeyName);
+          if (!context) {
               return;
           }
-          if (this.current != null) {
-              success(this.current);
-              return;
-          }
-          this.successes.push(success);
-          if (this.subscription != null) {
-              return;
+          var lu = context.lastRequested;
+          if (lu) {
+              var now = new Date();
+              var lastRequested = new Date(context.lastRequested);
+              var in2Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 2, 0, 0);
+              if (in2Mins.getTime() < now.getTime()) {
+                  this.updateCurrent();
+              }
           }
-          this.subscription = this.get('getCurrentContext', null).subscribe(function (data) {
-              _this.dataReceived(data);
-          }, function (e) { });
       };
       AppContextService.prototype.dataReceived = function (data) {
           this.current = data;
           for (var i = 0; i < this.successes.length; i++) {
               var success = this.successes[i];
-              success(data);
+              if (success) {
+                  success(data);
+              }
           }
           this.successes = [];
           this.subscription.unsubscribe();
           this.subscription = null;
-          this.current = null;
+      };
+      AppContextService.prototype.getCurrent = function (success, getCachedIfExist) {
+          var _this = this;
+          if (success === void 0) { success = null; }
+          if (getCachedIfExist === void 0) { getCachedIfExist = true; }
+          var current = this.current;
+          if (getCachedIfExist && current != null) {
+              if (success) {
+                  success(current);
+              }
+              return;
+          }
+          if (success) {
+              this.successes.push(success);
+          }
+          if (this.subscription != null) {
+              return;
+          }
+          var now = new Date();
+          console.log('Requesting a new AppContext at ' + now);
+          this.subscription = this.get('getCurrentContext', null).subscribe(function (data) {
+              _this.dataReceived(data);
+          }, function (e) {
+          });
+      };
+      AppContextService.prototype.updateCurrent = function (success) {
+          if (success === void 0) { success = null; }
+          this.getCurrent(success, false);
+      };
+      AppContextService.prototype.clearCurrent = function () {
+          this.sessionStorage.remove(this.storageKeyName);
       };
       AppContextService.prototype.isUserSignedIn = function () {
           return ContextInitState.isUserSignedIn;
@@ -1637,13 +1714,27 @@
       AppContextService.prototype.isUserAdmin = function () {
           return ContextInitState.isUserAdmin;
       };
+      Object.defineProperty(AppContextService.prototype, "current", {
+          //Properties
+          //current
+          get: function () {
+              this.updateCurrentIfExpired();
+              return this.sessionStorage.getObject(this.storageKeyName);
+          },
+          set: function (value) {
+              this.sessionStorage.setObject(this.storageKeyName, value);
+          },
+          enumerable: false,
+          configurable: true
+      });
       return AppContextService;
   }(BaseApiService));
   AppContextService.decorators = [
       { type: i0.Injectable }
   ];
   AppContextService.ctorParameters = function () { return [
-      { type: i1.HttpClient }
+      { type: i1.HttpClient },
+      { type: SessionStorageService }
   ]; };
 
   /*
@@ -1718,57 +1809,6 @@
               },] }
   ];
 
-  var WebStorageService = /** @class */ (function () {
-      function WebStorageService(storage) {
-          this.storage =
-              storage === 'local' || storage === 'localStorage'
-                  ? localStorage
-                  : sessionStorage;
-      }
-      WebStorageService.prototype.setItem = function (key, value) {
-          this.storage.setItem(key, value);
-      };
-      WebStorageService.prototype.setObject = function (key, value) {
-          this.storage.setItem(key, JSON.stringify(value));
-      };
-      WebStorageService.prototype.getItem = function (key) {
-          return this.storage.getItem(key);
-      };
-      WebStorageService.prototype.getObject = function (key) {
-          var value = this.storage.getItem(key);
-          if (!value) {
-              return null;
-          }
-          return JSON.parse(value);
-      };
-      WebStorageService.prototype.remove = function (key) {
-          this.storage.removeItem(key);
-      };
-      return WebStorageService;
-  }());
-  var LocalStorageService = /** @class */ (function (_super) {
-      __extends(LocalStorageService, _super);
-      function LocalStorageService() {
-          return _super.call(this, 'localStorage') || this;
-      }
-      return LocalStorageService;
-  }(WebStorageService));
-  LocalStorageService.decorators = [
-      { type: i0.Injectable }
-  ];
-  LocalStorageService.ctorParameters = function () { return []; };
-  var SessionStorageService = /** @class */ (function (_super) {
-      __extends(SessionStorageService, _super);
-      function SessionStorageService() {
-          return _super.call(this, 'sessionStorage') || this;
-      }
-      return SessionStorageService;
-  }(WebStorageService));
-  SessionStorageService.decorators = [
-      { type: i0.Injectable }
-  ];
-  SessionStorageService.ctorParameters = function () { return []; };
-
   /*
   <file>
     Project:
@@ -2498,15 +2538,12 @@
     Created:
       14 Aug 2018
 
-    Version:
-      1.0
-
     Copyright (c) 2016-2021 Osovitny Inc. All rights reserved.
   </file>
   */
   var BuyAccessButtonComponent = /** @class */ (function () {
-      function BuyAccessButtonComponent(appcontext, api) {
-          this.appcontext = appcontext;
+      function BuyAccessButtonComponent(appContext, api) {
+          this.appContext = appContext;
           this.api = api;
           this.contextUpdated = false;
           this.isUserSignedIn = false;
@@ -2515,11 +2552,11 @@
       }
       BuyAccessButtonComponent.prototype.ngOnInit = function () {
           var _this = this;
-          if (!this.appcontext.isUserSignedIn()) {
+          if (!this.appContext.isUserSignedIn()) {
               this.contextUpdated = true;
               return;
           }
-          this.appcontext.getCurrent(function (current) {
+          this.appContext.getCurrent(function (current) {
               _this.isUserSignedIn = current.isUserSignedIn;
               if (_this.isUserSignedIn) {
                   _this.currentPlan = current.account.billingPlan;