WIP: token saving.

Author: cangzhang

package.json

@@ -117,6 +117,7 @@
   "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

@@ -5,7 +5,7 @@ import MRTreeDataProvider from './trees/mr';
 import toast from './utils/toast';
 import { getMRUrl } from './utils/repo';
 import ACTIONS, { dispatch } from './utils/actions';
-import { IDepot, IMRItem, IOAuthResponse } from './typings/common';
+import { IDepot, IMRItem, IOAuthResponse, ITokenType } from './typings/common';
 import * as DCloudService from './services/dcloud';
 
 const { registerCommand } = hx.commands;
@@ -62,28 +62,23 @@ export function createTreeViews(context: IContext) {
     }),
   );
 
-  hx.authorize
-    .login({
-      scopes: ['basic', 'email', 'phone'],
-      appId: DCloudService.appId,
-    })
-    .then(async (param: IOAuthResponse) => {
-      const { code, error } = param;
-      if (error) {
-        console.log(error);
-        return;
-      }
-      console.info(code);
+  initialize();
+}
 
-      try {
-        const token = await DCloudService.applyForToken(code);
-        const resp = await DCloudService.fetchUser(token.data.access_token);
-        console.info(resp);
-        toast.info(`logged in as DCloud user: ${resp.data.nickname} ${resp.data.email}`);
-      } catch (err) {
-        console.error(err);
-      }
-    });
+async function initialize() {
+  try {
+    let aToken = await DCloudService.readToken(ITokenType.AccessToken);
+    if (!aToken) {
+      const code = await DCloudService.grantForUserInfo();
+      const tokenResult = await DCloudService.applyForToken(code);
+      aToken = tokenResult.data.access_token;
+    }
+    const resp = await DCloudService.fetchUser(aToken);
+    console.info(resp);
+    toast.info(`logged in as DCloud user: ${resp.data.nickname} ${resp.data.email}`);
+  } catch (err) {
+    console.error(err);
+  }
 }
 
 export function workspaceInit() {

src/services/dcloud.ts

@@ -1,11 +1,18 @@
+import keytar from 'keytar';
+import hx from 'hbuilderx';
+
 import axios from '../utils/axios';
-import { ITokenResponse, IDCloudUser } from '../typings/common';
+import { ITokenResponse, IDCloudUser, ITokenType, IOAuthResponse } from '../typings/common';
 
 const appSecret = `eLEDnBuT258P1OmRx1OVFSCj4SZXom`;
 export const appId = `gZTr3CuevT`;
 
-export const applyForToken = async (code: string) => {
+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,
@@ -17,6 +24,9 @@ export const applyForToken = async (code: string) => {
     if (resp.ret) {
       return Promise.reject(resp);
     }
+
+    await keytar.setPassword(appId, ITokenType.AccessToken, resp.data.access_token);
+    await keytar.setPassword(appId, ITokenType.RefreshToken, resp.data.refresh_token);
     return resp;
   } catch (e) {
     return Promise.reject(e);
@@ -39,3 +49,33 @@ export const fetchUser = async (accessToken: string) => {
     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);
+  }
+
+  return val;
+};
+
+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);
+        }
+
+        return resolve(code);
+      });
+  });

src/typings/common.ts

@@ -84,3 +84,8 @@ export interface IDCloudUser {
     phone: string;
   };
 }
+
+export enum ITokenType {
+  AccessToken = `accessToken`,
+  RefreshToken = `refreshToken`,
+}