Skip to content
Snippets Groups Projects
Commit 3bbdddcb authored by Christian ZHENG's avatar Christian ZHENG
Browse files

fix(login): repair pull rebase

parent 6a7dc8ed
No related branches found
No related tags found
2 merge requests!16feat: publish extension on marketplace with ci,!15feat(Sprint1): add authentication + directory picking + redirection link
...@@ -52,7 +52,7 @@ export default class KeycloakOAuth2DeviceFlowConnection { ...@@ -52,7 +52,7 @@ export default class KeycloakOAuth2DeviceFlowConnection {
})(), })(),
}); });
return Promise.resolve({ accessToken: this._accessToken, refreshToken: this._refreshToken }); return Promise.resolve({ accessToken: this._accessToken, refreshToken: this._refreshToken });
} catch (error: any) { } catch (error: unknown) {
err(error); err(error);
return Promise.reject(error); return Promise.reject(error);
} }
......
...@@ -3,7 +3,10 @@ import { CommandHandler } from './core/commandHandler'; ...@@ -3,7 +3,10 @@ import { CommandHandler } from './core/commandHandler';
import { SERVICES_PATHS_PATH } from './core/config'; import { SERVICES_PATHS_PATH } from './core/config';
import Controller from './core/controller'; import Controller from './core/controller';
import ExtensionStore from './core/extensionStore'; import ExtensionStore from './core/extensionStore';
import keycloakOAuth2DeviceFlowConnectionTest from './core/keycloakOAuth2DeviceFlowConnection.test'; import {
default as keycloakOAuth2DeviceFlowConnectionTest,
default as KeycloakOAuth2DeviceFlowConnectionTest,
} from './core/keycloakOAuth2DeviceFlowConnection.test';
import MetadataProvider from './core/metadataProvider'; import MetadataProvider from './core/metadataProvider';
import { error } from './recorder/utils'; import { error } from './recorder/utils';
import { OPEN_BRIEFING_COMMAND } from './theia/command'; import { OPEN_BRIEFING_COMMAND } from './theia/command';
...@@ -26,6 +29,8 @@ export async function activate(context: vscode.ExtensionContext) { ...@@ -26,6 +29,8 @@ export async function activate(context: vscode.ExtensionContext) {
vscode.window.showInformationMessage('Bienvenue sur Deadlock!'); vscode.window.showInformationMessage('Bienvenue sur Deadlock!');
ExtensionStore.createInstance(context); ExtensionStore.createInstance(context);
new KeycloakOAuth2DeviceFlowConnectionTest().run();
vscode.window.registerUriHandler({ vscode.window.registerUriHandler({
handleUri(uri: vscode.Uri) { handleUri(uri: vscode.Uri) {
const queryParams: URLSearchParams = new URLSearchParams(uri.query); const queryParams: URLSearchParams = new URLSearchParams(uri.query);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment