Merge pull request #260 from opensumi/v2.4

chore(release): release v2.4.4

Author: hacke2

lerna.json

@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.4.3"
+  "version": "2.4.4"
 }

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-cli",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "@codeblitzjs/ide-cli",
   "main": "lib/commander.js",
   "files": [

packages/code-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-code-api",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "@codeblitzjs/ide-code-api",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

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

@@ -1,4 +1,5 @@
 import { CodePlatform, ICodePlatform } from './types';
+import merge from 'lodash/merge';
 
 export interface ICodePlatformConfig {
   platform: CodePlatform | string;
@@ -219,18 +220,7 @@ export class CodePlatformRegistry {
     if (!provider) {
       return;
     }
-    if (Array.isArray(data.hostname)) {
-      provider.hostname.push(...data.hostname);
-    }
-    if (data.origin) {
-      provider.origin = data.origin;
-    }
-    if (data.endpoint) {
-      provider.endpoint = data.endpoint;
-    }
-    if (data.token) {
-      provider.token = data.token;
-    }
+    merge(provider, data);
   }
 
   load(configs: Record<string, ICodePlatformConfig>) {

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

@@ -52,7 +52,7 @@ export class GiteeAPIService implements ICodeAPIService {
 
   private redirectUrl = this.config.redirectUrl;
 
-  private client_id = '';
+  private client_id = this.config.clientId;
 
   get PRIVATE_TOKEN() {
     if (!this._PRIVATE_TOKEN) {
@@ -104,9 +104,64 @@ export class GiteeAPIService implements ICodeAPIService {
     throw new Error('Method not implemented.');
   }
 
+  private sleep(t: number) {
+    return new Promise(res => {
+      setTimeout(() => {
+        res(undefined);
+      }, t);
+    });
+  }
+
   private async checkAccessToken(): Promise<boolean> {
     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}/oauth/authorize?client_id=${this.client_id}&response_type=code&redirect_uri=${this.redirectUrl}`,
+          '_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;
+          if (isObject(data) && data.type === 'gitee') {
+            const {
+              data: { token },
+            } = data;
+            popupWindow?.close();
+            if (!token) {
+              resolve(false);
+              return;
+            }
+
+            // 清理过期的 token；
+            this.clearToken();
+
+            this.helper.GITEE_TOKEN = token;
+            this.helper.reinitializeCodeService(true);
+            if(this.helper.GITEE_TOKEN){
+              // 需重新加载否则scm插件报错
+              window.location.reload();
+            }
+            resolve(true);
+          }
+        } catch (error) {
+          console.log(error);
+          reject(error);
+        }
+      };
+      window.addEventListener('message', handleMessage);
     });
   }
 
@@ -470,6 +525,6 @@ export class GiteeAPIService implements ICodeAPIService {
 
   clearToken() {
     this._PRIVATE_TOKEN = null;
-    this.helper.ATOMGIT_TOKEN = null;
+    this.helper.GITEE_TOKEN = null;
   }
 }

packages/code-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-code-service",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "@codeblitzjs/ide-code-service",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-common",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "@codeblitzjs/ide-common",
   "main": "lib/index.js",
   "typing": "lib/index.d.ts",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-core",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "@codeblitzjs/ide-core",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-i18n",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "@codeblitzjs/ide-i18n",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-plugin",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "@codeblitzjs/ide-plugin",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

packages/registry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-registry",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "@codeblitzjs/ide-registry",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

packages/startup/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-startup",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "@codeblitzjs/ide-startup",
   "main": "lib/index.js",
   "typing": "types/index.d.ts",

packages/sumi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-sumi-core",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "core",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

packages/toolkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeblitzjs/ide-toolkit",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "@codeblitzjs/ide-toolkit",
   "main": "index.js",
   "files": [