feat(oauth): retrieve coding user data.

Author: cangzhang

src/extension.ts

@@ -4,6 +4,7 @@ import CodingServer from './services/codingServer';
 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 = {
@@ -21,6 +22,10 @@ async function activate(context: IContext) {
   const webviewProvider = new WebviewProvider();
   const repoInfo = await CodingServer.getRepoParams();
   console.log('repoInfo ==> ', repoInfo);
+  const token = await readConfig(`token`);
+  if (!token) {
+    toast.warn(`请先登录 CODING`);
+  }
 
   const codingServer = new CodingServer(
     {
@@ -39,6 +44,8 @@ async function activate(context: IContext) {
       codingServer,
       depots: [],
       selectedDepot: null,
+      token,
+      repoInfo,
     },
   });
 

src/init.ts

@@ -73,25 +73,6 @@ export function createTreeViews(context: IContext) {
       treeDataProvider: new DepotTreeDataProvider(context),
     }),
   );
-
-  initialize();
-}
-
-async function initialize() {
-  try {
-    let hbToken = await DCloudService.readToken(`hbToken`);
-    console.log(`hb token: ${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);
-    console.info(resp);
-    toast.info(`logged in as DCloud user: ${resp.data.nickname} ${resp.data.email}`);
-  } catch (err) {
-    console.error(err);
-  }
 }
 
 export function workspaceInit() {
@@ -110,8 +91,29 @@ export function clear(context: IContext) {
   context.subscriptions.forEach(({ dispose }) => dispose());
 }
 
+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

@@ -64,7 +64,7 @@ export const setConfig = async (prop: string, value: string) => {
   }
 };
 
-export const readToken = async (prop: string) => {
+export const readConfig = async (prop: string) => {
   const codingPlugin = hx.workspace.getConfiguration(`codingPlugin`);
   const token = codingPlugin.get(prop, ``);
   return token;

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);
 };