feat: refresh tree.

Author: cangzhang

package.json

@@ -14,7 +14,7 @@
     "onCommand:codingPlugin.show",
     "onCommand:codingPlugin.login",
     "onWebviewPanel:codingPlugin",
-    "onView:treeviewSample"
+    "onView:treeViewSample"
   ],
   "repository": {
     "type": "git",
@@ -37,11 +37,28 @@
         "command": "codingPlugin.logout",
         "title": "Logout coding.net",
         "category": "Coding plugin"
+      },
+      {
+        "command": "codingPlugin.refresh",
+        "title": "Refresh",
+        "icon": {
+          "light": "src/assets/refresh.light.svg",
+          "dark": "src/assets//refresh.dark.svg"
+        }
       }
     ],
+    "menus": {
+      "view/title": [
+        {
+          "command": "codingPlugin.refresh",
+          "when": "view == treeViewSample",
+          "group": "navigation"
+        }
+      ]
+    },
     "viewsWelcome": [
       {
-        "view": "treeviewSample",
+        "view": "treeViewSample",
         "contents": "Please login first.\n[Login](command:codingPlugin.login)"
       }
     ],
@@ -57,7 +74,7 @@
     "views": {
       "treeview-sample": [
         {
-          "id": "treeviewSample",
+          "id": "treeViewSample",
           "name": "Treeview Sample",
           "icon": "src/assets/coding.svg",
           "contextualTitle": "List"

src/assets/refresh.dark.svg

@@ -3,15 +3,26 @@ import { nanoid } from 'nanoid';
 import got from 'got';
 
 import gotInstance from './common/request';
-import { AuthFailResult, AuthSuccessResult, CodingResponse, UserResponse } from './typings/respResult';
+import { AuthFailResult, AuthSuccessResult, CodingResponse } from './typings/respResult';
 import { PromiseAdapter, promiseFromEvent, parseQuery, parseCloneUrl } from './common/utils';
 import { GitService } from './common/gitService';
-import { RepoInfo, SessionData } from './typings/commonTypes';
+import { RepoInfo, SessionData, TokenType } from './typings/commonTypes';
+import { keychain } from './common/keychain';
+import Logger from './common/logger';
 
 const AUTH_SERVER = `https://x5p7m.csb.app`;
 const ClientId = `ff768664c96d04235b1cc4af1e3b37a8`;
 const ClientSecret = `d29ebb32cab8b5f0a643b5da7dcad8d1469312c7`;
 
+export const ScopeList = [
+  `user`,
+  `user:email`,
+  `project`,
+  `project:depot`,
+];
+const SCOPES = ScopeList.join(`,`);
+const NETWORK_ERROR = 'network error';
+
 class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
   public handleUri(uri: vscode.Uri) {
     this.fire(uri);
@@ -25,25 +36,67 @@ const onDidManuallyProvideToken = new vscode.EventEmitter<string>();
 export class CodingServer {
   private _pendingStates = new Map<string, string[]>();
   private _codeExchangePromises = new Map<string, Promise<AuthSuccessResult>>();
-  private _session: SessionData = {} as SessionData;
-  private _repo: RepoInfo = {
-    team: ``,
-    project: ``,
-    repo: ``,
-  };
+  private _repo: RepoInfo | undefined;
   private _loggedIn: boolean = false;
+  private _session: SessionData | null = null;
 
-  constructor(session?: SessionData | null, repo?: RepoInfo | null) {
-    if (session) {
-      this._session = session;
-      this._loggedIn = true;
-    }
+  constructor(repo?: RepoInfo | null) {
     if (repo) {
       this._repo = repo;
     }
   }
 
-  public async login(team: string, scopes: string) {
+  public async initialize(context: vscode.ExtensionContext): Promise<void> {
+    try {
+      this._session = await this._readSessions();
+    } catch (e) {
+      // Ignore, network request failed
+    }
+  }
+
+  private async _readSessions(): Promise<SessionData | null> {
+    const [accessToken, refreshToken] = await Promise.all([
+      keychain.getToken(TokenType.AccessToken),
+      keychain.getToken(TokenType.RefreshToken),
+    ]);
+    if (accessToken && refreshToken) {
+      try {
+        const session = await this.getSessionData(accessToken as TokenType.AccessToken, refreshToken as TokenType.RefreshToken);
+        return session;
+      } catch (e) {
+        if (e === NETWORK_ERROR) {
+          return null;
+        }
+
+        Logger.error(`Error reading sessions: ${e}`);
+        await keychain.deleteToken(TokenType.AccessToken);
+      }
+    }
+
+    return null;
+  }
+
+  public async getSessionData(accessToken: TokenType.AccessToken, refreshToken: TokenType.RefreshToken): Promise<SessionData> {
+    try {
+      const result = await this.getUserInfo(this._repo?.team || ``, accessToken);
+      const { data: userInfo } = result;
+      const ret: SessionData = {
+        id: nanoid(),
+        user: userInfo,
+        accessToken,
+        refreshToken,
+      };
+
+      vscode.window.showInformationMessage(`USER ${userInfo.name} @ TEAM ${userInfo.team}`);
+      return ret;
+    } catch (err) {
+      console.error(err);
+      throw new Error(err);
+    }
+  }
+
+
+  public async startOAuth(team: string, scopes: string) {
     const state = nanoid();
     const { name, publisher } = require('../package.json');
     const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://${publisher}.${name}/on-did-authenticate`));
@@ -69,16 +122,35 @@ export class CodingServer {
     });
   }
 
+  public async login(team: string, scopes: string = SCOPES): Promise<SessionData | null> {
+    const { access_token: accessToken, refresh_token: refreshToken } = await this.startOAuth(team, scopes);
+    if (accessToken && refreshToken) {
+      try {
+        const session = await this.getSessionData(accessToken, refreshToken);
+        this._session = session;
+        await Promise.all([
+          keychain.setToken(accessToken, TokenType.AccessToken),
+          keychain.setToken(refreshToken, TokenType.RefreshToken),
+        ]);
+        return session;
+      } catch (e) {
+        throw new Error(e);
+      }
+    }
+
+    return null;
+  }
+
   private _exchangeCodeForToken: (team: string, scopes: string) => PromiseAdapter<vscode.Uri, AuthSuccessResult> = (team, scopes) => async (uri, resolve, reject) => {
     const query = parseQuery(uri);
     const { code } = query;
 
-    const acceptedStates = this._pendingStates.get(scopes) || [];
-    if (!acceptedStates.includes(query.state)) {
-      console.error(`Received mismatched state`);
-      reject({});
-      return;
-    }
+    // const acceptedStates = this._pendingStates.get(scopes) || [];
+    // if (!acceptedStates.includes(query.state)) {
+    //   console.error(`Received mismatched state`);
+    //   reject({});
+    //   return;
+    // }
 
     try {
       const result = await got.post(
@@ -104,7 +176,7 @@ export class CodingServer {
     }
   };
 
-  public async getUserInfo(team: string, token: string = this._session?.accessToken) {
+  public async getUserInfo(team: string, token: string = this._session?.accessToken || ``) {
     try {
       const result: CodingResponse = await gotInstance.get(`https://${team}.coding.net/api/current_user`, {
         searchParams: {
@@ -131,9 +203,9 @@ export class CodingServer {
   }
 
   public async getMRList(
-    team: string = this._repo.team,
-    project: string = this._repo.project,
-    repo: string = this._repo.repo,
+    team: string | undefined = this._repo?.team,
+    project: string | undefined = this._repo?.project,
+    repo: string | undefined = this._repo?.repo,
   ) {
     try {
       const result = await got.get(`https://${team}.coding.net/api/user/${team}/project/${project}/depot/${repo}/git/merges/query`, {
@@ -143,7 +215,7 @@ export class CodingServer {
           page: 1,
           PageSize: 20,
           sortDirection: `DESC`,
-          access_token: this._session.accessToken,
+          access_token: this._session?.accessToken,
         },
       }).json();
 
@@ -160,5 +232,18 @@ export class CodingServer {
   get session() {
     return this._session;
   }
+
+  public async logout() {
+    try {
+      await Promise.all([
+        keychain.deleteToken(TokenType.AccessToken),
+        keychain.deleteToken(TokenType.RefreshToken),
+      ]);
+      this._session = null;
+      return true;
+    } catch (e) {
+      throw Error(e);
+    }
+  }
 }