Skip to content

Commit

Permalink
fix: welcome message
Browse files Browse the repository at this point in the history
  • Loading branch information
yevheniyJ committed Nov 19, 2023
1 parent dceadf6 commit 9e6bd19
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
7 changes: 1 addition & 6 deletions src/oauth/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,5 @@ export function initialize(context: vscode.ExtensionContext, onProjectSelected:

const getSession = async () => {
const session = await vscode.authentication.getSession(AUTH_TYPE, SCOPES, { createIfNone: false });
if (session) {
await vscode.commands.executeCommand('setContext', 'crowdinAuthenticated', true);
vscode.window.showInformationMessage(`Welcome back ${session.account.label}`);
} else {
await vscode.commands.executeCommand('setContext', 'crowdinAuthenticated', false);
}
await vscode.commands.executeCommand('setContext', 'crowdinAuthenticated', !!session);
};
13 changes: 12 additions & 1 deletion src/plugin/files/filesProvider.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as vscode from 'vscode';
import { AUTH_TYPE, SCOPES } from '../../oauth/constants';
import { CommonUtil } from '../../util/commonUtil';
import { ErrorHandler } from '../../util/errorHandler';
import { CrowdinConfigHolder } from '../crowdinConfigHolder';
Expand All @@ -13,6 +14,8 @@ export class FilesProvider implements vscode.TreeDataProvider<FilesTreeItem> {

private rootTree: FilesTreeItem[] = [];

private welcomeMessage = true;

constructor(readonly configHolder: CrowdinConfigHolder) {}

/**
Expand Down Expand Up @@ -84,7 +87,15 @@ export class FilesProvider implements vscode.TreeDataProvider<FilesTreeItem> {
return element;
}

getChildren(element?: FilesTreeItem): Thenable<FilesTreeItem[]> {
async getChildren(element?: FilesTreeItem): Promise<FilesTreeItem[]> {
if (!element && this.welcomeMessage) {
const session = await vscode.authentication.getSession(AUTH_TYPE, SCOPES, { createIfNone: false });
if (session) {
vscode.window.showInformationMessage(`Welcome back ${session.account.label}`);
}
this.welcomeMessage = false;
}

if (!vscode.workspace.workspaceFolders || vscode.workspace.workspaceFolders.length === 0) {
vscode.window.showWarningMessage('Project workspace is empty');
return Promise.resolve([]);
Expand Down

0 comments on commit 9e6bd19

Please sign in to comment.