Merge pull request cangzhang#10 from cangzhang/feat/depot-api

feat: complete create team logic, optimize auth logic

Author: uniquemo

src/extension.ts

@@ -1,4 +1,4 @@
-import init from './init';
+import initialize from './initialize';
 import CodingServer from './services/codingServer';
 import WebviewProvider from './webviews';
 import ACTIONS, { dispatch } from './utils/actions';
@@ -7,19 +7,12 @@ import toast from './utils/toast';
 import { readConfig } from './services/dcloud';
 
 async function activate(context: IContext) {
-  // TODO: 认证，拿到用户信息
   const webviewProvider = new WebviewProvider(context);
-
   const repoInfo = await CodingServer.getRepoParams();
-  console.log('repoInfo ==> ', repoInfo);
+  console.log('repoInfo: ', repoInfo);
   const token = await readConfig(`token`);
-  if (!token) {
-    toast.warn(`请先登录 CODING`);
-  }
 
-  const codingServer = new CodingServer({
-    accessToken: token,
-  });
+  const codingServer = new CodingServer(context);
 
   dispatch(ACTIONS.SET_CTX, {
     context,
@@ -36,7 +29,7 @@ async function activate(context: IContext) {
   });
 
   proxyCtx(context);
-  init(context);
+  initialize(context);
 }
 
 function deactivate() {

src/init.ts

@@ -0,0 +1,34 @@
+import hx from 'hbuilderx';
+import DepotTreeDataProvider from '../trees/depot';
+import MRTreeDataProvider from '../trees/mr';
+import DepotMRTreeDataProvider from '../trees/depotMR';
+
+const { createTreeView } = hx.window;
+
+const TREE_VIEWS = [
+  {
+    id: 'codingPlugin.treeMR',
+    treeDataProvider: MRTreeDataProvider,
+  },
+  {
+    id: 'codingPlugin.treeDepot',
+    treeDataProvider: DepotTreeDataProvider,
+  },
+  {
+    id: 'codingPlugin.treeDepotMR',
+    treeDataProvider: DepotMRTreeDataProvider,
+  },
+];
+
+function createTreeViews(context: IContext) {
+  TREE_VIEWS.forEach(({ id, treeDataProvider }) => {
+    context.subscriptions.push(
+      createTreeView(id, {
+        showCollapseAll: false,
+        treeDataProvider: new treeDataProvider(context),
+      }),
+    );
+  });
+}
+
+export default createTreeViews;

src/init/createTreeViews.ts

@@ -0,0 +1,40 @@
+import hx from 'hbuilderx';
+import * as DCloudService from '../services/dcloud';
+import toast from '../utils/toast';
+import { refreshTree } from './registerCommands';
+
+const { executeCommand } = hx.commands;
+
+export async function initCredentials(context: IContext) {
+  try {
+    let hbToken = await DCloudService.readConfig(`hbToken`);
+    const token = await DCloudService.readConfig(`token`);
+
+    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}`);
+
+    if (!token) {
+      await executeCommand('codingPlugin.createTeam');
+    }
+
+    const {
+      ctx: { codingServer, token: accessToken },
+    } = context;
+    if (accessToken) {
+      const userData = await codingServer.getUserInfo(accessToken);
+      toast.info(`logged in as CODING user: ${userData.name} @ ${userData.team}`);
+    }
+  } catch (err) {
+    if (Number(err) === 1) {
+      toast.warn(`请先登录 DCloud`);
+    }
+  } finally {
+    refreshTree();
+  }
+}

src/init/initCredentials.ts

@@ -0,0 +1,15 @@
+import hx from 'hbuilderx';
+import { refreshTree } from './registerCommands';
+
+const { onUserLogin, onUserLogout } = hx.authorize;
+
+export default function initLoginLogout(context: IContext) {
+  onUserLogin(() => {
+    console.warn('login');
+    refreshTree();
+  });
+
+  onUserLogout(() => {
+    console.warn('logout');
+  });
+}

src/init/initLoginLogout.ts

@@ -0,0 +1,15 @@
+import hx from 'hbuilderx';
+import CodingServer from '../services/codingServer';
+import ACTIONS, { dispatch } from '../utils/actions';
+
+function initWorkspace(context: IContext) {
+  hx.workspace.onDidChangeWorkspaceFolders(async function () {
+    const repoInfo = await CodingServer.getRepoParams();
+    dispatch(ACTIONS.SET_REPO_INFO, {
+      context,
+      value: repoInfo,
+    });
+  });
+}
+
+export default initWorkspace;