@yelon/bis 15.2.4 → 15.2.6

package/esm2020/layout/yunzai-auth.service.mjs

@@ -25,12 +25,29 @@ class YunzaiAuthService {
     }
     askToken() {
         log('yz.auth.service: ', 'askToken');
+        // if (this.tokenService.get()?.token) {
+        //   const notCovertToken = this.tokenService.get();
+        //   let convertedToken: ITokenModel;
+        //   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()!);
+        //   }
+        // } else {
         if (this.config.loginForm) {
             return this.fetchTokenByUP();
         }
         else {
             return this.fetchTokenByCas();
         }
+        // }
     }
     fetchTokenByUP() {
         log('yz.auth.service: ', 'fetchTokenByUP');
@@ -51,14 +68,16 @@ class YunzaiAuthService {
         return this.httpClient
             .get(`/cas-proxy/app/validate_full?callback=${uri}&_allow_anonymous=true&timestamp=${new Date().getTime()}`)
             .pipe(map((response) => {
+            // 查看缓存中的用户是否与token验证回的用户id相同，如果不同则缓存为过期缓存，进行清除
+            if (response && response.userId) {
+                const user = this.cacheService.get('_yz_user', { mode: 'none' });
+                if (user && user.id && user.id !== response.userId) {
+                    this.cacheService.clear();
+                }
+            }
             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,
@@ -152,4 +171,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
             args: [{ providedIn: 'root' }]
         }], ctorParameters: function () { return [{ type: i0.Injector }]; } });
 export { YunzaiAuthService as YzAuthService, YunzaiAuthService };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"yunzai-auth.service.js","sourceRoot":"","sources":["../../../../../packages/bis/layout/yunzai-auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Injector } from '@angular/core';\nimport { forkJoin, map, mergeAll, mergeMap, Observable, of } from 'rxjs';\n\nimport { ITokenModel, ITokenService, YA_SERVICE_TOKEN } from '@yelon/auth';\nimport { CacheService } from '@yelon/cache';\nimport { _HttpClient } from '@yelon/theme';\nimport { log, WINDOW, YunzaiBusinessConfig, YunzaiConfigService } from '@yelon/util';\n\nimport { mergeBisConfig } from './bis.config';\n\n@Injectable({ providedIn: 'root' })\nclass YunzaiAuthService {\n  private config: YunzaiBusinessConfig;\n\n  constructor(private injector: Injector) {\n    this.config = mergeBisConfig(this.configService);\n  }\n\n  private get configService(): YunzaiConfigService {\n    return this.injector.get(YunzaiConfigService);\n  }\n\n  private get tokenService(): ITokenService {\n    return this.injector.get(YA_SERVICE_TOKEN);\n  }\n\n  private get httpClient(): _HttpClient {\n    return this.injector.get(_HttpClient);\n  }\n\n  private get cacheService(): CacheService {\n    return this.injector.get(CacheService);\n  }\n\n  askToken(): Observable<ITokenModel> {\n    log('yz.auth.service: ', 'askToken');\n    if (this.config.loginForm) {\n      return this.fetchTokenByUP();\n    } else {\n      return this.fetchTokenByCas();\n    }\n  }\n\n  fetchTokenByUP(): Observable<ITokenModel> {\n    log('yz.auth.service: ', 'fetchTokenByUP');\n    return this.httpClient.post(`/auth/oauth/token?_allow_anonymous=true`, this.config.loginForm).pipe(\n      map((response: any) => {\n        const { access_token, expires_in, refresh_token, scope, token_type } = response;\n        return {\n          token: access_token,\n          expired: expires_in,\n          refreshToken: refresh_token,\n          tokenType: token_type,\n          scope\n        };\n      })\n    );\n  }\n\n  fetchTokenByCas(): Observable<ITokenModel> {\n    log('yz.auth.service: ', 'fetchTokenByCas');\n    const uri = encodeURIComponent(this.injector.get(WINDOW).location.href);\n    return this.httpClient\n      .get(`/cas-proxy/app/validate_full?callback=${uri}&_allow_anonymous=true&timestamp=${new Date().getTime()}`)\n      .pipe(\n        map((response: any) => {\n          switch (response.errcode) {\n            case 2000:\n              const { access_token, expires_in, refresh_token, scope, token_type } = response.data;\n              // 如果token不一致，清除缓存\n              const token = this.tokenService.get()?.token;\n              if (token && access_token && token !== access_token) {\n                this.cacheService.clear();\n              }\n              return {\n                token: access_token,\n                expired: expires_in,\n                refreshToken: refresh_token,\n                tokenType: token_type,\n                scope\n              } as ITokenModel;\n            case 2001:\n              this.injector.get(WINDOW).location.href = response.msg;\n              throw Error(\"Cookie Error: Can't find Cas Cookie,So jump to login!\");\n            default:\n              if (response.data) {\n                console.error(response.data);\n                throw Error(response.data);\n              } else if (response.msg) {\n                console.error(response.msg);\n                throw Error(response.msg);\n              } else {\n                console.error('cas unknown error');\n                throw Error('Unknown Error: Cas auth exception!');\n              }\n          }\n        })\n      );\n  }\n\n  login(): Observable<void> {\n    log('yz.auth.service: ', 'login white login form->', this.config.loginForm);\n    return this.askToken().pipe(\n      mergeMap(token => {\n        log('yz.auth.service: get token->', token);\n        this.configService.set('auth', {\n          token_send_key: 'Authorization',\n          token_send_template: `${token.tokenType} \\${token}`,\n          token_send_place: 'header'\n        });\n        log('yz.auth.service: ', 'set token');\n        this.tokenService.set(token);\n        return this.cacheInit();\n      }),\n      mergeAll()\n    );\n  }\n\n  cacheInit(): Observable<void[]> {\n    log('yz.auth.service: ', 'cacheInit');\n    const tenant = this.cacheService.get('_yz_tenant', { mode: 'none' });\n    const user = this.cacheService.get('_yz_user', { mode: 'none' });\n    const header = this.cacheService.get('_yz_header', { mode: 'none' });\n    const project = this.cacheService.get('_yz_project_info', { mode: 'none' });\n    return forkJoin(of(user), of(header), of(project)).pipe(\n      mergeMap(([u, h, p]) => {\n        let list = [];\n        // user cache\n        if (!u || !tenant) {\n          log('yz.auth.service: ', 'fetch user cache');\n          list.push(\n            this.httpClient.get(`/auth/user`).pipe(\n              map((user: any) => {\n                this.cacheService.set('_yz_tenant', user.tenantId);\n                this.cacheService.set('_yz_user', user.principal);\n              })\n            )\n          );\n        } else {\n          log('yz.auth.service: ', 'user recache');\n          list.push(of<any>(() => {}));\n        }\n        // header cache\n        if (!h) {\n          log('yz.auth.service: ', 'fetch header cache');\n          list.push(\n            this.httpClient.get(`/auth/allheader/v2`).pipe(\n              map((header: any) => {\n                this.cacheService.set('_yz_header', header.data);\n              })\n            )\n          );\n        } else {\n          log('yz.auth.service: ', 'header recache');\n          list.push(of<any>(() => {}));\n        }\n        // project cache\n        if (!p) {\n          log('yz.auth.service: ', 'fetch project cache');\n          list.push(\n            this.httpClient.get(`/app-manager/project/info`).pipe(\n              map((info: any) => {\n                this.cacheService.set('_yz_project_info', info.data);\n              })\n            )\n          );\n        } else {\n          log('yz.auth.service: ', 'project recache');\n          list.push(of<any>(() => {}));\n        }\n        return forkJoin(list);\n      })\n    );\n  }\n}\n\nexport { YunzaiAuthService as YzAuthService, YunzaiAuthService };\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"yunzai-auth.service.js","sourceRoot":"","sources":["../../../../../packages/bis/layout/yunzai-auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Injector } from '@angular/core';\nimport { forkJoin, map, mergeAll, mergeMap, Observable, of } from 'rxjs';\n\nimport { ITokenModel, ITokenService, YA_SERVICE_TOKEN } from '@yelon/auth';\nimport { CacheService } from '@yelon/cache';\nimport { _HttpClient } from '@yelon/theme';\nimport { log, WINDOW, YunzaiBusinessConfig, YunzaiConfigService } from '@yelon/util';\n\nimport { mergeBisConfig } from './bis.config';\n\n@Injectable({ providedIn: 'root' })\nclass YunzaiAuthService {\n  private config: YunzaiBusinessConfig;\n\n  constructor(private injector: Injector) {\n    this.config = mergeBisConfig(this.configService);\n  }\n\n  private get configService(): YunzaiConfigService {\n    return this.injector.get(YunzaiConfigService);\n  }\n\n  private get tokenService(): ITokenService {\n    return this.injector.get(YA_SERVICE_TOKEN);\n  }\n\n  private get httpClient(): _HttpClient {\n    return this.injector.get(_HttpClient);\n  }\n\n  private get cacheService(): CacheService {\n    return this.injector.get(CacheService);\n  }\n\n  askToken(): Observable<ITokenModel> {\n    log('yz.auth.service: ', 'askToken');\n    // if (this.tokenService.get()?.token) {\n    //   const notCovertToken = this.tokenService.get();\n    //   let convertedToken: ITokenModel;\n    //   if (notCovertToken && notCovertToken['access_token']) {\n    //     convertedToken = {\n    //       token: notCovertToken['access_token'],\n    //       expired: notCovertToken['expires_in'],\n    //       refreshToken: notCovertToken['refresh_token'],\n    //       scope: notCovertToken['scope'],\n    //       tokenType: notCovertToken['token_type']\n    //     };\n    //     return of(convertedToken);\n    //   } else {\n    //     return of(this.tokenService.get()!);\n    //   }\n    // } else {\n    if (this.config.loginForm) {\n      return this.fetchTokenByUP();\n    } else {\n      return this.fetchTokenByCas();\n    }\n    // }\n  }\n\n  fetchTokenByUP(): Observable<ITokenModel> {\n    log('yz.auth.service: ', 'fetchTokenByUP');\n    return this.httpClient.post(`/auth/oauth/token?_allow_anonymous=true`, this.config.loginForm).pipe(\n      map((response: any) => {\n        const { access_token, expires_in, refresh_token, scope, token_type } = response;\n        return {\n          token: access_token,\n          expired: expires_in,\n          refreshToken: refresh_token,\n          tokenType: token_type,\n          scope\n        };\n      })\n    );\n  }\n\n  fetchTokenByCas(): Observable<ITokenModel> {\n    log('yz.auth.service: ', 'fetchTokenByCas');\n    const uri = encodeURIComponent(this.injector.get(WINDOW).location.href);\n    return this.httpClient\n      .get(`/cas-proxy/app/validate_full?callback=${uri}&_allow_anonymous=true&timestamp=${new Date().getTime()}`)\n      .pipe(\n        map((response: any) => {\n          // 查看缓存中的用户是否与token验证回的用户id相同，如果不同则缓存为过期缓存，进行清除\n          if (response && response.userId) {\n            const user = this.cacheService.get('_yz_user', { mode: 'none' });\n            if (user && user.id && user.id !== response.userId) {\n              this.cacheService.clear();\n            }\n          }\n          switch (response.errcode) {\n            case 2000:\n              const { access_token, expires_in, refresh_token, scope, token_type } = response.data;\n              return {\n                token: access_token,\n                expired: expires_in,\n                refreshToken: refresh_token,\n                tokenType: token_type,\n                scope\n              } as ITokenModel;\n            case 2001:\n              this.injector.get(WINDOW).location.href = response.msg;\n              throw Error(\"Cookie Error: Can't find Cas Cookie,So jump to login!\");\n            default:\n              if (response.data) {\n                console.error(response.data);\n                throw Error(response.data);\n              } else if (response.msg) {\n                console.error(response.msg);\n                throw Error(response.msg);\n              } else {\n                console.error('cas unknown error');\n                throw Error('Unknown Error: Cas auth exception!');\n              }\n          }\n        })\n      );\n  }\n\n  login(): Observable<void> {\n    log('yz.auth.service: ', 'login white login form->', this.config.loginForm);\n    return this.askToken().pipe(\n      mergeMap(token => {\n        log('yz.auth.service: get token->', token);\n        this.configService.set('auth', {\n          token_send_key: 'Authorization',\n          token_send_template: `${token.tokenType} \\${token}`,\n          token_send_place: 'header'\n        });\n        log('yz.auth.service: ', 'set token');\n        this.tokenService.set(token);\n        return this.cacheInit();\n      }),\n      mergeAll()\n    );\n  }\n\n  cacheInit(): Observable<void[]> {\n    log('yz.auth.service: ', 'cacheInit');\n    const tenant = this.cacheService.get('_yz_tenant', { mode: 'none' });\n    const user = this.cacheService.get('_yz_user', { mode: 'none' });\n    const header = this.cacheService.get('_yz_header', { mode: 'none' });\n    const project = this.cacheService.get('_yz_project_info', { mode: 'none' });\n    return forkJoin(of(user), of(header), of(project)).pipe(\n      mergeMap(([u, h, p]) => {\n        let list = [];\n        // user cache\n        if (!u || !tenant) {\n          log('yz.auth.service: ', 'fetch user cache');\n          list.push(\n            this.httpClient.get(`/auth/user`).pipe(\n              map((user: any) => {\n                this.cacheService.set('_yz_tenant', user.tenantId);\n                this.cacheService.set('_yz_user', user.principal);\n              })\n            )\n          );\n        } else {\n          log('yz.auth.service: ', 'user recache');\n          list.push(of<any>(() => {}));\n        }\n        // header cache\n        if (!h) {\n          log('yz.auth.service: ', 'fetch header cache');\n          list.push(\n            this.httpClient.get(`/auth/allheader/v2`).pipe(\n              map((header: any) => {\n                this.cacheService.set('_yz_header', header.data);\n              })\n            )\n          );\n        } else {\n          log('yz.auth.service: ', 'header recache');\n          list.push(of<any>(() => {}));\n        }\n        // project cache\n        if (!p) {\n          log('yz.auth.service: ', 'fetch project cache');\n          list.push(\n            this.httpClient.get(`/app-manager/project/info`).pipe(\n              map((info: any) => {\n                this.cacheService.set('_yz_project_info', info.data);\n              })\n            )\n          );\n        } else {\n          log('yz.auth.service: ', 'project recache');\n          list.push(of<any>(() => {}));\n        }\n        return forkJoin(list);\n      })\n    );\n  }\n}\n\nexport { YunzaiAuthService as YzAuthService, YunzaiAuthService };\n"]}

package/fesm2015/layout.mjs

@@ -1850,12 +1850,29 @@ class YunzaiAuthService {
     }
     askToken() {
         log$1('yz.auth.service: ', 'askToken');
+        // if (this.tokenService.get()?.token) {
+        //   const notCovertToken = this.tokenService.get();
+        //   let convertedToken: ITokenModel;
+        //   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()!);
+        //   }
+        // } else {
         if (this.config.loginForm) {
             return this.fetchTokenByUP();
         }
         else {
             return this.fetchTokenByCas();
         }
+        // }
     }
     fetchTokenByUP() {
         log$1('yz.auth.service: ', 'fetchTokenByUP');
@@ -1876,15 +1893,16 @@ class YunzaiAuthService {
         return this.httpClient
             .get(`/cas-proxy/app/validate_full?callback=${uri}&_allow_anonymous=true&timestamp=${new Date().getTime()}`)
             .pipe(map$1((response) => {
-            var _a;
+            // 查看缓存中的用户是否与token验证回的用户id相同，如果不同则缓存为过期缓存，进行清除
+            if (response && response.userId) {
+                const user = this.cacheService.get('_yz_user', { mode: 'none' });
+                if (user && user.id && user.id !== response.userId) {
+                    this.cacheService.clear();
+                }
+            }
             switch (response.errcode) {
                 case 2000:
                     const { access_token, expires_in, refresh_token, scope, token_type } = response.data;
-                    // 如果token不一致，清除缓存
-                    const token = (_a = this.tokenService.get()) === null || _a === void 0 ? void 0 : _a.token;
-                    if (token && access_token && token !== access_token) {
-                        this.cacheService.clear();
-                    }
                     return {
                         token: access_token,
                         expired: expires_in,