refactor: logout.

Author: cangzhang

package.json

@@ -32,6 +32,11 @@
         "command": "codingPlugin.login",
         "title": "Login coding.net",
         "category": "Coding plugin"
+      },
+      {
+        "command": "codingPlugin.logout",
+        "title": "Logout coding.net",
+        "category": "Coding plugin"
       }
     ],
     "viewsWelcome": [

src/coding.ts

@@ -62,9 +62,10 @@ export class CodingAuthenticationProvider {
     return null;
   }
 
-  public async getSessionData(accessToken: TokenType.AccessToken, refreshToken: TokenType.RefreshToken): Promise<SessionData | null> {
+  public async getSessionData(accessToken: TokenType.AccessToken, refreshToken: TokenType.RefreshToken): Promise<SessionData> {
     try {
-      const { data: userInfo } = await this._codingServer.getUserInfo(this._repo.team, accessToken);
+      const result = await this._codingServer.getUserInfo(this._repo.team, accessToken);
+      const { data: userInfo } = result;
       const ret: SessionData = {
         id: nanoid(),
         user: userInfo,
@@ -75,24 +76,41 @@ export class CodingAuthenticationProvider {
       vscode.window.showInformationMessage(`USER ${userInfo.name} @ TEAM ${userInfo.team}`);
       return ret;
     } catch (err) {
-      return null;
+      console.error(err);
+      throw new Error(err);
     }
   }
 
   public async login(team: string, scopes: string = SCOPES): Promise<SessionData | null> {
     const { access_token: accessToken, refresh_token: refreshToken } = await this._codingServer.login(team, scopes);
     if (accessToken && refreshToken) {
-      const session = await this.getSessionData(accessToken, refreshToken);
-      await Promise.all([
-        keychain.setToken(accessToken, TokenType.AccessToken),
-        keychain.setToken(refreshToken, TokenType.RefreshToken),
-      ]);
-      return session;
+      try {
+        const session = await this.getSessionData(accessToken, refreshToken);
+        await Promise.all([
+          keychain.setToken(accessToken, TokenType.AccessToken),
+          keychain.setToken(refreshToken, TokenType.RefreshToken),
+        ]);
+        return session;
+      } catch (e) {
+        throw new Error(e);
+      }
     }
 
     return null;
   }
 
+  public async logout() {
+    try {
+      await Promise.all([
+        keychain.deleteToken(TokenType.AccessToken),
+        keychain.deleteToken(TokenType.RefreshToken),
+      ]);
+      return true;
+    } catch (e) {
+      throw Error(e)
+    }
+  }
+
   get session() {
     return this._session;
   }

src/codingServer.ts

@@ -2,7 +2,8 @@ import * as vscode from 'vscode';
 import { nanoid } from 'nanoid';
 import got from 'got';
 
-import { AuthFailResult, AuthSuccessResult, UserResponse } from './typings/respResult';
+import gotInstance from './common/request';
+import { AuthFailResult, AuthSuccessResult, CodingResponse, UserResponse } from './typings/respResult';
 import { PromiseAdapter, promiseFromEvent, parseQuery, parseCloneUrl } from './common/utils';
 import { GitService } from './common/gitService';
 import { RepoInfo, SessionData } from './typings/commonTypes';
@@ -105,14 +106,20 @@ export class CodingServer {
 
   public async getUserInfo(team: string, token: string = this._session?.accessToken) {
     try {
-      const result: UserResponse = await got.get(`https://${team}.coding.net/api/current_user`, {
+      const result: CodingResponse = await gotInstance.get(`https://${team}.coding.net/api/current_user`, {
         searchParams: {
           access_token: token,
         },
       }).json();
+
+      if (result.code) {
+        console.error(result.msg);
+        return Promise.reject(result.msg);
+      }
+
       return result;
     } catch (err) {
-      return err;
+      throw Error(err);
     }
   }
 

src/common/request.ts

@@ -0,0 +1,7 @@
+import got from 'got';
+
+const instance = got.extend({
+  resolveBodyOnly: true,
+});
+
+export default instance;

src/extension.ts

@@ -7,42 +7,51 @@ import { Panel } from './panel';
 import { ListProvider } from './tree';
 
 export async function activate(context: vscode.ExtensionContext) {
-  console.log(`activated`);
   const repoInfo = await CodingServer.getRepoParams();
-  console.log(`repo `, repoInfo);
   const codingAuth = new CodingAuthenticationProvider(repoInfo);
   await codingAuth.initialize(context);
+
+  if (!codingAuth.session?.user) {
+    vscode.window.showWarningMessage(`Please login first.`);
+  }
+
   const service = new CodingServer(codingAuth.session, repoInfo);
 
   context.subscriptions.push(vscode.window.registerUriHandler(uriHandler));
-
   context.subscriptions.push(
     vscode.commands.registerCommand('codingPlugin.show', () => {
       Panel.createOrShow(context);
     }),
   );
-
   context.subscriptions.push(
     vscode.commands.registerCommand('codingPlugin.openConvertPage', k => {
       Panel.createOrShow(context);
       Panel.currentPanel?.broadcast(`UPDATE_CURRENCY`, k);
     }),
   );
-
   context.subscriptions.push(
     vscode.commands.registerCommand('codingPlugin.login', async () => {
       const session = await codingAuth.login(repoInfo?.team || ``);
       if (!session?.accessToken) {
         console.error(`No token provided.`);
       }
-
-      console.log(`session: `, session);
+    }),
+  );
+  context.subscriptions.push(
+    vscode.commands.registerCommand('codingPlugin.logout', async () => {
+      try {
+        await codingAuth.logout();
+        vscode.window.showInformationMessage(`Logout successfully.`);
+      } catch {
+      }
     }),
   );
 
-  vscode.window.registerTreeDataProvider(
+  vscode.window.createTreeView(
     `treeviewSample`,
-    new ListProvider(context, service, repoInfo),
+    {
+      treeDataProvider: new ListProvider(context, service, repoInfo),
+    },
   );
 
   if (vscode.window.registerWebviewPanelSerializer) {

src/typings/respResult.ts

@@ -28,3 +28,9 @@ export interface MRData {
   iid: number;
   title: string;
 }
+
+export interface CodingResponse {
+  code: number,
+  data?: any,
+  msg?: string
+}