@codiac.io/codiac-cli 1.2.144 → 1.2.145

package/lib/relay/wsclient/relay-websocket-client.js

@@ -0,0 +1,179 @@
+"use strict";
+var RelayWebsocketClient_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RelayWebsocketClient = void 0;
+const tslib_1 = require("tslib");
+const codiac_common_1 = require("@codiac.io/codiac-common");
+const inversify_1 = require("inversify");
+const _ = require("lodash");
+const WebSocket = require("ws");
+const guid_typescript_1 = require("guid-typescript");
+const stringify = require("json-stringify-safe");
+const relay_socket_listener_1 = require("./relay-socket-listener");
+const api_user_creds_1 = require("../../apis/codiac-api/common/api-user-creds");
+/** Meta added to a message handler for facility in managing message subscribers. */
+class HandlerSubx {
+    constructor(id, handler) {
+        this.id = id;
+        this.handler = handler;
+    }
+}
+let RelayWebsocketClient = RelayWebsocketClient_1 = class RelayWebsocketClient {
+    static bootstrap(ioc, settings) {
+        ioc.bind(relay_socket_listener_1.RelaySocketListenerSettings).toConstantValue(settings !== null && settings !== void 0 ? settings : {});
+        ioc.bind(RelayWebsocketClient_1).toSelf().inSingletonScope(); // <-- There can be only one socket connection from the CLI.
+    }
+    constructor(credentials, settings, logger) {
+        this.credentials = credentials;
+        this.logger = logger;
+        this.settings = _.assignIn({}, RelayWebsocketClient_1.DEFAULT_SETTINGS, settings);
+        this.subscribers = {};
+    }
+    open() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                try {
+                    this.socket = new WebSocket(this.settings.url, undefined, {
+                        headers: {
+                            "Authorization": this.credentials.apiToken
+                        }
+                    });
+                    this.socket.onopen = (eventMsg) => {
+                        this.logger.debug(`Connection opened successfully at [${eventMsg.target.url}]. Waiting on socket details message. `);
+                    };
+                    this.socket.onerror = (eventMsg) => {
+                        var _a;
+                        this.logger.error(`WebSocket ${eventMsg.type}: ${(_a = eventMsg.message) !== null && _a !== void 0 ? _a : "(no details available)"}`);
+                        if (eventMsg.error) {
+                            reject(eventMsg.error);
+                        }
+                        else {
+                            reject(new Error(`WebSocket ${eventMsg.type} error: ${eventMsg.message}`));
+                        }
+                    };
+                    this.listenFor("connection", (msg) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        var _a, _b;
+                        this.logger.trace(`COnnection msg received: `, msg);
+                        resolve((_b = (_a = msg.payload) === null || _a === void 0 ? void 0 : _a.socketId) !== null && _b !== void 0 ? _b : "undefined-socket-id");
+                    }));
+                    this.socket.onmessage = (msg) => {
+                        var _a, _b;
+                        try {
+                            if (msg.type === "message" && msg.target && msg.data) {
+                                // MessageEvent entity
+                                let contentsObj = JSON.parse(msg.data);
+                                this.routeInboundMessage(contentsObj);
+                            }
+                            else {
+                                this.routeInboundMessage(msg);
+                            }
+                        }
+                        catch (err) {
+                            this.logger.error(`Error routing message: ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : "(no dettails available)"}`);
+                        }
+                    };
+                }
+                catch (err) {
+                    reject(err);
+                }
+            }));
+        });
+    }
+    close() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                var _a;
+                try {
+                    if (this.socket) {
+                        if (![this.socket.CLOSED, this.socket.CLOSING].includes(this.socket.readyState)) {
+                            this.socket.close();
+                            this.logger.debug(`Closed web socket.`);
+                        }
+                        else {
+                            this.logger.debug(`Attempted close when socket was already closed or closing.`);
+                        }
+                    }
+                    else {
+                        this.logger.debug(`Attempted close when socket was undefined.`);
+                    }
+                    resolve();
+                }
+                catch (err) {
+                    this.logger.error(`Error closing socket connection: ${(_a = err.message) !== null && _a !== void 0 ? _a : "(no details available)"}`);
+                    reject(err);
+                }
+            }));
+        });
+    }
+    /** Returns the subscription id for the handler (reqd for unsubcribing).
+     */
+    listenFor(action, handler) {
+        if (this.subscribers[action] == undefined) {
+            this.subscribers[action] = [];
+        }
+        let subx = {
+            id: guid_typescript_1.Guid.create().toString(),
+            handler: handler
+        };
+        this.subscribers[action].push(subx);
+        return subx.id;
+    }
+    /** Removes the given listener.  (IDEMPOTENT) Returns whether a handler was indeed removed (false if it didn't exist).
+     *
+     * Throws any exceptions. */
+    unlisten(action, subscriptionId) {
+        let existings = this.subscribers[action];
+        if (existings && existings.length > 0) {
+            let removed = _.remove(existings, x => x.id === subscriptionId);
+            return Boolean(removed.length > 0);
+        }
+        else {
+            return false;
+        }
+    }
+    /** Fires any registered handlers.
+     * (and doesnt wait for them).
+    */
+    routeInboundMessage(msg) {
+        var _a, _b;
+        if (msg.action) {
+            let actionMsg = msg;
+            let subxs = this.subscribers[actionMsg.action];
+            if (subxs && subxs.length > 0) {
+                for (let subx of subxs) {
+                    try {
+                        this.logger.debug(`Handling inbound [${actionMsg.action}] SocketAction [handler id: ${subx.id}]...`);
+                        /* TODO: await? */ subx.handler(actionMsg);
+                    }
+                    catch (err) {
+                        this.logger.error(`Unhandled error in [${actionMsg.action}] SocketAction handler [id: ${subx.id}]: ${(_a = err.name) !== null && _a !== void 0 ? _a : ""} ${(_b = err.message) !== null && _b !== void 0 ? _b : "(No details available)"}`);
+                    }
+                }
+            }
+            else {
+                this.logger.warn(`Received unhandled [${actionMsg.action}] message from [${this.settings.url}];`);
+            }
+        }
+        else {
+            this.logger.warn(`Received unrecognized WebSocket message.`, stringify(msg));
+        }
+        return;
+    }
+};
+RelayWebsocketClient.DEFAULT_SETTINGS = {
+    url: "ws://localhost:5798",
+    reconnectIntervalMs: 2000,
+    /** Deliberately kept short because the retry is limited to a single cli command execution,
+     * not an ongoing user session (thus it needs to fail fast).  */
+    reconnectAttempts: 5
+};
+RelayWebsocketClient = RelayWebsocketClient_1 = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__param(0, (0, inversify_1.inject)(api_user_creds_1.ApiUserCreds)),
+    tslib_1.__param(1, (0, inversify_1.inject)(relay_socket_listener_1.RelaySocketListenerSettings)),
+    tslib_1.__param(2, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
+    tslib_1.__metadata("design:paramtypes", [api_user_creds_1.ApiUserCreds,
+        relay_socket_listener_1.RelaySocketListenerSettings, Object])
+], RelayWebsocketClient);
+exports.RelayWebsocketClient = RelayWebsocketClient;
+//# sourceMappingURL=relay-websocket-client.js.map

package/lib/relay/wsclient/relay-websocket-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"relay-websocket-client.js","sourceRoot":"","sources":["../../../src/relay/wsclient/relay-websocket-client.ts"],"names":[],"mappings":"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"}

package/lib/relay/wsclient/rx-websocket-subject.d.ts

@@ -0,0 +1,25 @@
+import { Subject, Observable } from 'rxjs';
+import { IBetterLogger } from "@codiac.io/codiac-common";
+import { SocketAction } from './socket-contracts';
+export declare class RxWebsocketSubject<T> extends Subject<T> {
+    private url;
+    private reconnectInterval;
+    private reconnectAttempts;
+    private resultSelector;
+    private logger;
+    private serializer?;
+    private data;
+    private reconnectionObservable;
+    private wsSubjectConfig;
+    private socket;
+    private connectionObserver;
+    connectionStatus: Observable<boolean>;
+    defaultResultSelector: (e: MessageEvent | SocketAction) => any;
+    defaultSerializer: (data: any) => string;
+    constructor(url: string, reconnectInterval: number, reconnectAttempts: number, resultSelector: (e: MessageEvent | SocketAction) => any, logger: IBetterLogger, serializer?: ((data: any) => string) | undefined);
+    connect(): void;
+    private cnxnHandler;
+    onSocketConnection(handler: (err: Error | undefined, data?: any) => void): void;
+    reconnect(): void;
+    send(data: any): void;
+}

package/lib/relay/wsclient/rx-websocket-subject.js

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RxWebsocketSubject = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("inversify");
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const webSocket_1 = require("rxjs/webSocket");
+global.WebSocket = require('ws');
+let RxWebsocketSubject = class RxWebsocketSubject extends rxjs_1.Subject {
+    constructor(url, reconnectInterval = 5000, reconnectAttempts = 10, resultSelector, logger, serializer) {
+        super();
+        this.url = url;
+        this.reconnectInterval = reconnectInterval;
+        this.reconnectAttempts = reconnectAttempts;
+        this.resultSelector = resultSelector;
+        this.logger = logger;
+        this.serializer = serializer;
+        this.defaultResultSelector = (e) => {
+            if (e.data)
+                return JSON.parse(e.data);
+        };
+        this.defaultSerializer = (data) => {
+            this.logger.debug("deserializing...");
+            return JSON.stringify(data);
+        };
+        this.connectionStatus = new rxjs_1.Observable((observer) => {
+            this.connectionObserver = observer;
+        }).pipe((0, operators_1.share)(), (0, operators_1.distinctUntilChanged)());
+        if (!resultSelector) {
+            this.resultSelector = this.defaultResultSelector;
+        }
+        if (!this.serializer) {
+            this.serializer = this.defaultSerializer;
+        }
+        this.wsSubjectConfig = {
+            url: url,
+            closeObserver: {
+                next: (e) => {
+                    this.logger.detail(`connection CLOSE [code: ${e.code}]`);
+                    this.socket = undefined;
+                    if (this.connectionObserver) {
+                        this.connectionObserver.next(false);
+                    }
+                    else {
+                        return undefined; // false?
+                    }
+                }
+            },
+            openObserver: {
+                next: (e) => {
+                    this.logger.detail(`connection OPEN`);
+                    if (this.connectionObserver) {
+                        this.connectionObserver.next(true);
+                    }
+                    else {
+                        return undefined; // false?
+                    }
+                }
+            }
+        };
+        this.connect();
+        this.connectionStatus.subscribe((isConnected) => {
+            this.logger.debug(`Connection status: ${isConnected ? "connected" : "not connected"}`);
+            if (!this.reconnectionObservable && typeof (isConnected) == "boolean" && !isConnected) {
+                this.reconnect();
+            }
+        });
+    }
+    connect() {
+        this.socket = new webSocket_1.WebSocketSubject(this.wsSubjectConfig);
+        this.socket
+            .pipe((0, operators_1.tap)(msg => {
+            var _a;
+            if (msg) {
+                if (msg.action === "connection" && this.cnxnHandler) {
+                    try {
+                        this.cnxnHandler(msg.error, msg.payload);
+                    }
+                    catch (err) {
+                        this.logger.warn(`Unhandled exception in connection handler: ${(_a = err.message) !== null && _a !== void 0 ? _a : "(no details available)"}`);
+                    }
+                    // } else {
+                    //   this.logger.debug(msg);
+                }
+            }
+        }))
+            .subscribe((m) => {
+            this.next(m);
+            this.resultSelector(m);
+        }, (error) => {
+            var _a;
+            this.logger.error(`Connection error: ${(_a = error.message) !== null && _a !== void 0 ? _a : ""}`);
+            if (!this.socket) {
+                this.reconnect();
+            }
+        });
+    }
+    onSocketConnection(handler) {
+        this.cnxnHandler = handler;
+    }
+    reconnect() {
+        this.reconnectionObservable = (0, rxjs_1.interval)(this.reconnectInterval)
+            .pipe((0, operators_1.takeWhile)((v, index) => {
+            return index < this.reconnectAttempts && !this.socket;
+        }));
+        this.reconnectionObservable.subscribe(() => {
+            this.connect();
+            // this.send(this.data);
+        }, null, () => {
+            this.reconnectionObservable = undefined;
+            if (!this.socket) {
+                this.complete();
+                if (this.connectionObserver) {
+                    this.connectionObserver.complete();
+                }
+                else {
+                    return undefined;
+                }
+            }
+        });
+    }
+    send(data) {
+        this.data = data;
+        if (this.data && this.socket)
+            this.socket.next(this.data);
+    }
+};
+RxWebsocketSubject = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [String, Number, Number, Function, Object, Function])
+], RxWebsocketSubject);
+exports.RxWebsocketSubject = RxWebsocketSubject;
+//# sourceMappingURL=rx-websocket-subject.js.map

package/lib/relay/wsclient/rx-websocket-subject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rx-websocket-subject.js","sourceRoot":"","sources":["../../../src/relay/wsclient/rx-websocket-subject.ts"],"names":[],"mappings":"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"}

package/lib/relay/wsclient/socket-contracts.d.ts

@@ -0,0 +1,22 @@
+export type SocketPayload = {
+    [name: string]: string | string[] | any;
+};
+export type SocketAction = {
+    action: string;
+    correlationId: string;
+    payload?: SocketPayload;
+};
+export type SocketActionHandler = (response: SocketAction) => void;
+export type SocketActionHandlerAsync = (response: SocketAction) => Promise<void>;
+export interface IMessage {
+    messageId: string;
+    entity: any;
+    entityId: string;
+    entityType: string;
+    operation: string;
+    messageType: string;
+    sentBy: string;
+    sentOn: Date;
+    description: string;
+    correlationId?: string | undefined;
+}

package/lib/relay/wsclient/socket-contracts.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=socket-contracts.js.map

package/lib/relay/wsclient/socket-contracts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"socket-contracts.js","sourceRoot":"","sources":["../../../src/relay/wsclient/socket-contracts.ts"],"names":[],"mappings":""}

package/lib/uilogic/cloud-provider-contextualizer.js

@@ -112,12 +112,14 @@ let CloudProviderContextualizer = CloudProviderContextualizer_1 = class CloudPro
                     if (!isAuthed) {
                         let loginUi = this.loginUiFactory.create(providerCode, ioc);
                         let userName;
-                        if (suppressConfirmations)
-                            [isAuthed, userName] = yield loginUi.promptToLogin(undefined, suppressConfirmations, providedUserName, providedSecret);
-                        while (!isAuthed && !suppressConfirmations) {
-                            loginUi = this.loginUiFactory.create(providerCode, ioc);
-                            [isAuthed, userName] = yield loginUi.promptToLogin(undefined, suppressConfirmations, providedUserName, providedSecret);
-                        }
+                        // if (suppressConfirmations)
+                        [isAuthed, userName] = yield loginUi.promptToLogin(undefined, suppressConfirmations, providedUserName, providedSecret);
+                        if (!isAuthed)
+                            throw new Error(`Login to ${providerCode} failed${providedUserName ? " for " + providedUserName : ""}.`);
+                        // while (!isAuthed && !suppressConfirmations) {
+                        //   loginUi = this.loginUiFactory.create(providerCode, ioc);
+                        //   [isAuthed, userName] = await loginUi.promptToLogin(undefined, suppressConfirmations, providedUserName, providedSecret);
+                        // }
                         output = { username: userName }; // assertion operator ok; logic forces it.
                     }
                     resolve(output.username); // operator ok bc logic forces output to be defined.

package/lib/uilogic/cloud-provider-contextualizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"cloud-provider-contextualizer.js","sourceRoot":"","sources":["../../src/uilogic/cloud-provider-contextualizer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cloud-provider-contextualizer.js","sourceRoot":"","sources":["../../src/uilogic/cloud-provider-contextualizer.ts"],"names":[],"mappings":"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"}

package/lib/uilogic/cloud-resource-configurator-factory.js

@@ -9,6 +9,7 @@ const aws_resource_configurator_1 = require("./cloud-resource-configurators/aws-
 const azure_resource_configurator_1 = require("./cloud-resource-configurators/azure-resource-configurator");
 const docker_hub_resource_configurator_1 = require("./cloud-resource-configurators/docker-hub-resource-configurator");
 const helm_resource_configurator_1 = require("./cloud-resource-configurators/helm-resource-configurator");
+const az_interactive_login_configurator_1 = require("./cloud-resource-configurators/az-interactive-login-configurator");
 class INTERFACES_CLI_ENTERPRISE {
 }
 exports.INTERFACES_CLI_ENTERPRISE = INTERFACES_CLI_ENTERPRISE;
@@ -128,7 +129,8 @@ let LoginConfiguratorFactory = LoginConfiguratorFactory_1 = class LoginConfigura
         }
         if (!ioc.isBoundNamed(INTERFACES_CLI_ENTERPRISE.ILoginConfigurator, codiac_domain_1.CloudProviderEnum.azure)) {
             ioc.bind(INTERFACES_CLI_ENTERPRISE.ILoginConfigurator)
-                .to(azure_resource_configurator_1.AzureResourceConfigurator)
+                // .to(AzureResourceConfigurator)
+                .to(az_interactive_login_configurator_1.AzureInteractiveLoginConfigurator)
                 .whenTargetNamed(codiac_domain_1.CloudProviderEnum.azure);
         }
         if (!ioc.isBoundNamed(INTERFACES_CLI_ENTERPRISE.ILoginConfigurator, codiac_domain_1.CloudProviderEnum.dockerHub)) {

package/lib/uilogic/cloud-resource-configurator-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"cloud-resource-configurator-factory.js","sourceRoot":"","sources":["../../src/uilogic/cloud-resource-configurator-factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cloud-resource-configurator-factory.js","sourceRoot":"","sources":["../../src/uilogic/cloud-resource-configurator-factory.ts"],"names":[],"mappings":";;;;;AAAA,4DAA6D;AAC7D,yCAAmD;AAEnD,wGAAmG;AACnG,4GAAuG;AACvG,sHAAgH;AAChH,0GAAqG;AAIrG,wHAAqH;AAGrH,MAAa,yBAAyB;;AAAtC,8DAMC;AALwB,+CAAqB,GAAW,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;AACpE,8CAAoB,GAAW,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAClE,2CAAiB,GAAW,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAC5D,4CAAkB,GAAW,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AAC9D,kDAAwB,GAAW,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AAK5F,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAGtC,kBAAkB;IACX,MAAM,CAAC,SAAS,CAAC,GAAyB;QAE/C,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,qBAAqB,EAAE,iCAAiB,CAAC,GAAG,CAAC,EAAE;YAC7F,GAAG,CAAC,IAAI,CAAwB,yBAAyB,CAAC,qBAAqB,CAAC;iBAC7E,EAAE,CAAC,mDAAuB,CAAC;iBAC3B,eAAe,CAAC,iCAAiB,CAAC,GAAG,CAAC,CAAC;SAC3C;QAGD,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,qBAAqB,EAAE,iCAAiB,CAAC,KAAK,CAAC,EAAE;YAC/F,GAAG,CAAC,IAAI,CAAwB,yBAAyB,CAAC,qBAAqB,CAAC;iBAC7E,EAAE,CAAC,uDAAyB,CAAC;iBAC7B,eAAe,CAAC,iCAAiB,CAAC,KAAK,CAAC,CAAC;SAC7C;QAED,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,qBAAqB,EAAE,iCAAiB,CAAC,SAAS,CAAC,EAAE;YACnG,GAAG,CAAC,IAAI,CAAwB,yBAAyB,CAAC,qBAAqB,CAAC;iBAC7E,EAAE,CAAC,gEAA6B,CAAC;iBACjC,eAAe,CAAC,iCAAiB,CAAC,SAAS,CAAC,CAAC;SACjD;QAED,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,qBAAqB,EAAE,iCAAiB,CAAC,KAAK,CAAC,EAAE;YAC/F,GAAG,CAAC,IAAI,CAAwB,yBAAyB,CAAC,qBAAqB,CAAC;iBAC7E,EAAE,CAAC,qDAAwB,CAAC;iBAC5B,eAAe,CAAC,iCAAiB,CAAC,KAAK,CAAC,CAAC;SAC7C;IACH,CAAC;IAED;IACA,CAAC;IAGM,MAAM,CAAC,QAA2B,EAAE,GAAyB;QAClE,OAAO,GAAG,CAAC,QAAQ,CAAwB,yBAAyB,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;IACxG,CAAC;CACF,CAAA;AAvCY,2BAA2B;IADvC,IAAA,sBAAU,GAAE;;GACA,2BAA2B,CAuCvC;AAvCY,kEAA2B;AA6CjC,IAAM,0BAA0B,kCAAhC,MAAM,0BAA0B;IAGrC,kBAAkB;IACX,MAAM,CAAC,SAAS,CAAC,GAAyB;QAE/C,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,EAAE;YAEhC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,oBAAoB,EAAE,iCAAiB,CAAC,GAAG,CAAC,EAAE;gBAC5F,GAAG,CAAC,IAAI,CAAuB,yBAAyB,CAAC,oBAAoB,CAAC;qBAC3E,EAAE,CAAC,mDAAuB,CAAC;qBAC3B,eAAe,CAAC,iCAAiB,CAAC,GAAG,CAAC,CAAC;aAC3C;YAED,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,oBAAoB,EAAE,iCAAiB,CAAC,KAAK,CAAC,EAAE;gBAC9F,GAAG,CAAC,IAAI,CAAuB,yBAAyB,CAAC,oBAAoB,CAAC;qBAC3E,EAAE,CAAC,uDAAyB,CAAC;qBAC7B,eAAe,CAAC,iCAAiB,CAAC,KAAK,CAAC,CAAC;aAC7C;YAED,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,4BAA0B,CAAC,EAAE;gBAC5C,GAAG,CAAC,IAAI,CAAC,4BAA0B,CAAC,CAAC,MAAM,EAAE,CAAC;aAC/C;YAED,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;SAC5B;IACH,CAAC;IAID;IACA,CAAC;IAGM,MAAM,CAAC,QAA2B,EAAE,GAAyB;QAClE,OAAO,GAAG,CAAC,QAAQ,CAAuB,yBAAyB,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;IACtG,CAAC;IAEM,eAAe,CAAC,GAAyB;QAC9C,OAAO,GAAG,CAAC,MAAM,CAAuB,yBAAyB,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IACpH,CAAC;CACF,CAAA;AAzCY,0BAA0B;IADtC,IAAA,sBAAU,GAAE;;GACA,0BAA0B,CAyCtC;AAzCY,gEAA0B;AAgDhC,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAGzC,kBAAkB;IACX,MAAM,CAAC,SAAS,CAAC,GAAyB;QAE/C,yBAAyB;QACzB,sGAAsG;QACtG,2FAA2F;QAC3F,mCAAmC;QACnC,+CAA+C;QAC/C,IAAI;QAGJ,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,wBAAwB,EAAE,iCAAiB,CAAC,KAAK,CAAC,EAAE;YAClG,GAAG,CAAC,IAAI,CAA2B,yBAAyB,CAAC,wBAAwB,CAAC;iBACnF,EAAE,CAAC,uDAAyB,CAAC;iBAC7B,eAAe,CAAC,iCAAiB,CAAC,KAAK,CAAC,CAAC;SAC7C;IAEH,CAAC;IAED;IACA,CAAC;IAGM,MAAM,CAAC,QAA2B,EAAE,GAAyB;QAClE,OAAO,GAAG,CAAC,QAAQ,CAA2B,yBAAyB,CAAC,wBAAwB,EAAE,QAAQ,CAAC,CAAC;IAC9G,CAAC;IAEM,eAAe,CAAC,GAAyB;QAC9C,OAAO,GAAG,CAAC,MAAM,CAA2B,yBAAyB,CAAC,wBAAwB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAC5H,CAAC;CACF,CAAA;AAjCY,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;;GACA,8BAA8B,CAiC1C;AAjCY,wEAA8B;AAwCpC,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IAGnC,kBAAkB;IACX,MAAM,CAAC,SAAS,CAAC,GAAyB;QAE/C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,0BAAwB,CAAC,EAAE;YAC1C,GAAG,CAAC,IAAI,CAAC,0BAAwB,CAAC,CAAC,MAAM,EAAE,CAAC;SAC7C;QAED,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,kBAAkB,EAAE,iCAAiB,CAAC,GAAG,CAAC,EAAE;YAC1F,GAAG,CAAC,IAAI,CAAqB,yBAAyB,CAAC,kBAAkB,CAAC;iBACvE,EAAE,CAAC,mDAAuB,CAAC;iBAC3B,eAAe,CAAC,iCAAiB,CAAC,GAAG,CAAC,CAAC;SAC3C;QAED,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,kBAAkB,EAAE,iCAAiB,CAAC,KAAK,CAAC,EAAE;YAC5F,GAAG,CAAC,IAAI,CAAqB,yBAAyB,CAAC,kBAAkB,CAAC;gBACxE,iCAAiC;iBAChC,EAAE,CAAC,qEAAiC,CAAC;iBACrC,eAAe,CAAC,iCAAiB,CAAC,KAAK,CAAC,CAAC;SAC7C;QAED,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,kBAAkB,EAAE,iCAAiB,CAAC,SAAS,CAAC,EAAE;YAChG,GAAG,CAAC,IAAI,CAAqB,yBAAyB,CAAC,kBAAkB,CAAC;iBACvE,EAAE,CAAC,gEAA6B,CAAC;iBACjC,eAAe,CAAC,iCAAiB,CAAC,SAAS,CAAC,CAAC;SACjD;IAEH,CAAC;IAED;IACA,CAAC;IAGM,MAAM,CAAC,QAA2B,EAAE,GAAyB;QAClE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,yBAAyB,CAAC,kBAAkB,EAAE,QAAQ,CAAC,EAAE;YAC7E,MAAM,IAAI,KAAK,CAAC,2CAA2C,QAAQ,GAAG,CAAC,CAAC;SACzE;QACD,OAAO,GAAG,CAAC,QAAQ,CAAqB,yBAAyB,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IAClG,CAAC;IAEM,eAAe,CAAC,GAAyB;QAC9C,OAAO,GAAG,CAAC,MAAM,CAAqB,yBAAyB,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAChH,CAAC;CACF,CAAA;AA7CY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;;GACA,wBAAwB,CA6CpC;AA7CY,4DAAwB"}

package/lib/uilogic/cloud-resource-configurators/az-interactive-login-configurator.d.ts

@@ -0,0 +1,31 @@
+import { IBetterLogger } from "@codiac.io/codiac-common";
+import { CloudProviderEnum } from "@codiac.io/codiac-domain";
+import { IOutputStyler, IUserInputProvider, UserNameTenantCode } from "@codiac.io/codiac-ops-common";
+import { RelayClient as GenRelayClient } from "../../apis/codiac-relay";
+import { ILoginConfigurator } from "../i-login-configurator";
+import { OperationMeta } from '../../ops';
+import { RelayWebsocketClient } from '../../relay/wsclient/relay-websocket-client';
+/** Implements AuthorizationCode Flow with a popup-browser interactive login
+ * for user to authenticate and provide consent.
+ */
+export declare class AzureInteractiveLoginConfigurator implements ILoginConfigurator {
+    private opMeta;
+    private genRelayClient;
+    private relayWebSocket;
+    private codiacUser;
+    private _ui;
+    private _styler;
+    private logger;
+    constructor(opMeta: OperationMeta, genRelayClient: GenRelayClient, relayWebSocket: RelayWebsocketClient, codiacUser: UserNameTenantCode, _ui: IUserInputProvider, _styler: IOutputStyler, logger: IBetterLogger);
+    get cloudProvider(): CloudProviderEnum;
+    /** Performs an EXPLICIT login sequence in ALL CASES.
+     * It does NOT attempt or defer to a silent authentication.
+     *
+     * iow:  Invoke this when the silent methods have failed. */
+    promptToLogin(azSubscriptionId?: string | undefined, suppressConfirmations?: boolean | undefined, userName?: string | undefined, password?: string | undefined, webSocketId?: string): Promise<[boolean, string]>;
+    /** Opens the the external login url in a browser window.
+     * Returns at the end of the sequence.
+     * Throws on any errors.
+     */
+    private invokeBrowserSequence;
+}

package/lib/uilogic/cloud-resource-configurators/az-interactive-login-configurator.js

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AzureInteractiveLoginConfigurator = void 0;
+const tslib_1 = require("tslib");
+const open = require("open");
+const inversify_1 = require("inversify");
+const codiac_common_1 = require("@codiac.io/codiac-common");
+const codiac_domain_1 = require("@codiac.io/codiac-domain");
+const codiac_ops_common_1 = require("@codiac.io/codiac-ops-common");
+const codiac_relay_1 = require("../../apis/codiac-relay");
+const ops_1 = require("../../ops");
+const relay_websocket_client_1 = require("../../relay/wsclient/relay-websocket-client");
+/** Implements AuthorizationCode Flow with a popup-browser interactive login
+ * for user to authenticate and provide consent.
+ */
+let AzureInteractiveLoginConfigurator = class AzureInteractiveLoginConfigurator {
+    constructor(opMeta, genRelayClient, 
+    // @inject(RelaySocketListener) private relayWebSocket: RelaySocketListener,
+    relayWebSocket, codiacUser, _ui, _styler, logger) {
+        this.opMeta = opMeta;
+        this.genRelayClient = genRelayClient;
+        this.relayWebSocket = relayWebSocket;
+        this.codiacUser = codiacUser;
+        this._ui = _ui;
+        this._styler = _styler;
+        this.logger = logger;
+    }
+    get cloudProvider() {
+        return codiac_domain_1.CloudProviderEnum.azure;
+    }
+    /** Performs an EXPLICIT login sequence in ALL CASES.
+     * It does NOT attempt or defer to a silent authentication.
+     *
+     * iow:  Invoke this when the silent methods have failed. */
+    promptToLogin(azSubscriptionId, suppressConfirmations, userName, password, webSocketId) {
+        var _a, _b, _c;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                // 1. Establish 2-way messaging channel w the relay
+                let commChannel;
+                // if (webSocketId) {
+                //   commChannel = { socketId: webSocketId };
+                // } else {
+                //   commChannel = {
+                //     socketId: await this.openWebSocket()
+                //   };
+                // }
+                commChannel = {
+                    socketId: yield this.relayWebSocket.open() // .start()
+                };
+                // 2. Get the login url
+                let authResult = yield this.genRelayClient.Call.csp_login_interactive({ providerCode: this.cloudProvider, commChannel: commChannel, correlationId: this.opMeta.correlationId }, {});
+                if (authResult.error)
+                    throw authResult.error;
+                let loginUrl = (_a = authResult.output) === null || _a === void 0 ? void 0 : _a.loginUrl;
+                if (loginUrl == undefined)
+                    throw new Error(`No interactive login url found.`);
+                // 3. Trigger the external auth sequence in a browser window.
+                let result = yield this.invokeBrowserSequence(loginUrl);
+                yield this.relayWebSocket.close();
+                return result;
+            }
+            catch (err) {
+                throw new Error(`Error logging into ${this.cloudProvider}: ${(_b = err.name) !== null && _b !== void 0 ? _b : ""} ${(_c = err.message) !== null && _c !== void 0 ? _c : "(not details available)"}`);
+            }
+        });
+    }
+    /** Opens the the external login url in a browser window.
+     * Returns at the end of the sequence.
+     * Throws on any errors.
+     */
+    invokeBrowserSequence(loginUrl) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                try {
+                    let isCompleted = false;
+                    let isAuthed = false; // Read this from the websocket message / fail / timeout.
+                    let cspUserName; // Read this from the websocket message
+                    let handlerId = this.relayWebSocket.listenFor("loginComplete", msg => {
+                        isCompleted = true;
+                        // TODO: get these from the completion message
+                        isAuthed = true;
+                        cspUserName = "anonymous@domain.com";
+                        this.logger.debug(`Interactive login sequence completed`, msg);
+                        this.relayWebSocket.unlisten("loginComplete", handlerId);
+                        resolve([isAuthed, cspUserName]);
+                        // return;
+                    });
+                    // 3. Sprout the login interaction in a browser popup
+                    let childProcess = yield open(loginUrl, {});
+                    // 4. Wait for the completion message via websocket
+                    let timeout = Date.now() + 300000; // 5 mins
+                    this._ui.startSpinner(`Waiting on interactive login...`);
+                    let intervalId = setInterval(() => {
+                        if (isCompleted) {
+                            // Kill the popup browser process (ie: close the window) cuz we know the sequence has completed.
+                            // childProcess.kill();  // Commneted out bc it doesnt actually close the browser window.
+                            this._ui.stopSpinner("Completed");
+                            clearInterval(intervalId);
+                        }
+                        else if (Date.now() > timeout) {
+                            // console.log(".");
+                            this._ui.stopSpinner("Timed out");
+                            clearInterval(intervalId);
+                            resolve([false, "none"]); // <--- This is our safety net
+                        }
+                    }, 250);
+                }
+                catch (err) {
+                    reject(err);
+                }
+            }));
+        });
+    }
+};
+AzureInteractiveLoginConfigurator = tslib_1.__decorate([
+    (0, inversify_1.injectable)(),
+    tslib_1.__param(0, (0, inversify_1.inject)(ops_1.OperationMeta)),
+    tslib_1.__param(1, (0, inversify_1.inject)(codiac_relay_1.RelayClient)),
+    tslib_1.__param(2, (0, inversify_1.inject)(relay_websocket_client_1.RelayWebsocketClient)),
+    tslib_1.__param(3, (0, inversify_1.inject)(codiac_ops_common_1.UserNameTenantCode)),
+    tslib_1.__param(4, (0, inversify_1.inject)(codiac_ops_common_1.INTERFACES_OPS.IUserInputProvider)),
+    tslib_1.__param(5, (0, inversify_1.inject)(codiac_ops_common_1.INTERFACES_OPS.IOutputStyler)),
+    tslib_1.__param(6, (0, inversify_1.inject)(codiac_common_1.INTERFACES.IBetterLogger)),
+    tslib_1.__metadata("design:paramtypes", [ops_1.OperationMeta,
+        codiac_relay_1.RelayClient,
+        relay_websocket_client_1.RelayWebsocketClient,
+        codiac_ops_common_1.UserNameTenantCode, Object, Object, Object])
+], AzureInteractiveLoginConfigurator);
+exports.AzureInteractiveLoginConfigurator = AzureInteractiveLoginConfigurator;
+//# sourceMappingURL=az-interactive-login-configurator.js.map