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

package/README.md

@@ -20,6 +20,6 @@ Options:
   -h, --help     display help for command
 
 Commands:
-  auth           log into the sxc
-  td             Template deployment commands
+  auth           Authenticate into the DXP CLI
+  cmp            Component Service Commands
 ```

package/lib/ApiService.d.ts

@@ -0,0 +1,33 @@
+import { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
+export declare const COOKIE_KEY = "dxp-sessionid";
+/**
+ * ApiService provides HTTP access to the DXP systems.
+ * This class wraps the authorization model within the DXP system by seamlessly
+ * adding the session cookie to requests.
+ */
+export declare class ApiService {
+    client: AxiosInstance;
+    constructor();
+}
+/**
+ * The API Service requestInterceptor will load the session cookie from
+ * storage and set it on any request. This ensures that post-login, all requests
+ * will seamlessly have the authorization required.
+ */
+export declare function requestInterceptor(request: AxiosRequestConfig): Promise<AxiosRequestConfig<any>>;
+/**
+ * The API Service responseInterceptor will handle the case that a
+ * "Set-Cookie" header has been returned from an API request and will
+ * save it accordingly for future use.
+ */
+export declare function responseInterceptor(response: AxiosResponse): Promise<AxiosResponse<any, any>>;
+export declare const MESSAGE_INVALID_REQUEST_NO_SESSIONID = "Invalid request: no session";
+export declare const MESSAGE_FAILED_TO_CREATE_SESSION = "Failed to create session";
+export declare const MESSAGE_FAILED_TO_REMOVE_SESSION = "Failed to remove user session";
+export declare const MESSAGE_FAILED_TO_CREATE_ORG_SESSION = "Failed to create organisation session";
+export declare class InvalidLoginSessionError extends Error {
+    constructor();
+}
+export declare class InvalidTenantError extends Error {
+    constructor();
+}

package/lib/ApiService.js

@@ -0,0 +1,103 @@
+"use strict";
+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 });
+exports.InvalidTenantError = exports.InvalidLoginSessionError = exports.MESSAGE_FAILED_TO_CREATE_ORG_SESSION = exports.MESSAGE_FAILED_TO_REMOVE_SESSION = exports.MESSAGE_FAILED_TO_CREATE_SESSION = exports.MESSAGE_INVALID_REQUEST_NO_SESSIONID = exports.responseInterceptor = exports.requestInterceptor = exports.ApiService = exports.COOKIE_KEY = void 0;
+const axios_1 = __importDefault(require("axios"));
+const tough_cookie_1 = require("tough-cookie");
+const ApplicationStore_1 = require("./ApplicationStore");
+exports.COOKIE_KEY = 'dxp-sessionid';
+/**
+ * ApiService provides HTTP access to the DXP systems.
+ * This class wraps the authorization model within the DXP system by seamlessly
+ * adding the session cookie to requests.
+ */
+class ApiService {
+    constructor() {
+        this.client = axios_1.default.create({ validateStatus: null });
+        this.client.interceptors.request.use(requestInterceptor);
+        this.client.interceptors.response.use(responseInterceptor);
+    }
+}
+exports.ApiService = ApiService;
+/**
+ * The API Service requestInterceptor will load the session cookie from
+ * storage and set it on any request. This ensures that post-login, all requests
+ * will seamlessly have the authorization required.
+ */
+function requestInterceptor(request) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const maybeSessionCookie = yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie);
+        if (!maybeSessionCookie) {
+            return request;
+        }
+        const sessionCookie = tough_cookie_1.Cookie.fromJSON(maybeSessionCookie);
+        if (!sessionCookie) {
+            return request;
+        }
+        request.headers = Object.assign(Object.assign({}, (request.headers || {})), { cookie: sessionCookie === null || sessionCookie === void 0 ? void 0 : sessionCookie.cookieString() });
+        return request;
+    });
+}
+exports.requestInterceptor = requestInterceptor;
+/**
+ * The API Service responseInterceptor will handle the case that a
+ * "Set-Cookie" header has been returned from an API request and will
+ * save it accordingly for future use.
+ */
+function responseInterceptor(response) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        if (response.status >= 400) {
+            yield handleSessionErrors(response);
+        }
+        const maybeSessionCookie = (_b = (_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a.map(cookieHeader => tough_cookie_1.Cookie.parse(cookieHeader))) === null || _b === void 0 ? void 0 : _b.find(cookie => (cookie === null || cookie === void 0 ? void 0 : cookie.key) === exports.COOKIE_KEY);
+        if (!maybeSessionCookie) {
+            return response;
+        }
+        yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie, JSON.stringify(maybeSessionCookie.toJSON()));
+        return response;
+    });
+}
+exports.responseInterceptor = responseInterceptor;
+exports.MESSAGE_INVALID_REQUEST_NO_SESSIONID = 'Invalid request: no session';
+exports.MESSAGE_FAILED_TO_CREATE_SESSION = 'Failed to create session';
+exports.MESSAGE_FAILED_TO_REMOVE_SESSION = 'Failed to remove user session';
+exports.MESSAGE_FAILED_TO_CREATE_ORG_SESSION = 'Failed to create organisation session';
+class InvalidLoginSessionError extends Error {
+    constructor() {
+        super('Invalid session');
+    }
+}
+exports.InvalidLoginSessionError = InvalidLoginSessionError;
+class InvalidTenantError extends Error {
+    constructor() {
+        super('Invalid tenant');
+    }
+}
+exports.InvalidTenantError = InvalidTenantError;
+function handleSessionErrors(response) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (response.data.message === exports.MESSAGE_INVALID_REQUEST_NO_SESSIONID) {
+            yield (0, ApplicationStore_1.deleteApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie);
+            throw new InvalidLoginSessionError();
+        }
+        if (response.data.message === exports.MESSAGE_FAILED_TO_CREATE_SESSION) {
+            yield (0, ApplicationStore_1.deleteApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie);
+            throw new InvalidLoginSessionError();
+        }
+        if (response.data.message === exports.MESSAGE_FAILED_TO_CREATE_ORG_SESSION) {
+            throw new InvalidTenantError();
+        }
+    });
+}

package/lib/ApiService.spec.d.ts

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

package/lib/ApiService.spec.js

@@ -0,0 +1,148 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const tough_cookie_1 = require("tough-cookie");
+const ApiService_1 = require("./ApiService");
+const ApplicationStore_1 = require("./ApplicationStore");
+const VALID_COOKIE = new tough_cookie_1.Cookie({
+    key: ApiService_1.COOKIE_KEY,
+    value: 'valid-cookie-value',
+});
+describe('ApiService', () => {
+    describe('requestInterceptor', () => {
+        beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.deleteApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie);
+        }));
+        it('loads stored session cookie into request config', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie, JSON.stringify(VALID_COOKIE.toJSON()));
+            const requestConfig = yield (0, ApiService_1.requestInterceptor)({});
+            expect(requestConfig).toHaveProperty('headers');
+            expect(requestConfig.headers).toHaveProperty('cookie');
+            expect(tough_cookie_1.Cookie.parse(requestConfig.headers['cookie'])).toHaveProperty('value', 'valid-cookie-value');
+        }));
+        it('does not use session cookie if none stored', () => __awaiter(void 0, void 0, void 0, function* () {
+            const requestConfig = yield (0, ApiService_1.requestInterceptor)({});
+            expect(requestConfig).toEqual({});
+        }));
+    });
+    describe('responseInterceptor', () => {
+        beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.deleteApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie);
+        }));
+        it('saves the set-cookie for a session into the store', () => __awaiter(void 0, void 0, void 0, function* () {
+            const setCookie = [VALID_COOKIE.toString()];
+            const response = {
+                data: {},
+                config: {},
+                status: 204,
+                statusText: '',
+                headers: { 'set-cookie': setCookie },
+            };
+            const postIntercept = yield (0, ApiService_1.responseInterceptor)(response);
+            const stored = yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie);
+            expect(stored).toBeDefined();
+            expect(JSON.parse(stored)).toMatchObject({
+                key: VALID_COOKIE.key,
+                value: VALID_COOKIE.value,
+            });
+            expect(postIntercept).toEqual(response);
+        }));
+        it('does not error if no set-cookie', () => __awaiter(void 0, void 0, void 0, function* () {
+            const response = {
+                data: {},
+                config: {},
+                status: 204,
+                statusText: '',
+                headers: {},
+            };
+            const postIntercept = yield (0, ApiService_1.responseInterceptor)(response);
+            expect(yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie)).toBeUndefined();
+            expect(postIntercept).toEqual(response);
+        }));
+        it('does not delete existing session cookie if no set-cookie', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie, JSON.stringify(VALID_COOKIE.toJSON()));
+            const response = {
+                data: {},
+                config: {},
+                status: 204,
+                statusText: '',
+                headers: {},
+            };
+            const postIntercept = yield (0, ApiService_1.responseInterceptor)(response);
+            expect(yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie)).toEqual(JSON.stringify(VALID_COOKIE.toJSON()));
+            expect(postIntercept).toEqual(response);
+        }));
+        it('overwrites old session cookie when new set-cookie provided', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie, JSON.stringify(VALID_COOKIE.toJSON()));
+            const response = {
+                data: { nested: 'rest' },
+                config: {},
+                status: 204,
+                statusText: '',
+                headers: {
+                    'set-cookie': [
+                        tough_cookie_1.Cookie.fromJSON({
+                            key: ApiService_1.COOKIE_KEY,
+                            value: 'another-value',
+                        }).toString(),
+                    ],
+                },
+            };
+            const postIntercept = yield (0, ApiService_1.responseInterceptor)(response);
+            expect(JSON.parse((yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie)))).toMatchObject({ key: ApiService_1.COOKIE_KEY, value: 'another-value' });
+            expect(postIntercept).toEqual(response);
+        }));
+        it('errors with InvalidSession on failed session creation if no existing file', () => __awaiter(void 0, void 0, void 0, function* () {
+            const response = {
+                data: { message: ApiService_1.MESSAGE_FAILED_TO_CREATE_SESSION },
+                config: {},
+                status: 401,
+                statusText: '',
+                headers: {},
+            };
+            yield expect(() => (0, ApiService_1.responseInterceptor)(response)).rejects.toThrowError(ApiService_1.InvalidLoginSessionError);
+        }));
+        it('errors with InvalidSession on no session provided', () => __awaiter(void 0, void 0, void 0, function* () {
+            const response = {
+                data: { message: ApiService_1.MESSAGE_INVALID_REQUEST_NO_SESSIONID },
+                config: {},
+                status: 401,
+                statusText: '',
+                headers: {},
+            };
+            yield expect(() => (0, ApiService_1.responseInterceptor)(response)).rejects.toThrowError(ApiService_1.InvalidLoginSessionError);
+        }));
+        it('errors with InvalidSession on failed session creation and deletes existing session', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie, JSON.stringify(VALID_COOKIE.toJSON()));
+            const response = {
+                data: { message: ApiService_1.MESSAGE_FAILED_TO_CREATE_SESSION },
+                config: {},
+                status: 401,
+                statusText: '',
+                headers: {},
+            };
+            yield expect(() => (0, ApiService_1.responseInterceptor)(response)).rejects.toThrowError(ApiService_1.InvalidLoginSessionError);
+            expect(yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie)).toBeFalsy();
+        }));
+        it('errors when organisation session cannot be created and does not delete session cookie', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie, JSON.stringify(VALID_COOKIE.toJSON()));
+            const response = {
+                data: { message: ApiService_1.MESSAGE_FAILED_TO_CREATE_ORG_SESSION },
+                config: {},
+                status: 401,
+                statusText: '',
+                headers: {},
+            };
+            yield expect(() => (0, ApiService_1.responseInterceptor)(response)).rejects.toThrowError(ApiService_1.InvalidTenantError);
+            expect(yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie)).toBeTruthy();
+        }));
+    });
+});

package/lib/ApplicationConfig.d.ts

@@ -0,0 +1,7 @@
+export declare class ApplicationConfig {
+    baseUrl: string;
+    region: string;
+    tenant: string;
+    constructor(baseUrl: string, region: string, tenant: string);
+}
+export declare function fetchApplicationConfig(tenantOverride?: string): Promise<ApplicationConfig>;

package/lib/ApplicationConfig.js

@@ -0,0 +1,38 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchApplicationConfig = exports.ApplicationConfig = void 0;
+const ApplicationStore_1 = require("./ApplicationStore");
+class ApplicationConfig {
+    constructor(baseUrl, region, tenant) {
+        this.baseUrl = baseUrl;
+        this.region = region;
+        this.tenant = tenant;
+        if (!baseUrl)
+            throw new Error('No baseUrl configured');
+        if (!region)
+            throw new Error('No region configured');
+        if (!tenant)
+            throw new Error('No tenant configured');
+    }
+}
+exports.ApplicationConfig = ApplicationConfig;
+function fetchApplicationConfig(tenantOverride) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const stored = yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig);
+        if (!stored) {
+            throw new Error('No stored config');
+        }
+        const parsed = JSON.parse(stored);
+        return new ApplicationConfig(parsed.baseUrl, parsed.region, tenantOverride || parsed.tenant);
+    });
+}
+exports.fetchApplicationConfig = fetchApplicationConfig;

package/lib/ApplicationConfig.spec.d.ts

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

package/lib/ApplicationConfig.spec.js

@@ -0,0 +1,84 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ApplicationStore_1 = require("./ApplicationStore");
+const ApplicationConfig_1 = require("./ApplicationConfig");
+describe('ApplicationConfig', () => {
+    it('asserts all fields to have non-empty string', () => {
+        expect(() => new ApplicationConfig_1.ApplicationConfig('', 'region', 'tenant')).toThrowError();
+        expect(() => new ApplicationConfig_1.ApplicationConfig('baseUrl', '', 'tenant')).toThrowError();
+        expect(() => new ApplicationConfig_1.ApplicationConfig('baseUrl', 'region', '')).toThrowError();
+    });
+    it('asserts all fields to have a string value', () => {
+        expect(
+        // @ts-expect-error requires string values
+        () => new ApplicationConfig_1.ApplicationConfig(undefined, 'region', 'tenant')).toThrowError();
+        expect(
+        // @ts-expect-error requires string values
+        () => new ApplicationConfig_1.ApplicationConfig('baseUrl', undefined, 'tenant')).toThrowError();
+        expect(
+        // @ts-expect-error requires string values
+        () => new ApplicationConfig_1.ApplicationConfig('baseUrl', 'region', undefined)).toThrowError();
+    });
+    describe('fetchApplicationConfig', () => {
+        beforeAll(() => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.deleteApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig);
+        }));
+        it('loads previously saved config', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig, JSON.stringify({
+                baseUrl: 'baseUrl',
+                region: 'region',
+                tenant: 'tenant',
+            }));
+            const config = yield (0, ApplicationConfig_1.fetchApplicationConfig)();
+            expect(config).toMatchObject({
+                baseUrl: 'baseUrl',
+                region: 'region',
+                tenant: 'tenant',
+            });
+        }));
+        it('loads previously saved config and allows tenant override', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig, JSON.stringify({
+                baseUrl: 'baseUrl',
+                region: 'region',
+                tenant: 'tenant',
+            }));
+            const config = yield (0, ApplicationConfig_1.fetchApplicationConfig)('another tenant');
+            expect(config).toMatchObject({
+                baseUrl: 'baseUrl',
+                region: 'region',
+                tenant: 'another tenant',
+            });
+        }));
+        it('loads previously saved config with no tenant and with tenant override', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig, JSON.stringify({
+                baseUrl: 'baseUrl',
+                region: 'region',
+            }));
+            const config = yield (0, ApplicationConfig_1.fetchApplicationConfig)('another tenant');
+            expect(config).toMatchObject({
+                baseUrl: 'baseUrl',
+                region: 'region',
+                tenant: 'another tenant',
+            });
+        }));
+        it('errors when no tenant and no tenant override', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig, JSON.stringify({
+                baseUrl: 'baseUrl',
+                region: 'region',
+            }));
+            yield expect(() => (0, ApplicationConfig_1.fetchApplicationConfig)()).rejects.toThrowError();
+        }));
+        it('errors when no file is saved', () => __awaiter(void 0, void 0, void 0, function* () {
+            yield expect(() => (0, ApplicationConfig_1.fetchApplicationConfig)()).rejects.toThrowError();
+        }));
+    });
+});

package/lib/ApplicationStore.d.ts

@@ -0,0 +1,13 @@
+import type { Paths } from 'env-paths';
+export declare const APP_NAME: string;
+export interface FileStore {
+    name: string;
+    type: keyof Paths;
+}
+export declare const STORE_FILES: {
+    sessionCookie: FileStore;
+    sessionConfig: FileStore;
+};
+export declare function getApplicationFile({ name: filename, type }: FileStore): Promise<string | undefined>;
+export declare function saveApplicationFile({ name: filename, type }: FileStore, content: string): Promise<void>;
+export declare function deleteApplicationFile({ name: filename, type, }: FileStore): Promise<void>;

package/lib/ApplicationStore.js

@@ -0,0 +1,53 @@
+"use strict";
+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 };
+};
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteApplicationFile = exports.saveApplicationFile = exports.getApplicationFile = exports.STORE_FILES = exports.APP_NAME = void 0;
+const env_paths_1 = __importDefault(require("env-paths"));
+const promises_1 = __importDefault(require("fs/promises"));
+const path_1 = __importDefault(require("path"));
+exports.APP_NAME = (_a = process.env.APP_NAME) !== null && _a !== void 0 ? _a : 'dxp-cli';
+exports.STORE_FILES = {
+    sessionCookie: { name: 'session-cookie', type: 'data' },
+    sessionConfig: { name: 'session-config', type: 'config' },
+};
+const APPLICATION_FILE_PATHS = (0, env_paths_1.default)(exports.APP_NAME);
+function getApplicationFile({ name: filename, type }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            return yield promises_1.default.readFile(path_1.default.join(APPLICATION_FILE_PATHS[type], filename), {
+                encoding: 'utf-8',
+            });
+        }
+        catch (e) {
+            return;
+        }
+    });
+}
+exports.getApplicationFile = getApplicationFile;
+function saveApplicationFile({ name: filename, type }, content) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield promises_1.default.mkdir(APPLICATION_FILE_PATHS[type], { recursive: true });
+        yield promises_1.default.writeFile(path_1.default.join(APPLICATION_FILE_PATHS[type], filename), content);
+    });
+}
+exports.saveApplicationFile = saveApplicationFile;
+function deleteApplicationFile({ name: filename, type, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield promises_1.default.rm(path_1.default.join(APPLICATION_FILE_PATHS[type], filename), {
+            force: true,
+        });
+    });
+}
+exports.deleteApplicationFile = deleteApplicationFile;

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

@@ -18,7 +18,7 @@ describe('dxp', () => {
         const commandsText = (_a = stdout
             .match(/Commands\:(.*)/is)) === null || _a === void 0 ? void 0 : _a[1].split('\n').map(a => a.trim()).filter(a => !!a);
         expect(commandsText).toEqual([
-            'auth           log into the sxc',
+            'auth           Authenticate into the DXP CLI',
             'td             Template deployment commands',
             'cmp            Component Service Commands',
         ]);
@@ -30,7 +30,7 @@ describe('dxp', () => {
         const commandsText = (_a = stdout
             .match(/Commands\:(.*)/is)) === null || _a === void 0 ? void 0 : _a[1].split('\n').map(a => a.trim()).filter(a => !!a);
         expect(commandsText).toEqual([
-            'auth           log into the sxc',
+            'auth           Authenticate into the DXP CLI',
             'cmp            Component Service Commands',
         ]);
     });

package/lib/auth/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const login_1 = __importDefault(require("./login"));
 const authCommand = new commander_1.Command('auth');
-authCommand.description('log into the sxc').addCommand(login_1.default);
-//.addCommand(identityCommand);
+authCommand
+    .description('Authenticate into the DXP CLI')
+    .addCommand(login_1.default);
 exports.default = authCommand;

package/lib/auth/login.d.ts

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

package/lib/auth/login.js

@@ -1,10 +1,62 @@
 "use strict";
+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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const cli_color_1 = require("cli-color");
 const commander_1 = require("commander");
-exports.default = new commander_1.Command('login')
+const ApiService_1 = require("../ApiService");
+const ApplicationStore_1 = require("../ApplicationStore");
+// TODO: Confirm production URL
+const PRODUCTION_URL = 'https://dxp.squiz.cloud';
+const loginCommand = new commander_1.Command('login')
     .name('login')
-    .argument('<username>', 'sxc username')
-    .argument('<password>', 'sxc password')
-    .action((username, password) => {
-    console.log('NOT IMPLEMENTED ', { username });
+    .description('Login to the DXP platform')
+    .argument('<username>', 'dxp username')
+    .argument('<password>', '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((0, cli_color_1.red)(str));
+    },
+})
+    .action((username, password, options) => {
+    return handleLoginRequest({ username, password }, options);
 });
+exports.default = loginCommand;
+function handleLoginRequest(login, 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,
+        });
+        switch (loginResponse.status) {
+            case 204:
+                console.log('Login successful');
+                yield (0, ApplicationStore_1.saveApplicationFile)(ApplicationStore_1.STORE_FILES.sessionConfig, JSON.stringify({
+                    baseUrl,
+                    tenant: options.tenant,
+                    region: options.region,
+                }));
+                return;
+            case 400:
+                loginCommand.error(loginResponse.data.message);
+            default:
+                loginCommand.error('An error occurred during login');
+        }
+    });
+}

package/lib/cmp/deploy.js

@@ -15,20 +15,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const component_cli_lib_1 = require("@squiz/component-cli-lib");
 const cli_color_1 = __importDefault(require("cli-color"));
+const ApiService_1 = require("../ApiService");
+const ApplicationStore_1 = require("../ApplicationStore");
+const ApplicationConfig_1 = require("../ApplicationConfig");
 const deployCommand = new commander_1.Command()
     .name('deploy')
     .argument('<source>', 'folder/file path containing the template files to deploy')
-    .addOption(new commander_1.Option('-cu, --component-service-url <string>', 'Required: Url for the component service')
-    .env('COMPONENT_SERVICE_URL')
-    .makeOptionMandatory(true))
-    .addOption(new commander_1.Option('-ru, --render-runtime-url <string>', 'Required: Url for the render runtime service')
-    .env('COMPONENT_RENDER_SERVICE_URL')
-    .makeOptionMandatory(true))
-    .action((source, options, self) => __awaiter(void 0, void 0, void 0, function* () {
+    .addOption(new commander_1.Option('-cu, --component-service-url <string>', 'Override the component service url from login').env('COMPONENT_SERVICE_URL'))
+    .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 (!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`'));
+    }
+    const apiService = new ApiService_1.ApiService();
+    if ((_a = options.componentServiceUrl) === null || _a === void 0 ? void 0 : _a.match(/v1\/?$/)) {
+        console.warn(cli_color_1.default.yellow('WARN: Component service URL no longer requires /v1/ suffix'));
+    }
     try {
-        return yield (0, component_cli_lib_1.uploadComponentFolder)(source, options.componentServiceUrl, options.renderRuntimeUrl);
+        const componentServiceUrl = ((_b = options.componentServiceUrl) === null || _b === void 0 ? void 0 : _b.replace(/v1\/?$/, '')) ||
+            (yield buildComponentServiceUrl(options.tenant));
+        return yield (0, component_cli_lib_1.uploadComponentFolder)(apiService.client, componentServiceUrl, source);
     }
     catch (error) {
+        if (error instanceof ApiService_1.InvalidLoginSessionError) {
+            deployCommand.error(cli_color_1.default.red('Login session expired. Please login again.'));
+        }
+        if (error instanceof ApiService_1.InvalidTenantError) {
+            deployCommand.error(cli_color_1.default.red('Cannot deploy to specified tenant'));
+        }
         if (error.message) {
             deployCommand.error(cli_color_1.default.red(error.message));
         }
@@ -39,3 +55,9 @@ const deployCommand = new commander_1.Command()
     }
 }));
 exports.default = deployCommand;
+function buildComponentServiceUrl(tenantID) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const existingConfig = yield (0, ApplicationConfig_1.fetchApplicationConfig)(tenantID);
+        return `${existingConfig.baseUrl}/__dxp/${existingConfig.region}/components-management/${existingConfig.tenant}/`;
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "4.0.1-develop.1",
+  "version": "4.1.0-develop.1",
   "repository": {
     "url": "https://gitlab.squiz.net/developer-experience/dxp-cli-next"
   },
@@ -39,10 +39,13 @@
     "codecov"
   ],
   "dependencies": {
-    "@squiz/component-cli-lib": "1.2.11",
+    "@squiz/component-cli-lib": "1.2.12",
     "@squiz/deployment-service-lib": "1.1.5-alpha.85",
+    "axios": "1.1.3",
     "cli-color": "2.0.3",
     "commander": "9.4.0",
+    "env-paths": "2.2.1",
+    "tough-cookie": "4.1.2",
     "update-notifier": "5.1.0"
   },
   "devDependencies": {
@@ -52,6 +55,7 @@
     "@types/cli-color": "2.0.2",
     "@types/jest": "28.1.6",
     "@types/node": "17.0.45",
+    "@types/tough-cookie": "4.0.2",
     "@types/update-notifier": "5.1.0",
     "@typescript-eslint/eslint-plugin": "5.30.7",
     "@typescript-eslint/parser": "5.30.7",

package/lib/auth/identity.d.ts

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

package/lib/auth/identity.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-exports.default = new commander_1.Command('identity')
-    .command('identity', 'returns the currently logged in users details')
-    .action(() => {
-    console.log('getting identity');
-});