Merge branch 'master' into feat/mr-detail

Author: uniquemo

README.md

@@ -0,0 +1,11 @@
+# coding-hbuilderx 
+
+## Development
+
+1. start dev mode.
+
+```console
+yarn watch
+```
+
+2. click run plugin option in hbuilder.

package.json

@@ -1,9 +1,9 @@
 {
   "name": "coding-hbuilderx",
-  "description": "your extension description",
-  "displayName": "your extension display name",
-  "version": "0.0.0",
-  "publisher": "your name",
+  "description": "",
+  "displayName": "CODING 代码仓库插件",
+  "version": "1.0.0",
+  "publisher": "coding",
   "engines": {
     "HBuilderX": "^2.7.0"
   },
@@ -89,6 +89,25 @@
           "title": "CODING 合并请求详情"
         }
       ]
+    },
+    "configuration": {
+      "type": "object",
+      "title": "CODING 代码仓库插件配置",
+      "properties": {
+        "codingPlugin.email": {
+          "type": "string",
+          "description": "CODING 用户邮箱"
+        },
+        "codingPlugin.token": {
+          "type": "string",
+          "description": "CODING 服务令牌，请勿擅自更改"
+        },
+        "codingPlugin.hbToken": {
+          "type": "string",
+          "description": "请勿修改"
+        }
+
+      }
     }
   },
   "extensionDependencies": [

src/extension.ts

@@ -4,6 +4,7 @@ import WebviewProvider from './webviews';
 import ACTIONS, { dispatch } from './utils/actions';
 import { proxyCtx } from './utils/proxy';
 import toast from './utils/toast';
+import { readConfig } from './services/dcloud';
 
 // const accessToken = '7e4d9d17f87875e731d536d13635a700ddf52b12';
 // const user = {
@@ -31,6 +32,10 @@ async function activate(context: IContext) {
 
   const repoInfo = await CodingServer.getRepoParams();
   console.log('repoInfo ==> ', repoInfo);
+  const token = await readConfig(`token`);
+  if (!token) {
+    toast.warn(`请先登录 CODING`);
+  }
 
   const codingServer = new CodingServer(
     {
@@ -49,6 +54,8 @@ async function activate(context: IContext) {
       codingServer,
       depots: [],
       selectedDepot: null,
+      token,
+      repoInfo,
     },
   });
 

src/init.ts

@@ -6,6 +6,7 @@ import MRCustomEditorProvider from './customEditors/mergeRequest';
 import toast from './utils/toast';
 import ACTIONS, { dispatch } from './utils/actions';
 import { IDepot, IMRItem } from './typings/common';
+import * as DCloudService from './services/dcloud';
 
 const { registerCommand } = hx.commands;
 
@@ -100,8 +101,29 @@ export function registerCustomEditors(context: IContext) {
   });
 }
 
+async function initCredentials(context: IContext) {
+  try {
+    let hbToken = await DCloudService.readConfig(`hbToken`);
+    if (!hbToken) {
+      const code = await DCloudService.grantForUserInfo();
+      const tokenResult = await DCloudService.applyForToken(code);
+      hbToken = tokenResult.data.access_token;
+    }
+    const resp = await DCloudService.fetchUser(hbToken);
+    toast.info(`logged in as DCloud user: ${resp.data.nickname} ${resp.data.email}`);
+    const {
+      ctx: { codingServer, repoInfo, token },
+    } = context;
+    const userData = await codingServer.getUserInfo(repoInfo.team, token);
+    toast.info(`logged in as coding user: ${userData.name} @ ${userData.team}`);
+  } catch (err) {
+    console.error(err);
+  }
+}
+
 export default function init(context: IContext) {
   registerCommands(context);
   createTreeViews(context);
   workspaceInit();
+  initCredentials(context);
 }

src/services/codingServer.ts

@@ -49,9 +49,13 @@ export default class CodingServer {
       const result = await axios({
         method: 'get',
         url: `https://${team}.coding.net/api/current_user`,
-        headers: this.getHeaders(),
+        headers: this.getHeaders(token),
       });
 
+      if (result.code) {
+        return Promise.reject(result);
+      }
+
       return result?.data;
     } catch (err) {
       console.error(err);

src/services/dcloud.ts

@@ -0,0 +1,89 @@
+import hx from 'hbuilderx';
+
+import axios from '../utils/axios';
+import { ITokenResponse, IDCloudUser, ITokenType, IOAuthResponse } from '../typings/common';
+
+const appSecret = `dnGxdvWuEwOO3VimZwo1IsqfESam7k`;
+export const appId = `crvUAM0Snz`;
+
+export const applyForToken = async (code: string | null) => {
+  try {
+    if (!code) {
+      throw new Error(`no code provided.`);
+    }
+
+    const resp: ITokenResponse = await axios.get(`https://ide.dcloud.net.cn/dcloudOauthv2/accessToken`, {
+      params: {
+        code,
+        appid: appId,
+        app_secret: appSecret,
+      },
+    });
+
+    if (resp.ret) {
+      return Promise.reject(resp);
+    }
+
+    await setConfig(`hbToken`, resp.data.access_token);
+    return resp;
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
+export const fetchUser = async (accessToken: string) => {
+  try {
+    const resp: IDCloudUser = await axios.get(`https://ide.dcloud.net.cn/dcloudOauthv2/userInfo`, {
+      params: {
+        access_token: accessToken,
+      },
+    });
+
+    if (resp.ret) {
+      return Promise.reject(resp);
+    }
+
+    if (!resp.data.email) {
+      return Promise.reject(resp);
+    }
+
+    await setConfig(`email`, resp.data.email);
+    return resp;
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
+export const setConfig = async (prop: string, value: string) => {
+  const codingPlugin = hx.workspace.getConfiguration(`codingPlugin`);
+  try {
+    await codingPlugin.update(prop, value);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+export const readConfig = async (prop: string) => {
+  const codingPlugin = hx.workspace.getConfiguration(`codingPlugin`);
+  const token = codingPlugin.get(prop, ``);
+  return token;
+};
+
+export const grantForUserInfo = (): Promise<string | null> =>
+  new Promise((resolve, reject) => {
+    hx.authorize
+      .login({
+        scopes: ['basic', 'email', 'phone'],
+        appId: appId,
+      })
+      .then((param: IOAuthResponse) => {
+        const { code, error } = param;
+        if (error || !code) {
+          return reject(null);
+        }
+
+        console.log(`hbuilder oauth code: `, code);
+        return resolve(code);
+      });
+  });

src/typings/common.ts

@@ -58,3 +58,36 @@ export interface IDepot {
   svnEnabled: boolean;
   vcsType: 'git' | 'svn';
 }
+
+export interface IOAuthResponse {
+  code: string;
+  error: number;
+}
+
+export interface ITokenResponse {
+  ret: number;
+  desc: string;
+  data: {
+    access_token: string;
+    access_token_ttl: string;
+    refresh_token: string;
+    refresh_token_ttl: string;
+  };
+}
+
+export interface IDCloudUser {
+  ret: number;
+  desc: string;
+  data: {
+    nickname: string;
+    avatar: string;
+    uid: string;
+    email: string;
+    phone: string;
+  };
+}
+
+export enum ITokenType {
+  AccessToken = `accessToken`,
+  RefreshToken = `refreshToken`,
+}

src/utils/toast.ts

@@ -1,14 +1,14 @@
 import hx from 'hbuilderx';
 
-export const info = (msg: string, buttons?: string[]): Promise<string> => {
+export const info = (msg: string, buttons?: string[]) => {
   return hx.window.showInformationMessage(msg, buttons);
 };
 
-export const warn = (msg: string, buttons?: string[]): Promise<string> => {
+export const warn = (msg: string, buttons?: string[]) => {
   return hx.window.showWarningMessage(msg, buttons);
 };
 
-export const error = (msg: string, buttons?: string[]): Promise<string> => {
+export const error = (msg: string, buttons?: string[]) => {
   return hx.window.showErrorMessage(msg, buttons);
 };