From cb1c0c6affaf4f4651ce58e637e86f4bc0e38acc Mon Sep 17 00:00:00 2001
From: Christian Zheng <czheng@takima.fr>
Date: Thu, 7 Apr 2022 16:33:56 +0200
Subject: [PATCH] Revert "refactor(login): rename file"
This reverts commit d098a2b9c2e6fbd4625b8f102186ab42bb7b61a2.
Conflicts:
deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.test.ts
deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnectionTokenProvider.test.ts
---
...t.ts => keycloakOAuth2DeviceFlowConnection.test.ts} | 10 +++++-----
...ovider.ts => keycloakOAuth2DeviceFlowConnection.ts} | 2 +-
deadlock-plugins/deadlock-extension/src/extension.ts | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
rename deadlock-plugins/deadlock-extension/src/core/{keycloakOAuth2DeviceFlowConnectionTokenProvider.test.ts => keycloakOAuth2DeviceFlowConnection.test.ts} (71%)
rename deadlock-plugins/deadlock-extension/src/core/{keycloakOAuth2DeviceFlowConnectionTokenProvider.ts => keycloakOAuth2DeviceFlowConnection.ts} (98%)
diff --git a/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnectionTokenProvider.test.ts b/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.test.ts
similarity index 71%
rename from deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnectionTokenProvider.test.ts
rename to deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.test.ts
index a33d01ca..84a855ed 100644
--- a/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnectionTokenProvider.test.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.test.ts
@@ -1,5 +1,5 @@
import { log } from '../recorder/utils';
-import KeycloakOAuth2DeviceFlowConnectionTokenProvider from './keycloakOAuth2DeviceFlowConnectionTokenProvider';
+import KeycloakOAuth2DeviceFlowConnection from './keycloakOAuth2DeviceFlowConnection';
/**
* Maybe temporary file ?\
@@ -8,11 +8,11 @@ import KeycloakOAuth2DeviceFlowConnectionTokenProvider from './keycloakOAuth2Dev
* but there are only some urls to change for further testings.
*
*/
-export default class KeycloakOAuth2DeviceFlowConnectionTokenProviderTest {
- public connection: KeycloakOAuth2DeviceFlowConnectionTokenProvider;
+export default class KeycloakOAuth2DeviceFlowConnectionTest {
+ public connection: KeycloakOAuth2DeviceFlowConnection;
constructor() {
- log(' --- KeycloakOAuth2DeviceFlowConnectionTokenProviderTest --- ');
- this.connection = new KeycloakOAuth2DeviceFlowConnectionTokenProvider(
+ log(' --- KeycloakOAuth2DeviceFlowConnectionTest --- ');
+ this.connection = new KeycloakOAuth2DeviceFlowConnection(
'https://auth.dev.deadlock.io/auth/realms/Deadlock/protocol/openid-connect/auth/device',
'https://auth.dev.deadlock.io/auth/realms/Deadlock/protocol/openid-connect/token',
);
diff --git a/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnectionTokenProvider.ts b/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.ts
similarity index 98%
rename from deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnectionTokenProvider.ts
rename to deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.ts
index a8289906..ecca3d50 100644
--- a/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnectionTokenProvider.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.ts
@@ -6,7 +6,7 @@ import { TokenFetchErrorCode } from '../typings/KeycloakAPITypes';
process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0'; // TODO: remove when SSL will work
-export default class KeycloakOAuth2DeviceFlowConnectionTokenProvider {
+export default class KeycloakOAuth2DeviceFlowConnection {
private _waitDuration: WaitDuration;
private _accessToken: string;
private _refreshToken: string;
diff --git a/deadlock-plugins/deadlock-extension/src/extension.ts b/deadlock-plugins/deadlock-extension/src/extension.ts
index 37595e19..f3eeda66 100644
--- a/deadlock-plugins/deadlock-extension/src/extension.ts
+++ b/deadlock-plugins/deadlock-extension/src/extension.ts
@@ -3,7 +3,7 @@ import { CommandHandler } from './core/commandHandler';
import { SERVICES_PATHS_PATH } from './core/config';
import Controller from './core/controller';
import ExtensionStore from './core/extensionStore';
-import KeycloakOAuth2DeviceFlowConnectionTokenProviderTest from './core/keycloakOAuth2DeviceFlowConnectionTokenProvider.test';
+import keycloakOAuth2DeviceFlowConnectionTest from './core/keycloakOAuth2DeviceFlowConnection.test';
import MetadataProvider from './core/metadataProvider';
import { error } from './recorder/utils';
import { OPEN_BRIEFING_COMMAND } from './theia/command';
@@ -51,7 +51,7 @@ export async function activate(context: vscode.ExtensionContext) {
const deadlockPanelProvider = new DepNodeProvider(vscode.workspace.rootPath);
vscode.window.registerTreeDataProvider('deadlockPanel', deadlockPanelProvider);
- new KeycloakOAuth2DeviceFlowConnectionTokenProviderTest().run();
+ new keycloakOAuth2DeviceFlowConnectionTest().run();
try {
await userConfig.init();
--
GitLab