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

package/lib/auth/login.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -40,7 +63,16 @@ const loginCommand = new commander_1.Command('login')
             console.log(''); // needed to not screw up line endings in terminal
             return;
         }
-        return yield handleLoginRequest(credentials, options);
+        yield handleLoginRequest(credentials, options);
+        const availableTenants = yield handleGetTenantsRequest(options);
+        if (options.tenant == undefined) {
+            const selectedTenant = yield promptForTenant(availableTenants);
+            options.tenant = selectedTenant;
+        }
+        else {
+            validateTenant(options.tenant, availableTenants);
+        }
+        return yield writeTenantToSessionConfig(options);
     }
     catch (error) {
         if (!!process.env.DEBUG && error.stack) {
@@ -54,7 +86,6 @@ const loginCommand = new commander_1.Command('login')
         }
     }
 }));
-exports.default = loginCommand;
 function getLoginCredentials(optionalUsername, optionalPassword) {
     return __awaiter(this, void 0, void 0, function* () {
         const prompts = [];
@@ -117,7 +148,6 @@ function handleLoginRequest(login, options) {
                 console.log('Login successful');
                 yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig, JSON.stringify({
                     baseUrl,
-                    tenant: options.tenant,
                     region: options.region,
                 }));
                 return;
@@ -126,3 +156,82 @@ function handleLoginRequest(login, options) {
         }
     });
 }
+function handleGetTenantsRequest(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const apiService = new ApiService_1.ApiService();
+        const baseUrl = options.dxpBaseUrl.replace(/\/$/, '');
+        const tenantsUrl = `${baseUrl}/__dxp/${options.region}/dxp/access/tenants`;
+        const tenantsResponse = yield apiService.client.get(tenantsUrl);
+        switch (tenantsResponse.status) {
+            case 200:
+                return tenantsResponse.data;
+            default:
+                throw new Error(`An error occurred fetching tenants ${tenantsResponse.data.message
+                    ? `"${tenantsResponse.data.message}"`
+                    : ''} (code: ${tenantsResponse.status})`.trim());
+        }
+    });
+}
+function promptForTenant(tenants) {
+    return __awaiter(this, void 0, void 0, function* () {
+        //Our tsconfig module is commonjs so we need to use require here and only version ^8.0.0 of inquirer as latest is default esm
+        const inquirer = yield Promise.resolve().then(() => __importStar(require('inquirer')));
+        const tenantChoices = formatTenantResponseForInquirer(tenants);
+        const selectedTenant = yield inquirer.default.prompt([
+            {
+                type: 'list',
+                name: 'selectedTenantId',
+                message: 'Select a tenant: ',
+                choices: tenantChoices,
+            },
+        ]);
+        //return the tenant ID
+        return selectedTenant.selectedTenantId;
+    });
+}
+function formatTenantResponseForInquirer(tenants) {
+    return tenants.organisations.map(tenant => {
+        return {
+            name: `${tenant.name} : (${tenant.id})`,
+            value: tenant.id,
+        };
+    });
+}
+function validateTenant(tenant, tenants) {
+    if (tenants.organisations.some(t => t.id === tenant)) {
+        return true;
+    }
+    else {
+        let tenantListErrorString = undefined;
+        if (tenants.organisations.length > 5) {
+            const initialTenants = tenants.organisations.slice(0, 5).map(t => t.name);
+            tenantListErrorString = `${initialTenants} ... and ${tenants.organisations.length - 5} more}`;
+        }
+        else {
+            tenantListErrorString = tenants.organisations.map(t => t.name).join(', ');
+        }
+        throw new Error(`
+    The tenant ID you provided : ${tenant} does not correspond to a tenant that you have access to.\n
+    Please ensure that you are using the correct ID and that you have the appropriate permissions to access this tenant.
+    Here is a list of the tenants you have access to: ${tenantListErrorString || 'None'}
+    `);
+    }
+}
+function writeTenantToSessionConfig(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseUrl = options.dxpBaseUrl.replace(/\/$/, '');
+        try {
+            yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig, JSON.stringify({
+                baseUrl,
+                tenant: options.tenant,
+                region: options.region,
+            }));
+            console.log('Tenant saved to session');
+            return;
+        }
+        catch (error) {
+            throw new Error(`An error occurred during saving of tenant: ${error}`);
+        }
+    });
+}
+exports.default = loginCommand;

package/lib/cmp/init.js

@@ -24,6 +24,7 @@ var componentTypes;
 const initCommand = new commander_1.Command()
     .name('init')
     .argument('<path>', 'Destination directory for component')
+    .description('Create a new component from a template')
     .addOption(new commander_1.Option('-t, --type <string>', 'Type of component to create.')
     .choices(['basic', 'advanced'])
     .default('basic'))
@@ -33,10 +34,14 @@ const initCommand = new commander_1.Command()
         initCommand.error(cli_color_1.default.red('Invalid component type. Must be one of: basic, advanced'));
         return;
     }
+    if (install && componentType === 'basic') {
+        initCommand.error(cli_color_1.default.red('Component type "basic" does not come with a package.json file, install is not a valid option'));
+        return;
+    }
     console.log(`Creating ${componentType} component in ${destination}...`);
     try {
         yield (0, component_cli_lib_1.componentInit)({ componentType, destination });
-        if (install && componentType === 'advanced') {
+        if (install) {
             console.log('Installing dependencies');
             (0, child_process_1.execSync)('npm i', {
                 cwd: destination,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.4.0-develop.1",
+  "version": "5.4.0-develop.3",
   "repository": {
     "url": "https://gitlab.squiz.net/developer-experience/dxp-cli-next"
   },
@@ -39,11 +39,12 @@
     "codecov"
   ],
   "dependencies": {
-    "@squiz/component-cli-lib": "1.15.0",
+    "@squiz/component-cli-lib": "1.16.0",
     "axios": "1.1.3",
     "cli-color": "2.0.3",
     "commander": "9.4.0",
     "env-paths": "2.2.1",
+    "inquirer": "8.2.5",
     "prompt": "^1.3.0",
     "tough-cookie": "4.1.2",
     "update-notifier": "5.1.0"
@@ -53,6 +54,7 @@
     "@semantic-release/gitlab": "9.4.2",
     "@semantic-release/npm": "9.0.1",
     "@types/cli-color": "2.0.2",
+    "@types/inquirer": "8.2.6",
     "@types/jest": "28.1.6",
     "@types/node": "17.0.45",
     "@types/prompt": "^1.1.4",