@squiz/dxp-cli-next 4.1.0-develop.1 → 4.1.0-develop.3

package/lib/auth/login.js

@@ -8,18 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_color_1 = require("cli-color");
 const commander_1 = require("commander");
 const ApiService_1 = require("../ApiService");
 const ApplicationStore_1 = require("../ApplicationStore");
-// TODO: Confirm production URL
+const prompt_1 = __importDefault(require("prompt"));
 const PRODUCTION_URL = 'https://dxp.squiz.cloud';
 const loginCommand = new commander_1.Command('login')
     .name('login')
     .description('Login to the DXP platform')
-    .argument('<username>', 'dxp username')
-    .argument('<password>', 'dxp password')
+    .addOption(new commander_1.Option('--username <username>', 'Optionally provide username through CLI, or environment variable. If this option is omitted you will be prompted for input in interactive mode').env('DXP_USERNAME'))
+    .addOption(new commander_1.Option('--password <password>', 'Optionally provide password through CLI, or environment variable. If this option is omitted you will be prompted for input in interactive mode').env('DXP_PASSWORD'))
     .addOption(new commander_1.Option('--dxp-base-url <baseURL>', 'dxp cloud base url e.g. "https://develop-apps-dxp-console.dev.dxp.squiz.cloud/"')
     .env('DXP_BASE_URL')
     .default(PRODUCTION_URL))
@@ -30,10 +33,62 @@ const loginCommand = new commander_1.Command('login')
         write((0, cli_color_1.red)(str));
     },
 })
-    .action((username, password, options) => {
-    return handleLoginRequest({ username, password }, options);
-});
+    .action((options) => __awaiter(void 0, void 0, void 0, function* () {
+    const credentials = yield getLoginCredentials(options.username, options.password);
+    if (credentials == false) {
+        console.log(''); // needed to not screw up line endings in terminal
+        return;
+    }
+    return handleLoginRequest(credentials, options);
+}));
 exports.default = loginCommand;
+function getLoginCredentials(optionalUsername, optionalPassword) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const prompts = [];
+        let username = '';
+        let password = '';
+        if (!optionalUsername) {
+            prompts.push({
+                name: 'username',
+                description: 'Username: ',
+                required: true,
+            });
+        }
+        else {
+            username = optionalUsername;
+        }
+        if (!optionalPassword) {
+            prompts.push({
+                name: 'password',
+                description: 'Password: ',
+                hidden: true,
+                replace: '*',
+                required: true,
+            });
+        }
+        else {
+            password = optionalPassword;
+        }
+        let result;
+        try {
+            prompt_1.default.start({ message: ' ', delimiter: ' ' });
+            result = yield prompt_1.default.get(prompts);
+        }
+        catch (e) {
+            if (e instanceof Error && e.message === 'canceled') {
+                return false;
+            }
+            else {
+                throw e;
+            }
+        }
+        if (result.username)
+            username = result.username;
+        if (result.password)
+            password = result.password;
+        return { username, password };
+    });
+}
 function handleLoginRequest(login, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const apiService = new ApiService_1.ApiService();

package/lib/cmp/deploy.js

@@ -25,6 +25,9 @@ const deployCommand = new commander_1.Command()
     .addOption(new commander_1.Option('-t, --tenant <string>', 'Tenant ID to deploy to. If not provided will use configured tenant from login'))
     .action((source, options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
+    if (process.env.COMPONENT_SERVICE_URL !== undefined) {
+        console.log(`NOTICE: COMPONENT_SERVICE_URL is set and will deploy to ${process.env.COMPONENT_SERVICE_URL}`);
+    }
     if (!options.componentServiceUrl &&
         !(yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie))) {
         deployCommand.error(cli_color_1.default.red('You must login to deploy components. See `dxp-next auth login`'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "4.1.0-develop.1",
+  "version": "4.1.0-develop.3",
   "repository": {
     "url": "https://gitlab.squiz.net/developer-experience/dxp-cli-next"
   },
@@ -45,6 +45,7 @@
     "cli-color": "2.0.3",
     "commander": "9.4.0",
     "env-paths": "2.2.1",
+    "prompt": "^1.3.0",
     "tough-cookie": "4.1.2",
     "update-notifier": "5.1.0"
   },
@@ -55,6 +56,7 @@
     "@types/cli-color": "2.0.2",
     "@types/jest": "28.1.6",
     "@types/node": "17.0.45",
+    "@types/prompt": "^1.1.4",
     "@types/tough-cookie": "4.0.2",
     "@types/update-notifier": "5.1.0",
     "@typescript-eslint/eslint-plugin": "5.30.7",