fix: 修复Code服务接入

Author: wangxiaojuan

packages/code-api/src/code-api.provider.ts

@@ -10,7 +10,7 @@ import {
 import { IMainLayoutService } from '@opensumi/ide-main-layout';
 import { ICodePlatform, ICodeAPIProvider, ICodeAPIService, CodePlatform } from './common/types';
 import { AntCodeAPIService } from './antcode/antcode.service';
-import { CodeAPIService } from './antcode/code.service';
+import CodeAPIService from './code/code.service';
 import { GitHubAPIService } from './github/github.service';
 import { GitLabAPIService } from './gitlab/gitlab.service';
 import { GitLinkAPIService } from './gitlink/gitlink.service';

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

@@ -16,7 +16,7 @@ const webgwRequestOpts = {
 /**
  * 小程序云Code
  */
-export default class CodeApiService extends AntCodeAPIService {
+export default class CodeAPIService extends AntCodeAPIService {
   config = CODE_PLATFORM_CONFIG[CodePlatform.code];
 
   protected async request<T>(
@@ -34,16 +34,14 @@ export default class CodeApiService extends AntCodeAPIService {
         baseURL: endpoint,
         credentials: 'include',
         responseType: 'json',
-        ...(privateToken
-          ? {
-              ...options,
-              headers: {
-                'PRIVATE-TOKEN': privateToken,
-                ...webgwRequestOpts,
-                ...options?.headers,
-              },
-            }
-          : options),
+        ...options,
+        ...({
+          headers: {
+            ...(privateToken ? { 'PRIVATE-TOKEN': privateToken } : {}),
+            ...options?.headers,
+            ...webgwRequestOpts,
+          },
+        }),
       });
       return data;
     } catch (err: any) {
@@ -58,10 +56,10 @@ export default class CodeApiService extends AntCodeAPIService {
           const goto = localize('api.login.goto');
           this.helper
             .showMessage(
-              CodePlatform.antcode,
+              CodePlatform.code,
               {
                 type: MessageType.Error,
-                symbol: 'api.response.no-login-antcode',
+                symbol: 'api.response.no-login-code',
                 status: 401,
               },
               {
@@ -96,46 +94,11 @@ export default class CodeApiService extends AntCodeAPIService {
     }
   }
 
-  private getProjectIdByRepo(repo: IRepositoryModel) {
-    return `${repo.owner}%2F${repo.name}`;
-  }
-
-  /*
-   * 获取两个分支 的共同祖先
-   * 类似于 git merge-base branch1 branch2
-   * 接口暂时只支持查询两个分支
-   */
-  async mergeBase(
+  mergeBase(
     repo: IRepositoryModel,
     target: string,
     source: string
   ): Promise<API.ResponseCommit> {
-    let url = `/tcloudantcodeweb/api/v4/projects/${this.getProjectIdByRepo(
-      repo
-    )}/repository/merge_base?refs[]=${target}&refs[]=${source}`;
-    if (this.config.endpoint) {
-      url = createUrl(this.config.endpoint, url);
-    }
-    const urlInstance = new URL(url, location.origin);
-    const privateToken = this.PRIVATE_TOKEN;
-    return (
-      await fetch(urlInstance.toString(), {
-        method: 'GET',
-        ...(privateToken
-          ? {
-              headers: {
-                'PRIVATE-TOKEN': privateToken,
-                'Content-Type': 'application/json',
-                ...webgwRequestOpts
-              },
-            }
-          : {
-              headers: {
-                'Content-Type': 'application/json',
-                ...webgwRequestOpts
-              },
-            }),
-      })
-    ).json();
+    throw new Error('Method not implemented.');
   }
 }

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

@@ -48,7 +48,7 @@ export const CODE_PLATFORM_CONFIG: Record<ICodePlatform, ICodePlatformConfig> =
   [CodePlatform.code]: {
     platform: CodePlatform.code,
     hostname: [],
-    origin: 'https://twebgwnet.alipay.com',
+    origin: 'https://code.cloud.alipay.com',
     endpoint: 'https://twebgwnet.alipay.com',
     brand: 'Code',
     line: {

packages/i18n/src/en-US.ts

@@ -25,6 +25,8 @@ export const localizationBundle = {
     'api.response.project-no-access': 'No access to project',
     'api.response.no-login-antcode':
       'Login to antcode is expired, please refresh page if you are logged in',
+    'api.response.no-login-code':
+      'Login to Code is expired, please refresh page if you are logged in',
     'api.login.goto': 'Go to login',
     'error.unknown': 'Unknown Error',
     'error.request': 'Request Error',

packages/i18n/src/zh-CN.ts

@@ -24,6 +24,7 @@ export const localizationBundle = {
     'api.response.project-not-found': '{0} 不存在',
     'api.response.project-no-access': '无权限访问项目',
     'api.response.no-login-antcode': 'antcode 登录已失效，如已登录请刷新页面',
+    'api.response.no-login-code': 'code 登录已失效，如已登录请刷新页面',
     'api.login.goto': '前往登录',
     'error.unknown': '未知错误',
     'error.request': '请求错误',