feat: add userInfo to context

Author: uniquemo

src/extension.ts

@@ -6,29 +6,9 @@ import { proxyCtx } from './utils/proxy';
 import toast from './utils/toast';
 import { readConfig } from './services/dcloud';
 
-// const accessToken = '7e4d9d17f87875e731d536d13635a700ddf52b12';
-// const user = {
-//   id: 8005956,
-//   avatar: 'https://coding-net-production-static-ci.codehub.cn/WM-TEXT-AVATAR-lvVeBfbGLtCPdcsAOPod.jpg',
-//   global_key: 'PDCOwrBjib',
-//   name: 'uniquemo',
-//   path: '/u/PDCOwrBjib',
-//   team: 'uniquemo',
-// };
-
-const accessToken = '6e15bbb9960810111c90086a6efc07a923dea5a3';
-const user = {
-  id: 8003868,
-  avatar: 'https://coding-net-production-static-ci.codehub.cn/WM-TEXT-AVATAR-lvVeBfbGLtCPdcsAOPod.jpg',
-  global_key: 'dHzOCagiSb',
-  name: '莫泳欣',
-  path: '/u/dHzOCagiSb',
-  team: 'codingcorp',
-};
-
 async function activate(context: IContext) {
   // TODO: 认证，拿到用户信息
-  const webviewProvider = new WebviewProvider();
+  const webviewProvider = new WebviewProvider(context);
 
   const repoInfo = await CodingServer.getRepoParams();
   console.log('repoInfo ==> ', repoInfo);
@@ -39,10 +19,7 @@ async function activate(context: IContext) {
 
   const codingServer = new CodingServer(
     {
-      id: 'abc',
-      user,
-      accessToken,
-      refreshToken: 'abc',
+      accessToken: token,
     },
     repoInfo,
   );
@@ -55,6 +32,7 @@ async function activate(context: IContext) {
       depots: [],
       selectedDepot: null,
       token,
+      userInfo: null,
       repoInfo,
     },
   });

src/init.ts

@@ -6,25 +6,26 @@ import MRCustomEditorProvider from './customEditors/mergeRequest';
 
 import toast from './utils/toast';
 import ACTIONS, { dispatch } from './utils/actions';
-import { IDepot, IMRItem } from './typings/common';
+import { IDepot, IMRItem, IUserInfo } from './typings/common';
 import * as DCloudService from './services/dcloud';
 
 const { registerCommand } = hx.commands;
 const { createTreeView } = hx.window;
 
 export function registerCommands(context: IContext) {
-  const { codingServer } = context;
+  const { codingServer, token } = context;
 
   context.subscriptions.push(
-    registerCommand('codingPlugin.mrTreeItemClick', async function ([team, mrItem]: [string, IMRItem]) {
+    registerCommand('codingPlugin.mrTreeItemClick', async function ([userInfo, mrItem]: [IUserInfo, IMRItem]) {
       const matchRes = mrItem.path.match(/\/p\/([^/]+)\/d\/([^/]+)\/git\/merge\/([0-9]+)/);
       if (matchRes) {
         const [, project, repo, mergeRequestIId] = matchRes;
         context.webviewProvider.update({
-          session: codingServer.session,
+          token,
+          userInfo,
           mergeRequestIId,
           repoInfo: {
-            team,
+            team: userInfo.team,
             project,
             repo,
           },
@@ -54,7 +55,7 @@ export function registerCommands(context: IContext) {
         return;
       }
 
-      const team = codingServer.session?.user?.team;
+      const team = context.userInfo.team;
       const result = await codingServer.createDepot(team, depot, depot);
       if (result) {
         toast.info('仓库创建成功');
@@ -125,7 +126,7 @@ async function initCredentials(context: IContext) {
     const {
       ctx: { codingServer, repoInfo, token },
     } = context;
-    const userData = await codingServer.getUserInfo(repoInfo.team, token);
+    const userData = await codingServer.getUserInfo(token);
     toast.info(`logged in as coding user: ${userData.name} @ ${userData.team}`);
   } catch (err) {
     console.error(err);

src/services/codingServer.ts

@@ -8,13 +8,12 @@ import { parseCloneUrl } from '../utils/repo';
 import toast from '../utils/toast';
 
 export default class CodingServer {
-  _session!: ISessionData;
+  _session: ISessionData;
   _repo!: IRepoInfo;
 
-  constructor(session?: ISessionData, repo?: IRepoInfo) {
-    if (session) {
-      this._session = session;
-    }
+  constructor(session: ISessionData, repo?: IRepoInfo) {
+    this._session = session;
+
     if (repo) {
       this._repo = repo;
     }
@@ -44,11 +43,11 @@ export default class CodingServer {
     }
   }
 
-  async getUserInfo(team: string, token: string = this._session?.accessToken || ``) {
+  async getUserInfo(token: string) {
     try {
       const result = await axios({
         method: 'get',
-        url: `https://${team}.coding.net/api/current_user`,
+        url: `https://e.coding.net/api/current_user`,
         headers: this.getHeaders(token),
       });
 

src/trees/depotMR.ts

@@ -7,6 +7,7 @@ import { IDepot, IMRItem, IReviewer } from '../typings/common';
 interface IItem extends ITreeItem {
   _create: boolean;
   _auth: boolean;
+  _login: boolean;
   _disabled: boolean;
   _isDepot: boolean;
 }
@@ -15,6 +16,7 @@ type IElement = IDepot & IMRItem & IItem;
 
 const getCommand = (element: IElement) => {
   if (element.children || element._disabled) return '';
+  if (element._login) return 'codingPlugin.login';
   if (element._auth) return 'codingPlugin.auth';
   if (element._create) return 'codingPlugin.createDepot';
   if (element.vcsType) return 'codingPlugin.depotTreeItemClick';
@@ -25,30 +27,36 @@ class DepotMRTreeDataProvider extends hx.TreeDataProvider {
   constructor(context: IContext) {
     super();
     this.context = context;
-  }
-
-  getUser() {
-    return this.context.codingServer.session?.user;
+    this.user = null;
   }
 
   getRepoInfo() {
-    const { selectedDepot, depots, codingServer } = this.context;
-    const user = codingServer.session?.user;
-    return getMrListParams(selectedDepot, depots, user);
+    const { selectedDepot, depots } = this.context;
+    return getMrListParams(selectedDepot, depots, this.user);
   }
 
   async getChildren(element: IElement) {
-    const user = this.getUser();
-    if (!user) {
-      toast.warn('请先绑定 CODING 账户');
+    const { codingServer, token } = this.context;
+
+    if (!this.user) {
+      this.user = await codingServer.getUserInfo(token);
+    }
+
+    if (!this.user) {
       return Promise.resolve([
         {
-          name: '绑定 CODING 账户',
-          _auth: true,
+          name: '登录 CODING',
+          _login: true,
+          _isDepot: true,
         },
       ]);
     }
 
+    dispatch(ACTIONS.SET_USER_INFO, {
+      context: this.context,
+      value: this.user,
+    });
+
     if (element) {
       return Promise.resolve(element.children);
     }
@@ -65,8 +73,10 @@ class DepotMRTreeDataProvider extends hx.TreeDataProvider {
       let reviewerList: IMRItem[] = [];
       let others = [];
       if (list) {
-        createdList = list.filter((item: IMRItem) => item.author.id === user.id);
-        reviewerList = list.filter((item: IMRItem) => item.reviewers.find((r: IReviewer) => r.reviewer.id === user.id));
+        createdList = list.filter((item: IMRItem) => item.author.id === this.user.id);
+        reviewerList = list.filter((item: IMRItem) =>
+          item.reviewers.find((r: IReviewer) => r.reviewer.id === this.user.id),
+        );
         others = list.filter((item: IMRItem) => {
           const isNotInCreatedList = createdList.findIndex((i) => i.id === item.id) === -1;
           const isNotInReviewerList = reviewerList.findIndex((i) => i.id === item.id) === -1;
@@ -91,7 +101,7 @@ class DepotMRTreeDataProvider extends hx.TreeDataProvider {
           _isDepot: true,
         },
         {
-          title: `合并请求列表（当前选中仓库 ${this.context.selectedDepot?.name || '-'}）`,
+          title: `合并请求列表（当前仓库 ${this.context.selectedDepot?.name || '-'}）`,
           children: [
             {
               title: `我创建的 (${createdList?.length})`,
@@ -126,13 +136,12 @@ class DepotMRTreeDataProvider extends hx.TreeDataProvider {
       };
     }
 
-    const user = this.getUser();
     return {
       label: element.title,
       collapsibleState: element.children ? 1 : 0,
       command: {
         command: getCommand(element),
-        arguments: [user?.team, element],
+        arguments: [this.user, element],
       },
     };
   }

src/typings/common.ts

@@ -19,10 +19,10 @@ export interface IUserInfo {
 }
 
 export interface ISessionData {
-  id: string;
-  user: IUserInfo | null;
+  id?: string;
+  user?: IUserInfo | null;
   accessToken: string;
-  refreshToken: string;
+  refreshToken?: string;
 }
 
 export interface IReviewer {

src/utils/actions.ts

@@ -1,6 +1,7 @@
 const enum ACTIONS {
   SET_DEPOTS = 'SET_DEPOTS',
   SET_SELECTED_DEPOT = 'SET_SELECTED_DEPOT',
+  SET_USER_INFO = 'SET_USER_INFO',
   SET_CTX = 'SET_CTX',
   SET_MR_CUSTOM_EDITOR = 'SET_MR_CUSTOM_EDITOR',
 }
@@ -18,6 +19,9 @@ export const dispatch = (type: ACTIONS, { context, value }: IPayload) => {
     case ACTIONS.SET_SELECTED_DEPOT:
       context.selectedDepot = value;
       break;
+    case ACTIONS.SET_USER_INFO:
+      context.userInfo = value;
+      break;
     case ACTIONS.SET_CTX:
       context.ctx = value;
       break;

src/webviews/index.ts

@@ -8,9 +8,11 @@ interface IMessage {
 }
 
 export default class WebviewProvider {
+  context: IContext;
   panel: IWebviewPanel;
 
-  constructor() {
+  constructor(context: IContext) {
+    this.context = context;
     this.panel = this.createPanel();
     this.listen();
   }

webviews/App.tsx

@@ -26,9 +26,7 @@ const toast = (msg: string) => {
 
 const App = () => {
   const data = JSON.parse(window.__CODING__);
-  const { session, repoInfo, mergeRequestIId } = data;
-  const { accessToken } = session;
-  const user = session?.user;
+  const { token: accessToken, userInfo: user, repoInfo, mergeRequestIId } = data;
   const team = user?.team;
 
   // Fix initialize isAgreed doesn't work