fix: 调整 atomgit oauth 授权交互

Author: Ricbet

packages/code-api/src/atomgit/atomgit.service.ts

@@ -39,9 +39,32 @@ export class AtomGitAPIService implements ICodeAPIService {
     this._PRIVATE_TOKEN = this.config.token || this.helper.ATOMGIT_TOKEN || '';
   }
 
+  private sleep(t: number) {
+    return new Promise(res => {
+      setTimeout(() => {
+          res(undefined)
+      }, t)
+    })
+  }
+
   private async checkAccessToken(): Promise<boolean> {
-    const popupWindow = window.open(`${this.config.origin}login/oauth/authorize?client_id=9d8b531661f441d1`, '_blank', 'directories=no,titlebar=no,toolbar=no,location=no,status=no,menubar=no,scrollbars=no,resizable=no,width=800,height=520,top=150,left=150');
-    return new Promise<boolean>((resolve, reject) => {
+    return new Promise<boolean>(async (resolve, reject) => {
+      resolve(true);
+      // 一开始就弹出弹窗会有颜色闪烁问题，先临时 sleep 处理，后面再优化
+      await this.sleep(300);
+
+      const btn = await this.helper.showDialog({
+        message: '检测到 OAuth 未授权',
+        type: MessageType.Info,
+        closable: false,
+        buttons: ['去授权']
+      });
+
+      let popupWindow;
+      if (btn === '去授权') {
+        popupWindow = window.open(`${this.config.origin}login/oauth/authorize?client_id=9d8b531661f441d1`, '_blank', 'directories=no,titlebar=no,toolbar=no,location=no,status=no,menubar=no,scrollbars=no,resizable=no,width=800,height=520,top=150,left=150');
+      }
+
       const handleMessage = async (event: MessageEvent) => {
         try {
           const { data } = event;

packages/code-api/src/common/service.ts

@@ -10,7 +10,8 @@ import {
   localize,
 } from '@opensumi/ide-core-common';
 import { ClientAppStateService } from '@opensumi/ide-core-browser';
-import { IMessageService } from '@opensumi/ide-overlay';
+import { IMessageService, IDialogService  } from '@opensumi/ide-overlay';
+import { DialogService } from '@opensumi/ide-overlay/lib/browser/dialog.service';
 import { ATOMGIT_PRIVATE_TOKEN, GITHUB_OAUTH_TOKEN, GITLAB_PRIVATE_TOKEN } from './constant';
 import { ICodePlatform } from './types';
 import { CODE_PLATFORM_CONFIG } from './config';
@@ -31,6 +32,9 @@ export class HelperService {
   @Autowired(IMessageService)
   messageService: IMessageService;
 
+  @Autowired(IDialogService)
+  public dialogService: DialogService;
+
   @Autowired(ClientAppStateService)
   stateService: ClientAppStateService;
 
@@ -120,4 +124,16 @@ export class HelperService {
       CODE_PLATFORM_CONFIG[platform].brand
     );
   }
+
+  async showDialog(
+    msg: { 
+      message: string | React.ReactNode,
+      type: MessageType,
+      buttons?: any[],
+      closable?: boolean,
+    }
+  ) {
+    const { message, type, buttons = [], closable = true } = msg;
+    return this.dialogService.open(message, type, buttons, closable);
+  }
 }

packages/toolkit/package.json

@@ -65,5 +65,6 @@
     "webpack-dev-server": "^3.11.0",
     "webpack-manifest-plugin": "^3.0.0",
     "webpack-merge": "^5.4.0"
-  }
-}
+  },
+  "repository": "git@gitlab.alipay-inc.com:cloud-ide/crew-dragon.git"
+}