Fir 28094 support both versions (#66)

Author: stepansergeevitch

package-lock.json

@@ -32,6 +32,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "^27.5.1",
     "msw": "^0.45.0",
+    "nock": "^13.4.0",
     "prettier": "^2.4.1",
     "standard-version": "^9.3.2",
     "ts-jest": "^27.0.7",

package.json

@@ -1,10 +1,10 @@
-import { SERVICE_ACCOUNT_LOGIN } from "../common/api";
+import { SERVICE_ACCOUNT_LOGIN, USERNAME_PASSWORD_LOGIN } from "../common/api";
 import { assignProtocol } from "../common/util";
 import {
   Context,
   ConnectionOptions,
-  ClientCredentialsAuth,
-  AccessTokenAuth
+  ServiceAccountAuth,
+  UsernamePasswordAuth
 } from "../types";
 
 type Login = {
@@ -21,7 +21,6 @@ export class Authenticator {
   options: ConnectionOptions;
 
   accessToken?: string;
-  refreshToken?: string;
 
   constructor(context: Context, options: ConnectionOptions) {
     context.httpClient.authenticator = this;
@@ -38,12 +37,7 @@ export class Authenticator {
     return {};
   }
 
-  authenticateWithToken(auth: AccessTokenAuth) {
-    const { accessToken } = auth;
-    this.accessToken = accessToken;
-  }
-
-  getAuthEndpoint(apiEndpoint: string) {
+  private static getAuthEndpoint(apiEndpoint: string) {
     const myURL = new URL(assignProtocol(apiEndpoint));
     const hostStrings = myURL.hostname.split(".");
     // We expect an apiEndpoint to be of format api.<env>.firebolt.io
@@ -56,11 +50,32 @@ export class Authenticator {
     return myURL.toString();
   }
 
-  async authenticateServiceAccount(auth: ClientCredentialsAuth) {
+  private async authenticateUsernamePassword(auth: UsernamePasswordAuth) {
+    const { httpClient, apiEndpoint } = this.context;
+    const { username, password } = auth;
+    const url = `${apiEndpoint}/${USERNAME_PASSWORD_LOGIN}`;
+    const body = JSON.stringify({
+      username,
+      password
+    });
+
+    this.accessToken = undefined;
+
+    const { access_token } = await httpClient
+      .request<Login>("POST", url, {
+        body,
+        retry: false
+      })
+      .ready();
+
+    this.accessToken = access_token;
+  }
+
+  private async authenticateServiceAccount(auth: ServiceAccountAuth) {
     const { httpClient, apiEndpoint } = this.context;
     const { client_id, client_secret } = auth;
 
-    const authEndpoint = this.getAuthEndpoint(apiEndpoint);
+    const authEndpoint = Authenticator.getAuthEndpoint(apiEndpoint);
     const params = new URLSearchParams({
       client_id,
       client_secret,
@@ -84,18 +99,30 @@ export class Authenticator {
     this.accessToken = access_token;
   }
 
-  async authenticate() {
+  isUsernamePassword() {
     const options = this.options.auth || this.options;
+    return !!(
+      (options as UsernamePasswordAuth).username &&
+      (options as UsernamePasswordAuth).password
+    );
+  }
 
-    if ((options as AccessTokenAuth).accessToken) {
-      this.authenticateWithToken(options as AccessTokenAuth);
+  isServiceAccount() {
+    const options = this.options.auth || this.options;
+    return !!(
+      (options as ServiceAccountAuth).client_id &&
+      (options as ServiceAccountAuth).client_secret
+    );
+  }
+
+  async authenticate() {
+    const options = this.options.auth || this.options;
+    if (this.isUsernamePassword()) {
+      await this.authenticateUsernamePassword(options as UsernamePasswordAuth);
       return;
     }
-    if (
-      (options as ClientCredentialsAuth).client_id &&
-      (options as ClientCredentialsAuth).client_secret
-    ) {
-      await this.authenticateServiceAccount(options as ClientCredentialsAuth);
+    if (this.isServiceAccount()) {
+      await this.authenticateServiceAccount(options as ServiceAccountAuth);
       return;
     }
 

src/auth/index.ts

@@ -5,3 +5,62 @@ export const ACCOUNT_SYSTEM_ENGINE = (accountName: string) =>
   `web/v3/account/${accountName}/engineUrl`;
 export const ACCOUNT_ID_BY_NAME = (accountName: string) =>
   `web/v3/account/${accountName}/resolve`;
+
+// V1
+
+export const USERNAME_PASSWORD_LOGIN = "auth/v1/login"; // legit:ignore-secrets
+
+export const ACCOUNT = "iam/v2/account";
+export const ACCOUNT_BY_NAME = "iam/v2/accounts:getIdByName";
+
+export const ACCOUNT_ENGINE = (accountId: string, engineId: string) =>
+  `core/v1/accounts/${accountId}/engines/${engineId}`;
+
+export const ACCOUNT_ENGINES = (accountId: string) =>
+  `core/v1/accounts/${accountId}/engines`;
+
+export const ACCOUNT_ENGINE_URL_BY_DATABASE_NAME = (accountId: string) =>
+  ACCOUNT_ENGINES(accountId) + ":getURLByDatabaseName";
+
+export const ACCOUNT_DATABASE = (accountId: string, databaseId: string) =>
+  `core/v1/accounts/${accountId}/databases/${databaseId}`;
+
+export const ACCOUNT_DATABASES = (accountId: string) =>
+  `core/v1/accounts/${accountId}/databases`;
+
+export const ACCOUNT_DATABASE_BINDING_URL = (
+  accountId: string,
+  databaseId: string,
+  engineId: string
+) => ACCOUNT_DATABASE(accountId, databaseId) + `/bindings/${engineId}`;
+
+export const ACCOUNT_ENGINE_START = (accountId: string, engineId: string) =>
+  ACCOUNT_ENGINE(accountId, engineId) + ":start";
+export const ACCOUNT_ENGINE_RESTART = (accountId: string, engineId: string) =>
+  ACCOUNT_ENGINE(accountId, engineId) + ":restart";
+export const ACCOUNT_ENGINE_STOP = (accountId: string, engineId: string) =>
+  ACCOUNT_ENGINE(accountId, engineId) + ":stop";
+
+export const REGIONS = "compute/v1/regions";
+export const ACCOUNT_INSTANCE_TYPES = (accountId: string) =>
+  `aws/v2/accounts/${accountId}/instanceTypes`;
+
+export const ACCOUNT_BINDINGS_URL = (accountId: string) =>
+  `core/v1/accounts/${accountId}/bindings`;
+
+export const ENGINES_BY_IDS_URL = "core/v1/engines:getByIds";
+
+export type EdgeResult<T> = {
+  cursor: string;
+  node: T;
+};
+
+export type ResultsPage<T> = {
+  page: {
+    page_size: number;
+    total_size: number;
+    has_previous_page: boolean;
+    has_next_page: boolean;
+  };
+  edges: EdgeResult<T>[];
+};