@eclipse-che/che-e2e 7.44.0 → 7.45.0-dev-564dd1b

package/utils/requestHandlers/headers/CheMultiuserAuthorizationHeaderHandler.ts

@@ -8,20 +8,14 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import { AxiosRequestConfig } from 'axios';
-
-import { TYPES } from '../../../inversify.types';
 import { IAuthorizationHeaderHandler } from './IAuthorizationHeaderHandler';
-import { injectable, inject } from 'inversify';
-import { ITokenHandler } from '../tokens/ITokenHandler';
+import { injectable } from 'inversify';
 
 @injectable()
 export class CheMultiuserAuthorizationHeaderHandler implements IAuthorizationHeaderHandler {
 
-    constructor(@inject(TYPES.ITokenHandler) private readonly tokenHandler: ITokenHandler) {
-    }
-
     async get(): Promise<AxiosRequestConfig> {
-        const token = await this.tokenHandler.get();
-        return { headers: { 'Authorization': `Bearer ${token}` } };
+        //  to-do : Fetch the cookies from user api and pass it here
+        return { headers: { 'cookie': `` } };
     }
 }

package/utils/requestHandlers/tokens/CheMultiuserTokenHandler.ts

@@ -12,28 +12,30 @@ import querystring from 'querystring';
 import { injectable } from 'inversify';
 import { TestConstants } from '../../../TestConstants';
 import { ITokenHandler } from './ITokenHandler';
-import { KeycloackUrlHandler } from '../../KeycloackUrlHandler';
+
 
 @injectable()
 export class CheMultiuserTokenHandler implements ITokenHandler {
-    async get(): Promise<string> {
-        const keycloakUrl = KeycloackUrlHandler.getTokenEndpointUrl();
-
-        const params = {
-            client_id: 'che-public',
-            username: TestConstants.TS_SELENIUM_USERNAME,
-            password: TestConstants.TS_SELENIUM_PASSWORD,
-            grant_type: 'password'
-        };
+  async get(): Promise<string> {
+    //   to-do: Login to the che-dashboard and fetch the authorization related info
+    const keycloakUrl = '';
 
-        try {
-            const responseToObtainBearerToken = await axios.post(keycloakUrl, querystring.stringify(params));
-            return responseToObtainBearerToken.data.access_token;
-        } catch (err) {
-            console.log(`Can not get bearer token. URL used: ${keycloakUrl}`);
-            throw err;
-        }
+    const params = {
+      client_id: 'che-public',
+      username: TestConstants.TS_SELENIUM_USERNAME,
+      password: TestConstants.TS_SELENIUM_PASSWORD,
+      grant_type: 'password',
+    };
 
+    try {
+      const responseToObtainBearerToken = await axios.post(
+        keycloakUrl,
+        querystring.stringify(params)
+      );
+      return responseToObtainBearerToken.data.access_token;
+    } catch (err) {
+      console.log(`Can not get bearer token. URL used: ${keycloakUrl}`);
+      throw err;
     }
-
+  }
 }

package/dist/utils/KeycloackUrlHandler.js

@@ -1,30 +0,0 @@
-"use strict";
-/*********************************************************************
- * Copyright (c) 2019 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- **********************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeycloackUrlHandler = void 0;
-const TestConstants_1 = require("../TestConstants");
-class KeycloackUrlHandler {
-    static getBaseKeycloakUrl() {
-        let baseKeycloakUrl = TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL;
-        if (!TestConstants_1.TestConstants.TS_SELENIUM_SINGLE_HOST) {
-            baseKeycloakUrl = baseKeycloakUrl.replace('che', 'keycloak');
-        }
-        return baseKeycloakUrl;
-    }
-    static getTokenEndpointUrl() {
-        return `${this.getBaseKeycloakUrl()}/auth/realms/che/protocol/openid-connect/token`;
-    }
-    static getIdentityCallbackUrl() {
-        return `${this.getBaseKeycloakUrl()}/auth/realms/che/broker/github/endpoint`;
-    }
-}
-exports.KeycloackUrlHandler = KeycloackUrlHandler;
-//# sourceMappingURL=KeycloackUrlHandler.js.map

package/dist/utils/KeycloackUrlHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"KeycloackUrlHandler.js","sourceRoot":"","sources":["../../utils/KeycloackUrlHandler.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;AAExE,oDAAiD;AAEjD,MAAa,mBAAmB;IACrB,MAAM,CAAC,kBAAkB;QAC5B,IAAI,eAAe,GAAW,6BAAa,CAAC,oBAAoB,CAAC;QAEjE,IAAI,CAAC,6BAAa,CAAC,uBAAuB,EAAE;YACxC,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SAChE;QAED,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,mBAAmB;QAC7B,OAAO,GAAG,IAAI,CAAC,kBAAkB,EAAE,gDAAgD,CAAC;IACxF,CAAC;IAEM,MAAM,CAAC,sBAAsB;QAChC,OAAO,GAAG,IAAI,CAAC,kBAAkB,EAAE,yCAAyC,CAAC;IACjF,CAAC;CAEJ;AAnBD,kDAmBC"}

package/utils/KeycloackUrlHandler.ts

@@ -1,32 +0,0 @@
-/*********************************************************************
- * Copyright (c) 2019 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- **********************************************************************/
-
-import { TestConstants } from '../TestConstants';
-
-export class KeycloackUrlHandler {
-    public static getBaseKeycloakUrl(): string {
-        let baseKeycloakUrl: string = TestConstants.TS_SELENIUM_BASE_URL;
-
-        if (!TestConstants.TS_SELENIUM_SINGLE_HOST) {
-            baseKeycloakUrl = baseKeycloakUrl.replace('che', 'keycloak');
-        }
-
-        return baseKeycloakUrl;
-    }
-
-    public static getTokenEndpointUrl(): string {
-        return `${this.getBaseKeycloakUrl()}/auth/realms/che/protocol/openid-connect/token`;
-    }
-
-    public static getIdentityCallbackUrl(): string {
-        return `${this.getBaseKeycloakUrl()}/auth/realms/che/broker/github/endpoint`;
-    }
-
-}