[fix] 从SaaS获取token限制时间一分钟，超时取消操作并提示重新重新获取

Author: lixiaolong

CHANGELOG.md

@@ -1,5 +1,9 @@
 # 更新记录
 
+## [1.0.5]
+
+- 从SaaS获取token限制时间一分钟，超时取消操作并提示重新重新获取
+
 ## [1.0.4]
 
 - 兼容 VSCode 1.70.X版本

README.md

@@ -1,14 +1,12 @@
-[![Version](https://vsmarketplacebadges.dev/version-short/xmirror.opensca.svg)](https://marketplace.visualstudio.com/items?itemName=xmirror.opensca)
-[![Downloads](https://vsmarketplacebadges.dev/downloads-short/xmirror.opensca.svg)](https://marketplace.visualstudio.com/items?itemName=xmirror.opensca)
-[![Rating](https://vsmarketplacebadges.dev/rating-star/xmirror.opensca.svg)](https://marketplace.visualstudio.com/items?itemName=xmirror.opensca)
-![License](https://img.shields.io/github/license/XmirrorSecurity/OpenSCA-VSCode-plugin)
-
 <p align="center">
 	<img alt="logo" src="https://opensca.xmirror.cn/docs/img/OpenSCAlogo.png">
 </p>
 <h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">OpenSCA Xcheck</h1>
 <h4 align="center">VS Code平台的OpenSCA Xcheck插件，让代码更安全</h4>
-
+<p align="center">
+	<a href="https://github.com/XmirrorSecurity/OpenSCA-intellij-plugin/blob/master/LICENSE"><img src="https://img.shields.io/github/license/XmirrorSecurity/OpenSCA-intellij-plugin?style=flat-square"></a>
+	<!-- <a href="https://github.com/XmirrorSecurity/OpenSCA-intellij-plugin/releases"><img src="https://img.shields.io/github/v/release/XmirrorSecurity/OpenSCA-intellij-plugin?style=flat-square"></a> -->
+</p>
 
 ---
 
@@ -20,8 +18,6 @@
 
 **安装方法一**：在[适配的VS Code](https://code.visualstudio.com/)中通过应用商店安装（推荐）
 
-> 点击这里直达 [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=xmirror.opensca)
-
 在VS Code中左边栏打开扩展->扩展的搜索框中输入“OpenSCA Xcheck”，点击“Install”
 
 <img src="https://opensca.xmirror.cn/docs/img/vscode_01.jpg" alt="xcheck_market" />

src/command/scan.ts

@@ -186,18 +186,17 @@ export default class Scan extends Utils implements IScan {
     const confJson: string = fs.readFileSync(this.defaultConfigPath, 'utf-8') || '{}';
     interface ConfType {
       path?: string;
+      token?: string;
       out?: string;
       vuln?: boolean;
       dedup?: boolean;
       progress?: boolean;
       url?: string;
-      token?: string;
       log?: string;
       origin?: any;
       maven?: any[];
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    let conf: ConfType = JSON.parse(confJson);
+    let conf: ConfType = <ConfType>JSON.parse(confJson);
     const localDataSource: object = vscode.workspace.getConfiguration('opensca').get('localDataSource') || {};
     const usingRemoteDataSource: boolean = vscode.workspace.getConfiguration('opensca').get('usingRemoteDataSource') || false;
     const usingLocalDataSource: boolean = vscode.workspace.getConfiguration('opensca').get('usingLocalDataSource') || false;

src/command/setToken.ts

@@ -20,6 +20,11 @@ export default class SetToken extends Utils implements ISetToken {
   constructor() {
     super();
   }
+
+  /**
+   * 点击设置token
+   * @returns {void}
+   */
   async toSetToken(): Promise<void> {
     Loger.info('点击设置token');
     const token = await vscode.window.showInputBox({
@@ -50,6 +55,10 @@ export default class SetToken extends Utils implements ISetToken {
       });
   }
 
+  /**
+   * 点击获取token
+   * @returns {void}
+   */
   toGetToken(): void {
     if (this.vsProgress) {
       vscode.window.showWarningMessage(`正在获取token，请耐心等待`);
@@ -73,6 +82,10 @@ export default class SetToken extends Utils implements ISetToken {
     });
   }
 
+  /**
+   * 获取token
+   * @returns {void}
+   */
   private getToken(): void {
     this.vsProgress = vscode.window.withProgress(
       {
@@ -93,32 +106,48 @@ export default class SetToken extends Utils implements ISetToken {
               ),
             5000
           );
+          // 时间过长打断操作
+          setTimeout(() => {
+            if (!this.vsProgress) {
+              return;
+            }
+            reject(false);
+            this.cancel();
+            Loger.warning('token获取超时');
+            vscode.window.showWarningMessage('token获取超时', '重新获取', '取消').then(selection => {
+              if (selection === '重新获取') {
+                vscode.commands.executeCommand(OPENSCA_GET_TOKEN_COMMAND);
+              } else if (selection === '取消') {
+                Loger.warning('点击取消了重新获取token');
+              }
+            });
+          }, 1000 * 60);
         });
       }
     );
   }
 
   /**
-   * 停止检测
+   * 取消获取token
    * @returns {void}
    */
-  cancel(): void {
+  private cancel(): void {
     if (this.vsProgress) {
       this.vsProgress.then(() => {
         Loger.info('结束获取 OSS Token.');
       });
       this.vsProgress = undefined;
     }
-    this.clearInterval();
-  }
-
-  private clearInterval() {
     if (this.interval) {
       clearInterval(this.interval);
       this.interval = null;
     }
   }
 
+  /**
+   * 从服务端自动获取token
+   * @returns {void}
+   */
   private async autoGetTokenService(resolve: { (): void }, reject: { (): void }) {
     const res: TokenResponseType = await Service.ossToken(this.tokenId);
     if (isObject(res) && res.code !== 0) {
@@ -141,7 +170,6 @@ export default class SetToken extends Utils implements ISetToken {
           vscode.commands.executeCommand(OPENSCA_GET_TOKEN_COMMAND);
         }
       });
-      this.cancel();
     }
 
     if (code !== 200) {

src/common/utils.ts

@@ -151,8 +151,7 @@ export default class Utils {
     } else {
       return {};
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const outputRes: ReportType = JSON.parse(outputJson);
+    const outputRes: ReportType = <ReportType>JSON.parse(outputJson);
     return outputRes.task_info;
   }
 
@@ -164,8 +163,7 @@ export default class Utils {
     } else {
       return [];
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const outputRes: ReportType = JSON.parse(outputJson);
+    const outputRes: ReportType = <ReportType>JSON.parse(outputJson);
     const list: ComponentDataType[] = outputRes.children || [];
 
     const _uniqWith = (list: ComponentDataType[]) => {