ntk-cms-api 18.3.465 → 18.3.467

package/fesm2020/ntk-cms-api.mjs

@@ -1151,16 +1151,21 @@ class ApiServerBase {
         this.keyJwt = 'jwtToken';
         this.keyDeviceToken = 'deviceToken';
         this.keyBaseUrl = 'baseUrl';
+        this.keyBaseVer = '';
         this.accessLoad = false;
         this.cachApiResult = [];
         this.childConstructor();
         this.headers = new Map();
     }
-    setConfig(url, apiRetry = 1) {
+    setConfig(url, ver = '', apiRetry = 1) {
         this.baseUrl = url;
-        localStorage.setItem(this.keyBaseUrl, url);
+        localStorage.setItem(this.Ver + this.keyBaseUrl, url);
+        localStorage.setItem(this.keyBaseVer, ver);
         this.configApiRetry = apiRetry;
     }
+    get Ver() {
+        return localStorage.getItem(this.keyBaseVer) + '';
+    }
     cashApiIsValid(serviceNameKay, cashApiSeconds) {
         if (cashApiSeconds > 0) {
             if (!this.cachApiResult[serviceNameKay])
@@ -1176,7 +1181,7 @@ class ApiServerBase {
         // test
     }
     getBaseUrl() {
-        const BaseUrl = localStorage.getItem(this.keyBaseUrl);
+        const BaseUrl = localStorage.getItem(this.Ver + this.keyBaseUrl);
         if (BaseUrl && BaseUrl.length > 0) {
             return BaseUrl;
         }
@@ -1210,7 +1215,7 @@ class ApiServerBase {
         if (this.deviceToken && this.deviceToken.length > 0) {
             return this.deviceToken;
         }
-        const token = localStorage.getItem(this.keyDeviceToken);
+        const token = localStorage.getItem(this.Ver + this.keyDeviceToken);
         if (token && token.length > 0) {
             return token;
         }
@@ -1218,30 +1223,30 @@ class ApiServerBase {
     }
     setDeviceToken(deviceToken) {
         if (!deviceToken || deviceToken.length === 0) {
-            localStorage.removeItem(this.keyDeviceToken);
+            localStorage.removeItem(this.Ver + this.keyDeviceToken);
             return;
         }
-        localStorage.setItem(this.keyDeviceToken, deviceToken);
+        localStorage.setItem(this.Ver + this.keyDeviceToken, deviceToken);
     }
     setJWT(model) {
         if (!model || model.accessToken?.length === 0) {
-            localStorage.removeItem(this.keyJwt);
+            localStorage.removeItem(this.Ver + this.keyJwt);
             return;
         }
-        localStorage.setItem(this.keyJwt, JSON.stringify(model));
+        localStorage.setItem(this.Ver + this.keyJwt, JSON.stringify(model));
     }
     getJWT() {
-        const token = localStorage.getItem(this.keyJwt);
+        const token = localStorage.getItem(this.Ver + this.keyJwt);
         if (token && token.length > 0) {
             var ret = JSON.parse(token);
-            if (!ret || ret.accessToken || ret.accessToken.length == 0)
+            if (!ret || !ret.accessToken || ret.accessToken.length == 0)
                 return undefined;
             return ret;
         }
         return undefined;
     }
     removeToken() {
-        localStorage.removeItem(this.keyJwt);
+        localStorage.removeItem(this.Ver + this.keyJwt);
     }
     getHeaders() {
         let dateTime = new Date();
@@ -3376,18 +3381,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
             type: Injectable
         }] });
 
-class TokenInfoModelV3 {
-}
-
 class AuthRefreshTokenModel {
 }
 
 class CoreAuthV3Service extends ApiServerBase {
-    constructor() {
-        super(...arguments);
-        this.tokenInfoSubject = new BehaviorSubject(new TokenInfoModelV3);
-        this.tokenDeviceSubject = new BehaviorSubject(new TokenDeviceModel);
-    }
+    // public tokenInfoSubject: BehaviorSubject<TokenInfoModelV3> = new BehaviorSubject(new TokenInfoModelV3);
+    // public tokenDeviceSubject: BehaviorSubject<TokenDeviceModel> = new BehaviorSubject(new TokenDeviceModel);
     getModuleControllerUrl() {
         return 'auth';
     }
@@ -3424,7 +3423,7 @@ class CoreAuthV3Service extends ApiServerBase {
         })
             .pipe(map((ret) => {
             this.setJWT(null);
-            this.tokenInfoSubject.next(new TokenInfoModelV3());
+            //this.tokenInfoSubject.next(new TokenInfoModelV3());
             return ret;
         }));
     }
@@ -3435,31 +3434,31 @@ class CoreAuthV3Service extends ApiServerBase {
     }
     ServiceCurrentToken() {
         return this.http.get(this.getBaseUrl() + this.getModuleControllerUrl() + '/CurrentToken', { headers: this.getHeaders() }).pipe(map((ret) => {
-            this.tokenInfoSubject.next(ret.item);
+            //this.tokenInfoSubject.next(ret.item);
             return ret;
         }));
     }
     ServiceGetTokenDevice(model) {
         return this.http.post(this.getBaseUrl() + this.getModuleControllerUrl() + '/GetTokenDevice/', model).pipe(map((ret) => {
             this.setDeviceToken(ret.item.deviceToken);
-            if (!ret.item) {
-                this.tokenDeviceSubject.next(new TokenDeviceModel());
-            }
-            else {
-                this.tokenDeviceSubject.next(ret.item);
-            }
+            // if (!ret.item) {
+            //   this.tokenDeviceSubject.next(new TokenDeviceModel());
+            // }
+            // else {
+            //   this.tokenDeviceSubject.next(ret.item);
+            // }
             return ret;
         }));
     }
     ServiceCurrentDeviceToken() {
         return this.http.get(this.getBaseUrl() + this.getModuleControllerUrl() + '/CurrentDeviceToken', { headers: this.getHeaders() }).pipe(map((ret) => {
             this.setDeviceToken(ret.item.deviceToken);
-            if (!ret.item) {
-                this.tokenDeviceSubject.next(new TokenDeviceModel());
-            }
-            else {
-                this.tokenDeviceSubject.next(ret.item);
-            }
+            // if (!ret.item) {
+            //   this.tokenDeviceSubject.next(new TokenDeviceModel());
+            // }
+            // else {
+            //   this.tokenDeviceSubject.next(ret.item);
+            // }
             return ret;
         }));
     }
@@ -3811,6 +3810,9 @@ class CoreTokenActivationModel extends BaseEntity {
 class CoreTokenUserBadLoginModel extends BaseEntity {
 }
 
+class TokenInfoModelV3 {
+}
+
 class TokenAccessModel {
 }