refactor: repo info & auth.

Author: cangzhang

README.md

@@ -1,6 +1,6 @@
 # Coding plugin for VS Code.
 
-## Running the example
+## Development
 
 - Open this example in VS Code 1.47+
 - `yarn install`

src/codingServer.ts

@@ -36,17 +36,16 @@ const onDidManuallyProvideToken = new vscode.EventEmitter<string>();
 export class CodingServer {
   private _pendingStates = new Map<string, string[]>();
   private _codeExchangePromises = new Map<string, Promise<AuthSuccessResult>>();
-  private _repo: RepoInfo | undefined;
+
   private _loggedIn: boolean = false;
+  private _context: vscode.ExtensionContext;
   private _session: SessionData | null = null;
 
-  constructor(repo?: RepoInfo | null) {
-    if (repo) {
-      this._repo = repo;
-    }
+  constructor(context: vscode.ExtensionContext) {
+    this._context = context;
   }
 
-  public async initialize(context: vscode.ExtensionContext): Promise<void> {
+  public async initialize(): Promise<void> {
     try {
       this._session = await this._readSessions();
     } catch (e) {
@@ -78,7 +77,12 @@ export class CodingServer {
 
   public async getSessionData(accessToken: TokenType.AccessToken, refreshToken: TokenType.RefreshToken): Promise<SessionData> {
     try {
-      const result = await this.getUserInfo(this._repo?.team || ``, accessToken);
+      const repoInfo = this._context.workspaceState.get(`repoInfo`) as RepoInfo;
+      if (!repoInfo?.team) {
+        throw new Error(`team not exist`);
+      }
+
+      const result = await this.getUserInfo(repoInfo.team || ``, accessToken);
       const { data: userInfo } = result;
       const ret: SessionData = {
         id: nanoid(),
@@ -206,13 +210,14 @@ export class CodingServer {
     return parseCloneUrl(url || ``);
   }
 
-  public async getMRList(
-    team: string | undefined = this._repo?.team,
-    project: string | undefined = this._repo?.project,
-    repo: string | undefined = this._repo?.repo,
-  ) {
+  public async getMRList(repo?: string) {
     try {
-      const result = await got.get(`https://${team}.coding.net/api/user/${team}/project/${project}/depot/${repo}/git/merges/query`, {
+      const repoInfo = this._context.workspaceState.get(`repoInfo`) as RepoInfo;
+      if (!repoInfo?.team) {
+        throw new Error(`team not exist`);
+      }
+
+      const result = await got.get(`https://${repoInfo.team}.coding.net/api/user/${repoInfo.team}/project/${repoInfo.project}/depot/${repo || repoInfo.repo}/git/merges/query`, {
         searchParams: {
           status: `all`,
           sort: `action_at`,

src/extension.ts

@@ -7,14 +7,23 @@ import { ListItem, ListProvider } from './tree';
 
 export async function activate(context: vscode.ExtensionContext) {
   const repoInfo = await CodingServer.getRepoParams();
-  const codingAuth = new CodingServer(repoInfo);
-  await codingAuth.initialize(context);
 
-  if (!codingAuth.session?.user) {
+  if (!repoInfo?.team) {
+    vscode.window.showWarningMessage(`Please open a repo hosted by coding.net.`);
+  } else {
+    context.workspaceState.update(`repoInfo`, repoInfo);
+  }
+
+  const codingSrv = new CodingServer(context);
+  await codingSrv.initialize();
+
+  if (!codingSrv.session?.user) {
     vscode.window.showWarningMessage(`Please login first.`);
+  } else {
+    context.workspaceState.update(`session`, codingSrv.session);
   }
 
-  const treeDataProvider = new ListProvider(context, codingAuth, repoInfo);
+  const treeDataProvider = new ListProvider(context, codingSrv);
   const tree = vscode.window.createTreeView(`treeViewSample`, { treeDataProvider });
 
   context.subscriptions.push(vscode.window.registerUriHandler(uriHandler));
@@ -32,7 +41,7 @@ export async function activate(context: vscode.ExtensionContext) {
   );
   context.subscriptions.push(
     vscode.commands.registerCommand('codingPlugin.login', async () => {
-      const session = await codingAuth.login(repoInfo?.team || ``);
+      const session = await codingSrv.login(repoInfo?.team || ``);
       if (!session?.accessToken) {
         console.error(`No token provided.`);
       } else {
@@ -43,7 +52,7 @@ export async function activate(context: vscode.ExtensionContext) {
   context.subscriptions.push(
     vscode.commands.registerCommand('codingPlugin.logout', async () => {
       try {
-        await codingAuth.logout();
+        await codingSrv.logout();
         vscode.window.showInformationMessage(`Logout successfully.`);
       } finally {
         treeDataProvider.refresh();
@@ -65,3 +74,5 @@ export async function activate(context: vscode.ExtensionContext) {
     });
   }
 }
+
+export function deactivate() {}

src/tree.ts

@@ -6,20 +6,15 @@ import { RepoInfo } from './typings/commonTypes';
 import { MRData } from './typings/respResult';
 
 export class ListProvider implements vscode.TreeDataProvider<ListItem> {
-  private _service: CodingServer;
-  private _repo: RepoInfo = {
-    team: ``,
-    project: ``,
-    repo: ``,
-  };
   private _onDidChangeTreeData: vscode.EventEmitter<ListItem | undefined | void> = new vscode.EventEmitter<ListItem | undefined | void>();
   readonly onDidChangeTreeData: vscode.Event<ListItem | undefined | void> = this._onDidChangeTreeData.event;
 
-  constructor(context: vscode.ExtensionContext, service: CodingServer, repo: RepoInfo | null) {
+  private _context : vscode.ExtensionContext;
+  private _service: CodingServer;
+
+  constructor(context: vscode.ExtensionContext, service: CodingServer) {
+    this._context = context;
     this._service = service;
-    if (repo) {
-      this._repo = repo;
-    }
   }
 
   public refresh(): any {
@@ -40,6 +35,11 @@ export class ListProvider implements vscode.TreeDataProvider<ListItem> {
       return Promise.resolve([]);
     }
 
+    const repoInfo = this._context.workspaceState.get(`repoInfo`) as RepoInfo;
+    if (!repoInfo?.team) {
+      throw new Error(`team not exist`);
+    }
+
     return this._service.getMRList()
       .then(resp => {
         if (resp.code) {
@@ -55,12 +55,18 @@ export class ListProvider implements vscode.TreeDataProvider<ListItem> {
         }
 
         vscode.commands.executeCommand('setContext', 'noMRResult', false);
+        
+        const repoInfo = this._context.workspaceState.get(`repoInfo`) as RepoInfo;
+        if (!repoInfo?.team) {
+          throw new Error(`team not exist`);
+        }
+
         return list.map((i: MRData) => {
           return new ListItem(i.title, i.iid, vscode.TreeItemCollapsibleState.None, {
             command: 'codingPlugin.openConvertPage',
             title: `${i.iid} ${i.title}`,
             arguments: [{
-              ...this._repo,
+              ...repoInfo,
               iid: i.iid,
               type: `mr`,
               accessToken: this._service.session?.accessToken,