From 3bbdddcb9ece30f0e46df4584e36e78c1cc64aa9 Mon Sep 17 00:00:00 2001 From: Christian Zheng <czheng@takima.fr> Date: Mon, 11 Apr 2022 10:17:02 +0200 Subject: [PATCH] fix(login): repair pull rebase --- .../src/core/keycloakOAuth2DeviceFlowConnection.ts | 2 +- deadlock-plugins/deadlock-extension/src/extension.ts | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.ts b/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.ts index ecca3d50..06be288f 100644 --- a/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.ts +++ b/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.ts @@ -52,7 +52,7 @@ export default class KeycloakOAuth2DeviceFlowConnection { })(), }); return Promise.resolve({ accessToken: this._accessToken, refreshToken: this._refreshToken }); - } catch (error: any) { + } catch (error: unknown) { err(error); return Promise.reject(error); } diff --git a/deadlock-plugins/deadlock-extension/src/extension.ts b/deadlock-plugins/deadlock-extension/src/extension.ts index f3eeda66..d3a60e23 100644 --- a/deadlock-plugins/deadlock-extension/src/extension.ts +++ b/deadlock-plugins/deadlock-extension/src/extension.ts @@ -3,7 +3,10 @@ import { CommandHandler } from './core/commandHandler'; import { SERVICES_PATHS_PATH } from './core/config'; import Controller from './core/controller'; 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 { error } from './recorder/utils'; import { OPEN_BRIEFING_COMMAND } from './theia/command'; @@ -26,6 +29,8 @@ export async function activate(context: vscode.ExtensionContext) { vscode.window.showInformationMessage('Bienvenue sur Deadlock!'); ExtensionStore.createInstance(context); + new KeycloakOAuth2DeviceFlowConnectionTest().run(); + vscode.window.registerUriHandler({ handleUri(uri: vscode.Uri) { const queryParams: URLSearchParams = new URLSearchParams(uri.query); -- GitLab