@contentstack/cli-utilities 1.5.9 → 1.5.11

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Contentstack
+Copyright (c) 2024 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/encrypter.js

@@ -14,6 +14,7 @@ class NodeCrypto {
         const { algorithm, encryptionKey, typeIdentifier } = (0, merge_1.default)(defaultValues, config);
         this.algorithm = algorithm;
         this.typeIdentifier = typeIdentifier;
+        // deepcode ignore HardcodedSecret: <please specify a reason of ignoring this>
         this.key = crypto_1.default.scryptSync(encryptionKey, 'salt', 24);
     }
     encrypt(plainData) {

package/lib/http-client/client.d.ts

@@ -1,6 +1,9 @@
 import { AxiosRequestConfig, AxiosResponse } from 'axios';
 import { IHttpClient } from './client-interface';
 import { HttpResponse } from './http-response';
+type HttpClientOptions = {
+    disableEarlyAccessHeaders?: boolean;
+};
 export declare class HttpClient implements IHttpClient {
     /**
      * The request configuration.
@@ -10,6 +13,7 @@ export declare class HttpClient implements IHttpClient {
      * The request configuration.
      */
     private readonly axiosInstance;
+    private disableEarlyAccessHeaders;
     /**
      * The payload format for a JSON or form-url-encoded request.
      */
@@ -17,7 +21,7 @@ export declare class HttpClient implements IHttpClient {
     /**
      * Createa new pending HTTP request instance.
      */
-    constructor(request?: AxiosRequestConfig);
+    constructor(request?: AxiosRequestConfig, options?: HttpClientOptions);
     /**
      * Create a reusable HttpClient instance.
      *

package/lib/http-client/client.js

@@ -10,13 +10,14 @@ class HttpClient {
     /**
      * Createa new pending HTTP request instance.
      */
-    constructor(request = {}) {
+    constructor(request = {}, options = {}) {
         /**
          * The payload format for a JSON or form-url-encoded request.
          */
         this.bodyFormat = 'json';
         this.request = request;
         this.axiosInstance = axios_1.default.create();
+        this.disableEarlyAccessHeaders = options.disableEarlyAccessHeaders || false;
         // Sets payload format as json by default
         this.asJson();
     }
@@ -309,7 +310,8 @@ class HttpClient {
             if ((_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.error_message) === null || _b === void 0 ? void 0 : _b.includes('access token is invalid or expired')) {
                 const token = await this.refreshToken();
                 this.headers(Object.assign(Object.assign({}, this.request.headers), { authorization: token.authorization }));
-                return await this.axiosInstance(Object.assign(Object.assign({ url, method, withCredentials: true }, this.request), { data: this.prepareRequestPayload() }));
+                return await this.axiosInstance(Object.assign(Object.assign({ url,
+                    method, withCredentials: true }, this.request), { data: this.prepareRequestPayload() }));
             }
             // Retry while Network timeout or Network Error
             if (!(message.includes('timeout') || message.includes('Network Error') || message.includes('getaddrinfo ENOTFOUND'))) {
@@ -317,11 +319,20 @@ class HttpClient {
             }
             if (counter < 1) {
                 counter++;
-                return await this.axiosInstance(Object.assign(Object.assign({ url, method, withCredentials: true }, this.request), { data: this.prepareRequestPayload() }));
+                return await this.axiosInstance(Object.assign(Object.assign({ url,
+                    method, withCredentials: true }, this.request), { data: this.prepareRequestPayload() }));
             }
             return Promise.reject(error);
         });
-        return await this.axiosInstance(Object.assign(Object.assign({ url, method, withCredentials: true }, this.request), { data: this.prepareRequestPayload() }));
+        if (!this.disableEarlyAccessHeaders) {
+            // Add early access header by default
+            const earlyAccessHeaders = config_handler_1.default.get(`earlyAccessHeaders`);
+            if (earlyAccessHeaders && Object.keys(earlyAccessHeaders).length > 0) {
+                this.headers({ 'x-header-ea': Object.values(earlyAccessHeaders).join(',') });
+            }
+        }
+        return await this.axiosInstance(Object.assign(Object.assign({ url,
+            method, withCredentials: true }, this.request), { data: this.prepareRequestPayload() }));
     }
     /**
      * Returns the request payload depending on the selected request payload format.
@@ -335,8 +346,9 @@ class HttpClient {
             return Promise.reject('Your session is timed out, please login to proceed');
         }
         else if (authorisationType === 'OAUTH') {
-            return auth_handler_1.default.compareOAuthExpiry(true)
-                .then(() => Promise.resolve({ authorization: `Bearer ${config_handler_1.default.get('oauthAccessToken')}`, }))
+            return auth_handler_1.default
+                .compareOAuthExpiry(true)
+                .then(() => Promise.resolve({ authorization: `Bearer ${config_handler_1.default.get('oauthAccessToken')}` }))
                 .catch((error) => Promise.reject(error));
         }
         else {

package/lib/index.d.ts

@@ -18,6 +18,6 @@ export * from './date-time';
 export * from './add-locale';
 export { App, AppData, Installation, marketplaceSDKClient, MarketplaceSDKInitiator, marketplaceSDKInitiator, ContentstackMarketplaceClient, ContentstackMarketplaceConfig, };
 export { Args, CommandHelp, Config, Errors, Flags, loadHelpClass, Help, HelpBase, HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable, Hook, Interfaces, Parser, Plugin, run, toCached, tsPath, toStandardizedId, toConfiguredId, settings, Settings, flush, ux, execute, stderr, stdout, } from '@oclif/core';
-export { FlagInput, ArgInput } from '@oclif/core/lib/interfaces/parser';
+export { FlagInput, ArgInput, FlagDefinition } from '@oclif/core/lib/interfaces/parser';
 export { default as TablePrompt } from './inquirer-table-prompt';
 export { Logger };

package/lib/interfaces/index.d.ts

@@ -20,6 +20,7 @@ export interface Region {
     name: string;
     cma: string;
     cda: string;
+    uiHost: string;
 }
 export interface Token {
     token: string;

package/lib/logger.js

@@ -169,7 +169,7 @@ class Logger {
      * the sensitiveKeys array, and false otherwise.
      */
     isSensitiveKey(keyStr) {
-        if (keyStr) {
+        if (keyStr && typeof keyStr === 'string') {
             return this.sensitiveKeys.some((regex) => regex.test(keyStr));
         }
     }
@@ -196,11 +196,16 @@ class Logger {
      * redacted.
      */
     redact(obj) {
-        const copy = (0, full_1.klona)(obj);
-        this.redactObject(copy);
-        const splat = copy[Symbol.for('splat')];
-        this.redactObject(splat);
-        return copy;
+        try {
+            const copy = (0, full_1.klona)(obj);
+            this.redactObject(copy);
+            const splat = copy[Symbol.for('splat')];
+            this.redactObject(splat);
+            return copy;
+        }
+        catch (error) {
+            return obj;
+        }
     }
     /**
      * The function checks if an object is a LogEntry by verifying if it has the properties 'level' and

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.5.9",
+  "version": "1.5.11",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -35,7 +35,7 @@
     "@contentstack/management": "~1.13.0",
     "@contentstack/marketplace-sdk": "^1.0.1",
     "@oclif/core": "^2.9.3",
-    "axios": "^1.6.0",
+    "axios": "^1.6.4",
     "chalk": "^4.0.0",
     "cli-cursor": "^3.1.0",
     "cli-table": "^0.3.11",