@squiz/dxp-cli-next 5.11.0 → 5.12.0-develop.1

package/README.md

@@ -11,9 +11,9 @@ npm i -g @squiz/dxp-cli-next
 ## Usage
 
 ```bash
-Usage: dxp [options] [command]
+Usage: dxp-next [options] [command]
 
-dxp commands
+dxp-next commands
 
 Options:
   -V, --version  output the version number

package/lib/__tests__/integration/main.spec.js

@@ -4,7 +4,7 @@ const helpers_1 = require("../helpers");
 describe('dxp', () => {
     it('should display the help contents', () => {
         const { stdout } = (0, helpers_1.runCLI)(process.cwd(), ['--help']);
-        expect(stdout).toContain('Usage: dxp [options] [command]');
+        expect(stdout).toContain('Usage: dxp-next [options] [command]');
     });
     it('should show all available commands', () => {
         var _a;

package/lib/auth/index.js

@@ -4,9 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
-const login_1 = __importDefault(require("./login"));
+const login_1 = __importDefault(require("./login/login"));
+const logout_1 = __importDefault(require("./logout/logout"));
 const authCommand = new commander_1.Command('auth');
 authCommand
     .description('Authenticate into the DXP CLI')
-    .addCommand(login_1.default);
+    .addCommand((0, login_1.default)())
+    .addCommand((0, logout_1.default)());
 exports.default = authCommand;

package/lib/auth/login/login.d.ts

@@ -0,0 +1,22 @@
+import { Command } from 'commander';
+interface LoginOptions {
+    dxpBaseUrl: string;
+    overrideSession: boolean | undefined;
+    region: string;
+    tenant: string | undefined;
+    username: string;
+}
+export declare type GetTenantsResponse = {
+    agencies: Array<any>;
+    organisations: Array<{
+        id: string;
+        name: string;
+        userRoles: Array<string>;
+    }>;
+};
+declare const createLoginCommand: () => Command;
+/**
+ * Poll for the authorised DXP session.
+ */
+export declare function pollForDxpSession(options: LoginOptions, sessionId: string): Promise<unknown>;
+export default createLoginCommand;

package/lib/auth/{login.js → login/login.js}

@@ -35,127 +35,158 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.pollForDxpSession = void 0;
 const cli_color_1 = __importDefault(require("cli-color"));
 const commander_1 = require("commander");
-const ApiService_1 = require("../ApiService");
-const ApplicationStore_1 = require("../ApplicationStore");
-const prompt_1 = __importDefault(require("prompt"));
+const ApiService_1 = require("../../ApiService");
+const ApplicationStore_1 = require("../../ApplicationStore");
+const opener_1 = __importDefault(require("opener"));
+const ora_1 = __importDefault(require("ora"));
+const crypto_1 = require("crypto");
 const PRODUCTION_URL = 'https://dxp.squiz.cloud';
-const loginCommand = new commander_1.Command('login')
-    .name('login')
-    .description('Login to the DXP platform')
-    .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))
-    .addOption(new commander_1.Option('--region <region>').choices(['au']).default('au'))
-    .addOption(new commander_1.Option('--tenant <tenantID>'))
-    .configureOutput({
-    outputError(str, write) {
-        write(cli_color_1.default.red(str));
-    },
-})
-    .action((options) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const credentials = yield getLoginCredentials(options.username, options.password);
-        if (credentials == false) {
-            console.log(''); // needed to not screw up line endings in terminal
-            return;
-        }
-        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) {
-            loginCommand.error(error.stack);
-        }
-        if (error.message) {
-            loginCommand.error(cli_color_1.default.red(error.message));
-        }
-        else {
-            loginCommand.error(cli_color_1.default.red('An unknown error occurred'));
-        }
-    }
-}));
-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;
+const AUTH_TIMEOUT = 300000;
+const createLoginCommand = () => {
+    const loginCommand = new commander_1.Command('login')
+        .name('login')
+        .description('Login to the DXP platform')
+        .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))
+        .addOption(new commander_1.Option('--region <region>').choices(['au']).default('au'))
+        .addOption(new commander_1.Option('--override-session', 'Override the existing authorized session if it exists'))
+        .addOption(new commander_1.Option('--tenant <tenantID>'))
+        .configureOutput({
+        outputError(str, write) {
+            write(cli_color_1.default.red(str));
+        },
+    })
+        .action((options) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            prompt_1.default.start({ message: ' ', delimiter: ' ' });
-            result = yield prompt_1.default.get(prompts);
+            const spinner = (0, ora_1.default)().start();
+            yield handleLoginRequest(options);
+            const availableTenants = yield handleGetTenantsRequest(options);
+            spinner.stop();
+            if (options.tenant == undefined) {
+                const selectedTenant = yield promptForTenant(availableTenants);
+                options.tenant = selectedTenant;
+            }
+            else {
+                validateTenant(options.tenant, availableTenants);
+            }
+            return yield writeTenantToSessionConfig(options);
         }
-        catch (e) {
-            if (e instanceof Error && e.message === 'canceled') {
-                return false;
+        catch (error) {
+            if (!!process.env.DEBUG && error.stack) {
+                loginCommand.error(error.stack);
+            }
+            if (error.message) {
+                loginCommand.error(cli_color_1.default.red(error.message));
             }
             else {
-                throw e;
+                loginCommand.error(cli_color_1.default.red('An unknown error occurred'));
             }
         }
-        if (result.username)
-            username = result.username;
-        if (result.password)
-            password = result.password;
-        return { username, password };
+    }));
+    return loginCommand;
+};
+function handleLoginRequest(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!options.overrideSession) {
+            // Check if currently stored session is still authorised.
+            const hasValidDxpSession = yield checkAuthorisation(options);
+            if (hasValidDxpSession) {
+                return;
+            }
+        }
+        const sessionId = yield openSSOLogin(options);
+        yield pollForDxpSession(options, sessionId);
     });
 }
-function handleLoginRequest(login, options) {
+function checkAuthorisation(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const apiService = new ApiService_1.ApiService();
         // Just need to make sure no extra slash at the end
         const baseUrl = options.dxpBaseUrl.replace(/\/$/, '');
-        const loginUrl = `${baseUrl}/__dxp/${options.region}/dxp/access/login`;
-        const loginString = Buffer.from(JSON.stringify(login)).toString('base64');
-        const loginResponse = yield apiService.client.post(loginUrl, {
-            token: loginString,
+        const { region } = options;
+        const healthCheckUrl = `${baseUrl}/__dxp/${region}/dxp/health`;
+        const response = yield apiService.client.get(healthCheckUrl);
+        return response.status === 200;
+    });
+}
+/**
+ * Return the session ID token and open the DXP login page in the default browser.
+ */
+function openSSOLogin(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // Just need to make sure no extra slash at the end
+        const baseUrl = options.dxpBaseUrl.replace(/\/$/, '');
+        // Generate a unique session to track the login request
+        const sessionId = `cli_${(0, crypto_1.randomUUID)()}`;
+        const tokenData = { sessionId };
+        const sessionToken = Buffer.from(JSON.stringify(tokenData)).toString('base64');
+        const loginUrl = `${baseUrl}/__sso/cli/login?code=${sessionToken}`;
+        (0, opener_1.default)(loginUrl);
+        return sessionToken;
+    });
+}
+/**
+ * Make a request for the authorised DXP session.
+ */
+function retrieveDxpSession(options, sessionId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const apiService = new ApiService_1.ApiService();
+        // Just need to make sure no extra slash at the end
+        const baseUrl = options.dxpBaseUrl.replace(/\/$/, '');
+        const pollingUrl = `${baseUrl}/__sso/cli/session`;
+        const pollingResponse = yield apiService.client.get(pollingUrl, {
+            params: { code: sessionId },
         });
-        switch (loginResponse.status) {
-            case 204:
+        switch (pollingResponse.status) {
+            case 200:
                 console.log('Login successful');
                 yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig, JSON.stringify({
                     baseUrl,
                     region: options.region,
                 }));
-                return;
+                return true;
+            case 404:
+                // Return false to allow polling to continue.
+                return false;
             default:
-                throw new Error(`An error occurred during login ${loginResponse.data.message ? `"${loginResponse.data.message}"` : ''} (code: ${loginResponse.status})`.trim());
+                throw new Error(`An error occurred during login ${pollingResponse.data.message
+                    ? `"${pollingResponse.data.message}"`
+                    : ''} (code: ${pollingResponse.status})`.trim());
         }
     });
 }
+/**
+ * Poll for the authorised DXP session.
+ */
+function pollForDxpSession(options, sessionId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            const errHandler = (err) => {
+                reject(err);
+            };
+            const checkSessionTimeout = setTimeout(() => {
+                reject('Timed out waiting for authorization, please try again.');
+            }, AUTH_TIMEOUT);
+            const poll = () => __awaiter(this, void 0, void 0, function* () {
+                const isSessionCreated = yield retrieveDxpSession(options, sessionId);
+                if (!isSessionCreated) {
+                    setTimeout(() => {
+                        poll().catch(errHandler);
+                    }, 2000);
+                    return;
+                }
+                clearTimeout(checkSessionTimeout);
+                resolve(true);
+            });
+            poll().catch(errHandler);
+        });
+    });
+}
+exports.pollForDxpSession = pollForDxpSession;
 function handleGetTenantsRequest(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const apiService = new ApiService_1.ApiService();
@@ -234,4 +265,4 @@ function writeTenantToSessionConfig(options) {
         }
     });
 }
-exports.default = loginCommand;
+exports.default = createLoginCommand;

package/lib/auth/login/login.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/auth/login/login.spec.js

@@ -0,0 +1,179 @@
+"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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 nock_1 = __importDefault(require("nock"));
+const ApplicationStore = __importStar(require("../../ApplicationStore"));
+describe('login', () => {
+    jest.mock('crypto');
+    jest.mock('opener');
+    jest.mock('inquirer');
+    let mockSessionToken;
+    let mockTenants;
+    beforeEach(() => {
+        nock_1.default.cleanAll();
+        jest.clearAllMocks();
+        jest.useRealTimers();
+        const mockTokenData = { sessionId: 'cli_1234' };
+        mockSessionToken = Buffer.from(JSON.stringify(mockTokenData)).toString('base64');
+        mockTenants = {
+            agencies: [],
+            organisations: [{ id: 'org-1234', name: 'org-1234', userRoles: [] }],
+        };
+        require('opener').mockClear().mockImplementation();
+        require('inquirer').prompt = jest
+            .fn()
+            .mockImplementation(() => Promise.resolve({ selectedTenantId: 'tenant-1234' }));
+        require('crypto').randomUUID = jest.fn().mockReturnValue('1234');
+        jest.spyOn(ApplicationStore, 'saveApplicationFile').mockImplementation();
+    });
+    it('should successfully login', () => __awaiter(void 0, void 0, void 0, function* () {
+        (0, nock_1.default)('http://localhost:9999')
+            .get('/__dxp/au/dxp/health')
+            .reply(401)
+            .post('/__sso/cli/login')
+            .reply(200)
+            .get(`/__sso/cli/session?code=${mockSessionToken}`)
+            .reply(200)
+            .get('/__dxp/au/dxp/access/tenants')
+            .reply(200, mockTenants);
+        const opener = require('opener');
+        const { default: createLoginCommand } = require('./login');
+        const program = createLoginCommand();
+        yield program.parseAsync([
+            'node',
+            'dxp-cli-next',
+            'auth',
+            'login',
+            '--dxp-base-url',
+            'http://localhost:9999',
+        ]);
+        expect(opener).toHaveBeenCalledWith(expect.stringContaining('http://localhost:9999/__sso/cli/login?code='));
+        expect(ApplicationStore.saveApplicationFile).toHaveBeenCalledTimes(2);
+    }));
+    it('should successfully log in after polling for the DXP session', () => __awaiter(void 0, void 0, void 0, function* () {
+        (0, nock_1.default)('http://localhost:9999')
+            .get('/__dxp/au/dxp/health')
+            .reply(401)
+            .post('/__sso/cli/login')
+            .reply(200)
+            .get(`/__sso/cli/session?code=${mockSessionToken}`)
+            .reply(404)
+            .get(`/__sso/cli/session?code=${mockSessionToken}`)
+            .reply(200)
+            .get('/__dxp/au/dxp/access/tenants')
+            .reply(200, mockTenants);
+        const opener = require('opener');
+        const { default: createLoginCommand } = require('./login');
+        const program = createLoginCommand();
+        yield program.parseAsync([
+            'node',
+            'dxp-cli-next',
+            'auth',
+            'login',
+            '--dxp-base-url',
+            'http://localhost:9999',
+        ]);
+        expect(opener).toHaveBeenCalledWith(expect.stringContaining('http://localhost:9999/__sso/cli/login?code='));
+        expect(ApplicationStore.saveApplicationFile).toHaveBeenCalledTimes(2);
+    }));
+    it('should log into an existing authorised session', () => __awaiter(void 0, void 0, void 0, function* () {
+        (0, nock_1.default)('http://localhost:9999')
+            .get('/__dxp/au/dxp/health')
+            .reply(200)
+            .get('/__dxp/au/dxp/access/tenants')
+            .reply(200, mockTenants);
+        const opener = require('opener');
+        const { default: createLoginCommand } = require('./login');
+        const program = createLoginCommand();
+        yield program.parseAsync([
+            'node',
+            'dxp-cli-next',
+            'auth',
+            'login',
+            '--dxp-base-url',
+            'http://localhost:9999',
+        ]);
+        expect(opener).not.toHaveBeenCalled();
+        expect(ApplicationStore.saveApplicationFile).toHaveBeenCalledTimes(1);
+    }));
+    it('should forcefully start a new login session', () => __awaiter(void 0, void 0, void 0, function* () {
+        (0, nock_1.default)('http://localhost:9999')
+            .get('/__dxp/au/dxp/health')
+            .reply(200)
+            .post('/__sso/cli/login')
+            .reply(200)
+            .get(`/__sso/cli/session?code=${mockSessionToken}`)
+            .reply(200)
+            .get('/__dxp/au/dxp/access/tenants')
+            .reply(200, mockTenants);
+        const opener = require('opener');
+        const { default: createLoginCommand } = require('./login');
+        const program = createLoginCommand();
+        yield program.parseAsync([
+            'node',
+            'dxp-cli-next',
+            'auth',
+            'login',
+            '--dxp-base-url',
+            'http://localhost:9999',
+            '--override-session',
+        ]);
+        expect(opener).toHaveBeenCalledWith(expect.stringContaining('http://localhost:9999/__sso/cli/login?code='));
+        expect(ApplicationStore.saveApplicationFile).toHaveBeenCalledTimes(2);
+    }));
+    it('should throw an error if authorisation times out', () => __awaiter(void 0, void 0, void 0, function* () {
+        jest.useFakeTimers();
+        (0, nock_1.default)('http://localhost:9999')
+            .get('/__dxp/au/dxp/health')
+            .reply(401)
+            .post('/__sso/cli/login')
+            .reply(200)
+            .get(`/__sso/cli/session?code=${mockSessionToken}`)
+            .reply(404);
+        const { pollForDxpSession } = require('./login');
+        pollForDxpSession({
+            dxpBaseUrl: 'http://localhost:9999',
+            overrideSession: undefined,
+            region: 'au',
+            tenant: 'tenant-1234',
+            username: 'mock-user',
+        }, 'mock').catch((err) => {
+            expect(err).toBe('Timed out waiting for authorization, please try again.');
+        });
+        jest.advanceTimersByTime(300000);
+    }));
+});

package/lib/auth/logout/logout.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+declare const createLogoutCommand: () => Command;
+export default createLogoutCommand;

package/lib/auth/logout/logout.js

@@ -0,0 +1,115 @@
+"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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 = __importDefault(require("cli-color"));
+const commander_1 = require("commander");
+const ApplicationStore_1 = require("../../ApplicationStore");
+const ora_1 = __importDefault(require("ora"));
+const createLogoutCommand = () => {
+    const logoutCommand = new commander_1.Command('logout')
+        .name('logout')
+        .description('Log out of the current session')
+        .addOption(new commander_1.Option('-f, --force', 'Skip confirmation prompt'))
+        .action((options) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            yield handleLogoutRequest(options);
+        }
+        catch (error) {
+            if (!!process.env.DEBUG && error.stack) {
+                logoutCommand.error(error.stack);
+            }
+            if (error.message) {
+                logoutCommand.error(cli_color_1.default.red(error.message));
+            }
+            else {
+                logoutCommand.error(cli_color_1.default.red('An unknown error occurred'));
+            }
+        }
+    }));
+    return logoutCommand;
+};
+function handleLogoutRequest(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const continueLogout = yield promptForConfirmation(options);
+        if (!continueLogout) {
+            return;
+        }
+        const spinner = (0, ora_1.default)().start();
+        try {
+            const sessionCookie = yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie);
+            if (!sessionCookie) {
+                spinner.stop();
+                console.log('You are not currently logged in');
+                return;
+            }
+            yield (0, ApplicationStore_1.deleteApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie);
+            yield (0, ApplicationStore_1.deleteApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig);
+            spinner.stop();
+            console.log('Logged out successfully');
+        }
+        catch (err) {
+            spinner.stop();
+            throw new Error('An error occurred while logging out of session');
+        }
+    });
+}
+/**
+ * Prompts the user for confirmation.
+ * Returns true if user has chosen to confirm.
+ */
+function promptForConfirmation(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (options.force) {
+            return true;
+        }
+        //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 choice = yield inquirer.default.prompt([
+            {
+                type: 'list',
+                name: 'confirm',
+                message: 'Are you sure you want to log out?: ',
+                choices: [
+                    { name: 'No', value: false },
+                    { name: 'Yes', value: true },
+                ],
+            },
+        ]);
+        return choice.confirm;
+    });
+}
+exports.default = createLogoutCommand;

package/lib/auth/logout/logout.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/auth/logout/logout.spec.js

@@ -0,0 +1,67 @@
+"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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 ApplicationStore = __importStar(require("../../ApplicationStore"));
+const logout_1 = __importDefault(require("./logout"));
+describe('logout', () => {
+    jest.spyOn(ApplicationStore, 'deleteApplicationFile').mockImplementation();
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+    it('should log out of session without confirmation', () => __awaiter(void 0, void 0, void 0, function* () {
+        jest
+            .spyOn(ApplicationStore, 'getApplicationFile')
+            .mockImplementationOnce(() => Promise.resolve('mock-session'));
+        const program = (0, logout_1.default)();
+        yield program.parseAsync(['node', 'dxp-cli', 'auth', 'logout', '--force']);
+        const opts = program.opts();
+        expect(opts.force).toEqual(true);
+        expect(ApplicationStore.getApplicationFile).toHaveBeenCalled();
+        expect(ApplicationStore.deleteApplicationFile).toHaveBeenCalled();
+    }));
+    it('should stop the program if there is no session to log out of', () => __awaiter(void 0, void 0, void 0, function* () {
+        jest
+            .spyOn(ApplicationStore, 'getApplicationFile')
+            .mockImplementationOnce(() => Promise.resolve(undefined));
+        const program = (0, logout_1.default)();
+        yield program.parseAsync(['node', 'dxp-cli', 'auth', 'logout', '--force']);
+        const opts = program.opts();
+        expect(opts.force).toEqual(true);
+        expect(ApplicationStore.getApplicationFile).toHaveBeenCalled();
+        expect(ApplicationStore.deleteApplicationFile).not.toHaveBeenCalled();
+    }));
+});

package/lib/cmp/dev-mode.js

@@ -20,7 +20,7 @@ const buildDevModeCommand = () => new commander_1.Command()
     .addHelpText('after', `
 
 The logs are currently \`bunyan\` formatted and should be piped into the bunyan cli:
-    $ dxp cmp dev <source> | npx bunyan
+    $ dxp-next cmp dev <source> | npx bunyan
 `)
     .argument('<source>', 'folder containing the template files in development')
     .addOption(new commander_1.Option('-p, --port <number>', 'Define port the webserver runs on')

package/lib/dxp.js

@@ -19,9 +19,9 @@ const program = new commander_1.default.Command();
 const packageJson = require('../package.json');
 const version = packageJson.version;
 program
-    .name('dxp')
+    .name('dxp-next')
     .version(version)
-    .description('dxp commands')
+    .description('dxp-next commands')
     .addCommand(auth_1.default)
     .addCommand(cmp_1.default)
     .addCommand(job_runner_1.default)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.11.0",
+  "version": "5.12.0-develop.1",
   "repository": {
     "url": "https://gitlab.squiz.net/dxp/dxp-cli-next"
   },
@@ -39,14 +39,15 @@
     "codecov"
   ],
   "dependencies": {
-    "@squiz/component-cli-lib": "1.64.1",
     "@apidevtools/swagger-parser": "10.1.0",
+    "@squiz/component-cli-lib": "1.64.1",
     "axios": "1.1.3",
     "cli-color": "2.0.3",
     "commander": "9.4.0",
     "dotenv": "^16.3.1",
     "env-paths": "2.2.1",
     "inquirer": "8.2.5",
+    "opener": "1.5.2",
     "ora": "^5.4.1",
     "prompt": "^1.3.0",
     "tough-cookie": "4.1.2",
@@ -61,6 +62,7 @@
     "@types/inquirer": "8.2.6",
     "@types/jest": "28.1.6",
     "@types/node": "17.0.45",
+    "@types/opener": "1.4.3",
     "@types/prompt": "^1.1.4",
     "@types/tough-cookie": "4.0.2",
     "@types/update-notifier": "5.1.0",

package/lib/auth/login.d.ts

@@ -1,3 +0,0 @@
-import { Command } from 'commander';
-declare const loginCommand: Command;
-export default loginCommand;