@yelon/bis 15.2.2 → 15.2.4

package/fesm2020/layout.mjs

@@ -1860,30 +1860,11 @@ class YunzaiAuthService {
     }
     askToken() {
         log$1('yz.auth.service: ', 'askToken');
-        if (this.tokenService.get()?.token) {
-            const notCovertToken = this.tokenService.get();
-            let convertedToken;
-            if (notCovertToken && notCovertToken['access_token']) {
-                convertedToken = {
-                    token: notCovertToken['access_token'],
-                    expired: notCovertToken['expires_in'],
-                    refreshToken: notCovertToken['refresh_token'],
-                    scope: notCovertToken['scope'],
-                    tokenType: notCovertToken['token_type']
-                };
-                return of(convertedToken);
-            }
-            else {
-                return of(this.tokenService.get());
-            }
+        if (this.config.loginForm) {
+            return this.fetchTokenByUP();
         }
         else {
-            if (this.config.loginForm) {
-                return this.fetchTokenByUP();
-            }
-            else {
-                return this.fetchTokenByCas();
-            }
+            return this.fetchTokenByCas();
         }
     }
     fetchTokenByUP() {
@@ -1908,6 +1889,11 @@ class YunzaiAuthService {
             switch (response.errcode) {
                 case 2000:
                     const { access_token, expires_in, refresh_token, scope, token_type } = response.data;
+                    // 如果token不一致，清除缓存
+                    const token = this.tokenService.get()?.token;
+                    if (token && access_token && token !== access_token) {
+                        this.cacheService.clear();
+                    }
                     return {
                         token: access_token,
                         expired: expires_in,