@sambath999/localize-token 12.3.3 → 12.3.4

package/bundles/sambath999-localize-token.umd.js

@@ -482,19 +482,8 @@
     var LocalizeToken = /** @class */ (function () {
         function LocalizeToken() {
         }
-        LocalizeToken.init = function (config) {
-            LocalizeToken.config = Object.assign(Object.assign({}, LocalizeToken.config), config);
-        };
         return LocalizeToken;
     }());
-    LocalizeToken.config = {
-        mainDomain: extractMainDomain(),
-        authTokenName: 'auth-token',
-        refreshTokenName: '_lze_rftkp_',
-        needTenant: false,
-        isProduction: false,
-        revokeTokenUrl: ''
-    };
     LocalizeToken.storage = new LocalizeTokenStorage();
     LocalizeToken.httpHeaders = {
         AUTHORIZATION: 'Authorization',
@@ -577,12 +566,28 @@
     var LocalizeTokenService = /** @class */ (function () {
         function LocalizeTokenService() {
             this.isRevokingTokenSubject = new rxjs.BehaviorSubject(false);
+            this.defaultConfig = {
+                mainDomain: extractMainDomain(),
+                authTokenName: 'auth-token',
+                refreshTokenName: '_lze_rftkp_',
+            };
+            this._config = Object.assign({}, this.defaultConfig);
+            this.isInitialized = false;
             this.decodeToken = function (token) { return jwt_decode__namespace.jwtDecode(token); };
-            if (!LocalizeToken.config.authTokenName || !LocalizeToken.config.refreshTokenName) {
-                throw new Error('authTokenName and refreshTokenName must be defined in LocalizeToken.config');
-            }
-            this.config = LocalizeToken.config;
         }
+        Object.defineProperty(LocalizeTokenService.prototype, "config", {
+            get: function () {
+                this.throwIfNotInitialized();
+                return this._config;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        LocalizeTokenService.prototype.init = function (config) {
+            console.warn('LocalizeTokenService is initialized.');
+            this._config = Object.assign(Object.assign({}, this.defaultConfig), config);
+            this.isInitialized = true;
+        };
         Object.defineProperty(LocalizeTokenService.prototype, "authToken", {
             get: function () { return this.storageGet(); },
             set: function (value) {
@@ -601,9 +606,7 @@
         Object.defineProperty(LocalizeTokenService.prototype, "accessToken", {
             get: function () { var _a; return (_a = this.authToken) === null || _a === void 0 ? void 0 : _a.token; },
             set: function (value) {
-                if (value) {
-                    this.authToken = { token: value, revoke: false };
-                }
+                value && (this.authToken = { token: value, revoke: false });
             },
             enumerable: false,
             configurable: true
@@ -612,9 +615,7 @@
             get: function () { return this.isRevokingTokenSubject.value; /* this.authToken?.revoke ?? false */ },
             set: function (value) {
                 this.isRevokingTokenSubject.next(value);
-                if (this.authToken) {
-                    this.authToken = Object.assign(Object.assign({}, this.authToken), { revoke: value });
-                }
+                this.authToken && (this.authToken = Object.assign(Object.assign({}, this.authToken), { revoke: value }));
             },
             enumerable: false,
             configurable: true
@@ -646,20 +647,22 @@
         Object.defineProperty(LocalizeTokenService.prototype, "decodeRefreshToken", {
             get: function () {
                 var token = LocalizeToken.storage.get(this.config.refreshTokenName);
-                if (!token)
-                    return null;
-                return this.decodeToken(token);
+                return !token ? null : this.decodeToken(token);
             },
             enumerable: false,
             configurable: true
         });
+        LocalizeTokenService.prototype.throwIfNotInitialized = function () {
+            if (!this.isInitialized) {
+                throw new Error('LocalizeTokenService is not initialized. Call init() method before using it.');
+            }
+        };
         return LocalizeTokenService;
     }());
     LocalizeTokenService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function LocalizeTokenService_Factory() { return new LocalizeTokenService(); }, token: LocalizeTokenService, providedIn: "root" });
     LocalizeTokenService.decorators = [
         { type: i0.Injectable, args: [{ providedIn: 'root' },] }
-    ];
-    LocalizeTokenService.ctorParameters = function () { return []; };
+    ];
 
     /**
      * Http method options
@@ -838,15 +841,6 @@
                 });
             });
         };
-        LocalizeApiHelper.prototype.validateConfig = function (config) {
-            var _a;
-            if (LocalizeToken.config.needTenant && !((_a = config.tenantTokenName) === null || _a === void 0 ? void 0 : _a.trim().length)) {
-                throw Error('Tenant token is required but tenantTokenName is not configured');
-            }
-            if (!LocalizeToken.config.revokeTokenUrl.trim().length) {
-                throw Error('Revoke token URL is not configured - token refresh will not work');
-            }
-        };
         LocalizeApiHelper.prototype.screenBlocker = function (optons, error, add) {
             if (add === void 0) { add = true; }
             var _a, _b, _c, _d;
@@ -893,8 +887,7 @@
             this.localizeTokenService = localizeTokenService;
             this.destroy$ = new rxjs.Subject();
             this.isRequestingSubject = new rxjs.BehaviorSubject(false);
-            this.isResolvedStartupSubject = new rxjs.BehaviorSubject(false);
-            this.needTenant = LocalizeToken.config.needTenant;
+            this.isResolvingStartupSubject = new rxjs.BehaviorSubject(false);
             this.config = {
                 waitEachRequest: { milliseconds: 0 },
                 enableRequestCancellation: true,
@@ -920,8 +913,13 @@
                 return _this.request(baseUrl, path, method, reqBody, reqHeaders);
             }; };
         }
-        Object.defineProperty(LocalizeApiService.prototype, "isResolvedStartup", {
-            get: function () { return this.isResolvedStartupSubject.value; },
+        Object.defineProperty(LocalizeApiService.prototype, "isResolvingStartup", {
+            get: function () { return this.isResolvingStartupSubject.value; },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(LocalizeApiService.prototype, "needTenant", {
+            get: function () { return this.localizeTokenService.config.needTenant; },
             enumerable: false,
             configurable: true
         });
@@ -957,8 +955,9 @@
          * @param apiConfigs - The API configurations.
          */
         LocalizeApiService.prototype.init = function (apiConfigs) {
+            console.warn('LocalizeApiService is initialized.');
             this.config = Object.assign(Object.assign({}, this.config), apiConfigs);
-            ApiHelper.validateConfig(this.config);
+            this.validateConfig(this.config);
         };
         LocalizeApiService.prototype.cancelPendingRequests = function () {
             this.config.enableRequestCancellation
@@ -973,25 +972,29 @@
             if (reqBody === void 0) { reqBody = null; }
             return __awaiter(this, void 0, void 0, function () {
                 var apiOptions, error_1;
+                var _this = this;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
-                        case 0: return [4 /*yield*/, ApiHelper.invokeHook(this.config.onPrepareRequest)];
+                        case 0: return [4 /*yield*/, waitUntil(function () { return !_this.isResolvingStartup; }, 500)];
                         case 1:
                             _b.sent();
-                            apiOptions = this.buildApiOptions(baseUrl, path, method, reqBody, reqHeaders);
-                            _b.label = 2;
+                            return [4 /*yield*/, ApiHelper.invokeHook(this.config.onPrepareRequest)];
                         case 2:
-                            _b.trys.push([2, 5, , 7]);
-                            return [4 /*yield*/, this.toWaitForPreviousRequest()];
+                            _b.sent();
+                            apiOptions = this.buildApiOptions(baseUrl, path, method, reqBody, reqHeaders);
+                            _b.label = 3;
                         case 3:
+                            _b.trys.push([3, 6, , 8]);
+                            return [4 /*yield*/, this.toWaitForPreviousRequest()];
+                        case 4:
                             _b.sent();
                             return [4 /*yield*/, ApiHelper.performRequestWithRetry(apiOptions, this.config, this.performRequest.bind(this))];
-                        case 4: return [2 /*return*/, _b.sent()];
-                        case 5:
+                        case 5: return [2 /*return*/, _b.sent()];
+                        case 6:
                             error_1 = _b.sent();
                             return [4 /*yield*/, this.handleOnRequestError(error_1, apiOptions)];
-                        case 6: return [2 /*return*/, _b.sent()];
-                        case 7: return [2 /*return*/];
+                        case 7: return [2 /*return*/, _b.sent()];
+                        case 8: return [2 /*return*/];
                     }
                 });
             });
@@ -1002,8 +1005,11 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            if (error.status !== 401 || this.isResolvedStartup)
+                            if (error.status !== 401)
                                 throw error;
+                            return [4 /*yield*/, waitUntil(function () { return !_this.isResolvingStartup; }, 500)];
+                        case 1:
+                            _b.sent();
                             return [4 /*yield*/, ApiHelper.performRetry({
                                     maxRetries: function () { return 1000; },
                                     delay: 500,
@@ -1025,7 +1031,7 @@
                                         });
                                     }); }
                                 })];
-                        case 1: return [2 /*return*/, _b.sent()];
+                        case 2: return [2 /*return*/, _b.sent()];
                     }
                 });
             });
@@ -1066,7 +1072,7 @@
                             if (_b.sent())
                                 return [2 /*return*/];
                             this.isRevokingToken = true;
-                            apiOptions = Object.assign(Object.assign({}, this.buildApiOptions(LocalizeToken.config.revokeTokenUrl)), { refreshToken: true });
+                            apiOptions = Object.assign(Object.assign({}, this.buildApiOptions(this.localizeTokenService.config.revokeTokenUrl)), { refreshToken: true });
                             return [4 /*yield*/, ApiHelper.performRequestWithRetry(apiOptions, this.config, this.performRequest.bind(this))];
                         case 2:
                             revokeToken = _b.sent();
@@ -1184,6 +1190,15 @@
                 });
             });
         };
+        LocalizeApiService.prototype.validateConfig = function (config) {
+            var _a;
+            if (this.localizeTokenService.config.needTenant && !((_a = config.tenantTokenName) === null || _a === void 0 ? void 0 : _a.trim().length)) {
+                throw Error('Tenant token is required but tenantTokenName is not configured');
+            }
+            if (!this.localizeTokenService.config.revokeTokenUrl.trim().length) {
+                throw Error('Revoke token URL is not configured - token refresh will not work');
+            }
+        };
         return LocalizeApiService;
     }());
     LocalizeApiService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function LocalizeApiService_Factory() { return new LocalizeApiService(i0__namespace.ɵɵinject(i1__namespace.HttpClient), i0__namespace.ɵɵinject(LocalizeTokenService)); }, token: LocalizeApiService, providedIn: "root" });
@@ -1224,12 +1239,16 @@
             this.messageKey = "$login-dlg";
             this.loading = false;
             this.success = false;
-            this.config = LocalizeToken.config;
             this.clickLogout = function () { var _a; return (_a = _this.logout) === null || _a === void 0 ? void 0 : _a.call(_this); };
             this.decodeToken = this.tokenService.decodeRefreshToken;
             this.loginConfig = this.dlgConfig.data.loginConfig;
             this.properties = this.loginConfig.properties;
         }
+        Object.defineProperty(LocalizeLogindlgComponent.prototype, "config", {
+            get: function () { return this.tokenService.config; },
+            enumerable: false,
+            configurable: true
+        });
         LocalizeLogindlgComponent.prototype.ngOnInit = function () {
             var _this = this;
             this.dlgConfig.closable = false;