Merge pull request #18 from cnblogs/fix-switch-user-bug

fix: fix user info not updated in the account info ui when log out and switch to another account

Author: laggage

src/commands/post-category/refresh-post-categories-list.ts

@@ -3,5 +3,5 @@ import { postCategoriesDataProvider } from '../../tree-view-providers/categories
 
 export const refreshPostCategoriesList = () => {
     postCategoryService.clearCache();
-    postCategoriesDataProvider.triggerTreeDataChangeEvent();
+    postCategoriesDataProvider.fireTreeDataChangedEvent();
 };

src/services/account.service.ts

@@ -7,6 +7,9 @@ import { URLSearchParams } from 'url';
 import { generateCodeChallenge } from './code-challenge.service';
 import * as RandomString from 'randomstring';
 import fetch from 'node-fetch';
+import { accountViewDataProvider } from '../tree-view-providers/account-view-data-provider';
+import { postsDataProvider } from '../tree-view-providers/posts-data-provider';
+import { postCategoriesDataProvider } from '../tree-view-providers/categories-view-data-provider';
 
 const isAuthorizedStorageKey = 'isAuthorized';
 
@@ -58,6 +61,9 @@ export class AccountService extends vscode.Disposable {
         ]);
         url = `${url}?${search}`;
         await vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(url));
+        accountViewDataProvider.fireTreeDataChangedEvent();
+        postsDataProvider.fireTreeDataChangedEvent(undefined);
+        postCategoriesDataProvider.fireTreeDataChangedEvent();
     }
 
     async logout() {
@@ -68,8 +74,8 @@ export class AccountService extends vscode.Disposable {
         const { clientId, revocationEndpoint, authority } = globalState.config.oauth;
         const token = this.curUser?.authorizationInfo?.accessToken;
 
-        this.setIsAuthorized(false);
-        globalState.storage.update('user', {});
+        await globalState.storage.update('user', {});
+        await this.setIsAuthorized(false);
 
         if (token) {
             const body = new URLSearchParams([

src/tree-view-providers/account-view-data-provider.ts

@@ -1,12 +1,25 @@
 import { accountService } from '../services/account.service';
-import { Event, ProviderResult, ThemeIcon, TreeDataProvider, TreeItem } from 'vscode';
+import { Event, EventEmitter, ProviderResult, ThemeIcon, TreeDataProvider, TreeItem } from 'vscode';
 
 export class AccountViewDataProvider implements TreeDataProvider<TreeItem> {
-    constructor() {}
-    onDidChangeTreeData?: Event<void | TreeItem | null | undefined> | undefined;
+    private static _instance?: AccountViewDataProvider;
+    protected _onDidChangeTreeData = new EventEmitter<null | undefined>();
+
+    static get instance() {
+        if (!this._instance) {
+            this._instance = new AccountViewDataProvider();
+        }
+        return this._instance;
+    }
+
+    protected constructor() {}
+
+    onDidChangeTreeData: Event<void | TreeItem | null | undefined> | undefined = this._onDidChangeTreeData.event;
+
     getTreeItem(element: TreeItem): TreeItem | Thenable<TreeItem> {
         return element;
     }
+
     getChildren(element?: TreeItem): ProviderResult<TreeItem[]> {
         if (!accountService.isAuthorized || element) {
             return [];
@@ -65,4 +78,10 @@ export class AccountViewDataProvider implements TreeDataProvider<TreeItem> {
             },
         ];
     }
+
+    fireTreeDataChangedEvent() {
+        this._onDidChangeTreeData.fire(undefined);
+    }
 }
+
+export const accountViewDataProvider = AccountViewDataProvider.instance;

src/tree-view-providers/categories-view-data-provider.ts

@@ -64,7 +64,7 @@ export class PostCategoriesViewDataProvider implements TreeDataProvider<PostCate
         return Promise.resolve(undefined);
     }
 
-    triggerTreeDataChangeEvent(item?: PostCategory) {
+    fireTreeDataChangedEvent(item?: PostCategory) {
         this._treeDataChanged.fire(item);
     }
 }

src/tree-view-providers/tree-view-registration.ts

@@ -1,6 +1,6 @@
 import { globalState } from '../services/global-state';
 import * as vscode from 'vscode';
-import { AccountViewDataProvider } from './account-view-data-provider';
+import { accountViewDataProvider } from './account-view-data-provider';
 import { PostDataProviderItem, postsDataProvider } from './posts-data-provider';
 import { PostCategory } from '../models/post-category';
 import { postCategoriesDataProvider } from './categories-view-data-provider';
@@ -14,7 +14,7 @@ export const extensionViews: {
 
 export const registerTreeViews = () => {
     extensionViews.account = vscode.window.createTreeView('cnblogs-account', {
-        treeDataProvider: new AccountViewDataProvider(),
+        treeDataProvider: accountViewDataProvider,
         canSelectMany: false,
     });
     extensionViews.postsList = vscode.window.createTreeView('cnblogs-posts-list', {