@sambath999/localize-token 12.2.6 → 12.2.8

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

@@ -481,17 +481,9 @@
 
     var LocalizeToken = /** @class */ (function () {
         function LocalizeToken() {
-            this.configSubject = new rxjs.BehaviorSubject(LocalizeToken.config);
         }
-        Object.defineProperty(LocalizeToken.prototype, "getConfig", {
-            get: function () { return this.configSubject.value; },
-            enumerable: false,
-            configurable: true
-        });
         LocalizeToken.init = function (config) {
-            var lConfig = new LocalizeToken();
             LocalizeToken.config = Object.assign(Object.assign({}, LocalizeToken.config), config);
-            lConfig.configSubject.next(LocalizeToken.config);
         };
         return LocalizeToken;
     }());
@@ -583,21 +575,14 @@
     }
 
     var LocalizeTokenService = /** @class */ (function () {
-        function LocalizeTokenService(tokenConfig) {
-            this.tokenConfig = tokenConfig;
+        function LocalizeTokenService() {
             this.isRevokingTokenSubject = new rxjs.BehaviorSubject(false);
             this.decodeToken = function (token) { return jwt_decode__namespace.jwtDecode(token); };
-            // if (!this.tokenConfig.getConfig.authTokenName || !this.tokenConfig.getConfig.refreshTokenName || !this.tokenConfig.getConfig.tenantTokenName) {
-            //     throw new Error('authTokenName, refreshTokenName, and tenantTokenName must be defined in LocalizeToken.config')
-            // }
-            // this.config = this.tokenConfig.getConfig;
+            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", {
-            // private readonly config: ILocalizeTokenConfig
-            get: function () { return this.tokenConfig.getConfig; },
-            enumerable: false,
-            configurable: true
-        });
         Object.defineProperty(LocalizeTokenService.prototype, "authToken", {
             get: function () { return this.storageGet(); },
             set: function (value) {
@@ -634,7 +619,9 @@
             enumerable: false,
             configurable: true
         });
-        LocalizeTokenService.prototype.tenantToken = function () { return LocalizeToken.storage.get(this.config.tenantTokenName); };
+        LocalizeTokenService.prototype.tenantToken = function (name) {
+            return LocalizeToken.storage.get(name);
+        };
         LocalizeTokenService.prototype.storageGet = function () {
             try {
                 var encoded = LocalizeToken.storage.get(this.config.authTokenName);
@@ -649,10 +636,6 @@
             var base64 = btoa(JSON.stringify(value));
             LocalizeToken.storage.set(this.config.authTokenName, base64);
         };
-        LocalizeTokenService.prototype.tokensValid = function () {
-            var _a, _b;
-            return ((_a = this.refreshToken) === null || _a === void 0 ? void 0 : _a.length) && (!this.config.needTenant || ((_b = this.tenantToken()) === null || _b === void 0 ? void 0 : _b.length));
-        };
         Object.defineProperty(LocalizeTokenService.prototype, "decodeRefreshToken", {
             get: function () {
                 var token = LocalizeToken.storage.get(this.config.refreshTokenName);
@@ -665,13 +648,11 @@
         });
         return LocalizeTokenService;
     }());
-    LocalizeTokenService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function LocalizeTokenService_Factory() { return new LocalizeTokenService(i0__namespace.ɵɵinject(LocalizeToken)); }, token: LocalizeTokenService, providedIn: "root" });
+    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 [
-        { type: LocalizeToken }
-    ]; };
+    LocalizeTokenService.ctorParameters = function () { return []; };
 
     /**
      * Http method options
@@ -685,10 +666,9 @@
         EMethod[EMethod["PATCH"] = 5] = "PATCH";
     })(exports.EMethod || (exports.EMethod = {}));
     var LocalizeApiService = /** @class */ (function () {
-        function LocalizeApiService(httpClient, tokenConfig, localizeTokenService) {
+        function LocalizeApiService(httpClient, localizeTokenService) {
             var _this = this;
             this.httpClient = httpClient;
-            this.tokenConfig = tokenConfig;
             this.localizeTokenService = localizeTokenService;
             this.isRequestingSubject = new rxjs.BehaviorSubject(false);
             this.isResolvedStartupSubject = new rxjs.BehaviorSubject(false);
@@ -716,20 +696,12 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(LocalizeApiService.prototype, "config", {
-            get: function () { return this.tokenConfig.getConfig; },
-            enumerable: false,
-            configurable: true
-        });
         /**
          * Initialize the API service.
          * @param apiConfigs - The API configurations.
          */
         LocalizeApiService.prototype.init = function (apiConfigs) {
             this.apiConfigs = apiConfigs;
-            if (apiConfigs.tenantTokenName) {
-                this.tokenConfig.configSubject.next(Object.assign(Object.assign({}, this.config), { tenantTokenName: apiConfigs.tenantTokenName }));
-            }
         };
         LocalizeApiService.prototype.base = function (baseUrl, path, method, value, isFormData, headers) {
             if (method === void 0) { method = exports.EMethod.GET; }
@@ -839,7 +811,7 @@
                         case 2:
                             _b.trys.push([2, , 10, 11]);
                             this.localizeTokenService.isRevokingToken = true;
-                            reqUrl_1 = this.config.revokeTokenUrl;
+                            reqUrl_1 = LocalizeToken.config.revokeTokenUrl;
                             reqHeaders_1 = this.options().append(LocalizeToken.httpHeaders.X_REFRESH_TOKEN, "" + this.localizeTokenService.refreshToken);
                             return [4 /*yield*/, new Promise(function (resolve, reject) { return _this.httpClient.get(reqUrl_1, { headers: reqHeaders_1 }).subscribe({ next: resolve, error: reject }); })];
                         case 3:
@@ -877,8 +849,8 @@
             if (isFormData === void 0) { isFormData = false; }
             if (headers === void 0) { headers = {}; }
             var defaultHeaders = (_b = {}, _b[LocalizeToken.httpHeaders.AUTHORIZATION] = "Bearer " + this.localizeTokenService.accessToken, _b);
-            if (this.config.needTenant) {
-                defaultHeaders[LocalizeToken.httpHeaders.X_TENANT] = "" + this.localizeTokenService.tenantToken();
+            if (LocalizeToken.config.needTenant) {
+                defaultHeaders[LocalizeToken.httpHeaders.X_TENANT] = "" + this.localizeTokenService.tenantToken(this.apiConfigs.tenantTokenName);
             }
             if (!isFormData) {
                 defaultHeaders[LocalizeToken.httpHeaders.CONTENT_TYPE] = 'application/json';
@@ -914,7 +886,7 @@
         };
         return LocalizeApiService;
     }()); //class
-    LocalizeApiService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function LocalizeApiService_Factory() { return new LocalizeApiService(i0__namespace.ɵɵinject(i1__namespace.HttpClient), i0__namespace.ɵɵinject(LocalizeToken), i0__namespace.ɵɵinject(LocalizeTokenService)); }, token: LocalizeApiService, providedIn: "root" });
+    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" });
     LocalizeApiService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root'
@@ -922,7 +894,6 @@
     ];
     LocalizeApiService.ctorParameters = function () { return [
         { type: i1.HttpClient },
-        { type: LocalizeToken },
         { type: LocalizeTokenService }
     ]; };
 
@@ -935,14 +906,13 @@
         { type: i0.NgModule, args: [{
                     providers: [
                         LocalizeTokenService,
-                        LocalizeApiService,
-                        LocalizeToken
+                        LocalizeApiService
                     ],
                 },] }
     ];
 
     var LocalizeLogindlgComponent = /** @class */ (function () {
-        function LocalizeLogindlgComponent(messageService, cdt, dlgRef, dlgConfig, tokenService, httpClient, tokenConfig) {
+        function LocalizeLogindlgComponent(messageService, cdt, dlgRef, dlgConfig, tokenService, httpClient) {
             var _this = this;
             this.messageService = messageService;
             this.cdt = cdt;
@@ -950,19 +920,14 @@
             this.dlgConfig = dlgConfig;
             this.tokenService = tokenService;
             this.httpClient = httpClient;
-            this.tokenConfig = tokenConfig;
             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;
         }
-        Object.defineProperty(LocalizeLogindlgComponent.prototype, "config", {
-            get: function () { return this.tokenConfig.getConfig; },
-            enumerable: false,
-            configurable: true
-        });
         LocalizeLogindlgComponent.prototype.ngOnInit = function () {
             var _this = this;
             this.dlgConfig.closable = false;
@@ -1037,7 +1002,7 @@
             var _a, _b;
             return _c = {},
                 _c[LocalizeToken.httpHeaders.X_REFRESH_TOKEN] = (_a = LocalizeToken.storage.get(this.config.refreshTokenName)) !== null && _a !== void 0 ? _a : "",
-                _c[LocalizeToken.httpHeaders.X_TENANT] = (_b = LocalizeToken.storage.get(this.config.tenantTokenName)) !== null && _b !== void 0 ? _b : "",
+                _c[LocalizeToken.httpHeaders.X_TENANT] = (_b = LocalizeToken.storage.get(this.loginConfig.tenantTokenName)) !== null && _b !== void 0 ? _b : "",
                 _c;
         };
         Object.defineProperty(LocalizeLogindlgComponent.prototype, "isValidPassword", {
@@ -1069,8 +1034,7 @@
         { type: dynamicdialog.DynamicDialogRef },
         { type: dynamicdialog.DynamicDialogConfig },
         { type: LocalizeTokenService },
-        { type: i1.HttpClient },
-        { type: LocalizeToken }
+        { type: i1.HttpClient }
     ]; };
 
     var LocalizeLogindlgService = /** @class */ (function () {