feat(auth): read credentials from editor config.

Author: cangzhang

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "codingplugin",
+  "name": "coding-hbuilderx",
   "description": "",
   "displayName": "CODING 代码仓库插件",
   "version": "1.0.0",
@@ -91,6 +91,25 @@
           "title": "WEBVIEW"
         }
       ]
+    },
+    "configuration": {
+      "type": "object",
+      "title": "CODING 代码仓库插件配置",
+      "properties": {
+        "codingPlugin.email": {
+          "type": "string",
+          "description": "CODING 用户邮箱"
+        },
+        "codingPlugin.token": {
+          "type": "string",
+          "description": "CODING 服务令牌，请勿擅自更改"
+        },
+        "codingPlugin.hbToken": {
+          "type": "string",
+          "description": "请勿修改"
+        }
+
+      }
     }
   },
   "extensionDependencies": [
@@ -117,7 +136,6 @@
   "dependencies": {
     "axios": "^0.21.0",
     "isomorphic-git": "^1.8.0",
-    "keytar": "^7.1.0",
     "querystring": "^0.2.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1"

src/init.ts

@@ -67,13 +67,14 @@ export function createTreeViews(context: IContext) {
 
 async function initialize() {
   try {
-    let aToken = await DCloudService.readToken(ITokenType.AccessToken);
-    if (!aToken) {
+    let hbToken = await DCloudService.readToken(`hbToken`);
+    console.log(`hb token: ${hbToken}`);
+    if (!hbToken) {
       const code = await DCloudService.grantForUserInfo();
       const tokenResult = await DCloudService.applyForToken(code);
-      aToken = tokenResult.data.access_token;
+      hbToken = tokenResult.data.access_token;
     }
-    const resp = await DCloudService.fetchUser(aToken);
+    const resp = await DCloudService.fetchUser(hbToken);
     console.info(resp);
     toast.info(`logged in as DCloud user: ${resp.data.nickname} ${resp.data.email}`);
   } catch (err) {

src/services/dcloud.ts

@@ -1,4 +1,3 @@
-import keytar from 'keytar';
 import hx from 'hbuilderx';
 
 import axios from '../utils/axios';
@@ -25,8 +24,7 @@ export const applyForToken = async (code: string | null) => {
       return Promise.reject(resp);
     }
 
-    await keytar.setPassword(appId, ITokenType.AccessToken, resp.data.access_token);
-    await keytar.setPassword(appId, ITokenType.RefreshToken, resp.data.refresh_token);
+    await setConfig(`hbToken`, resp.data.access_token);
     return resp;
   } catch (e) {
     return Promise.reject(e);
@@ -44,23 +42,32 @@ export const fetchUser = async (accessToken: string) => {
     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 setToken = async (name: ITokenType, value: string) => {
-  return await keytar.setPassword(appId, name, value);
-};
-
-export const readToken = async (name: ITokenType) => {
-  const val = await keytar.getPassword(appId, name);
-  if (!val) {
-    return Promise.reject(null);
+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;
   }
+};
 
-  return val;
+export const readToken = async (prop: string) => {
+  const codingPlugin = hx.workspace.getConfiguration(`codingPlugin`);
+  const token = codingPlugin.get(prop, ``);
+  return token;
 };
 
 export const grantForUserInfo = (): Promise<string | null> =>
@@ -76,6 +83,7 @@ export const grantForUserInfo = (): Promise<string | null> =>
           return reject(null);
         }
 
+        console.log(`hbuilder oauth code: `, code);
         return resolve(code);
       });
   });