@remkoj/optimizely-cms-api 2.0.0-pre5 → 2.0.1-pre1

package/dist/api-client.d.ts

@@ -18,6 +18,7 @@ export declare class ApiClient extends CmsIntegrationApiClient {
      * Marker to indicate if the client has debugging enabled
      */
     get debug(): boolean;
+    get version(): string;
     /**
      * The API version for which this client was build
      */

package/dist/api-client.js

@@ -8,6 +8,7 @@ const client_1 = require("./client");
 const getaccesstoken_1 = require("./getaccesstoken");
 const config_1 = require("./config");
 const version_json_1 = __importDefault(require("./version.json"));
+const OpenAPI_1 = require("./client/core/OpenAPI");
 class ApiClient extends client_1.CmsIntegrationApiClient {
     /**
      * Create a new instance of the API Client
@@ -16,12 +17,26 @@ class ApiClient extends client_1.CmsIntegrationApiClient {
      */
     constructor(config) {
         const options = config ?? (0, config_1.getCmsIntegrationApiConfigFromEnvironment)();
+        options.base = new URL(OpenAPI_1.OpenAPI.BASE, options.base);
+        let access_token = undefined;
         super({
             BASE: options.base.href,
-            TOKEN: () => (0, getaccesstoken_1.getAccessToken)(options),
+            TOKEN: async () => {
+                if (!access_token)
+                    access_token = await (0, getaccesstoken_1.getAccessToken)(options).catch(e => {
+                        if (options.debug) {
+                            console.error(`🔴 [CMS API] Failed to obtain an access token`);
+                            console.error(e);
+                        }
+                        return undefined;
+                    });
+                return access_token ?? '';
+            },
             HEADERS: {
                 Connection: "Close"
-            }
+            },
+            WITH_CREDENTIALS: true,
+            CREDENTIALS: "include"
         });
         this._config = options;
     }
@@ -37,6 +52,9 @@ class ApiClient extends client_1.CmsIntegrationApiClient {
     get debug() {
         return this._config.debug ?? false;
     }
+    get version() {
+        return OpenAPI_1.OpenAPI.VERSION;
+    }
     /**
      * The API version for which this client was build
      */

package/dist/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCmsIntegrationApiConfigFromEnvironment = void 0;
+exports.getCmsIntegrationApiConfigFromEnvironment = getCmsIntegrationApiConfigFromEnvironment;
 const OpenAPI_1 = require("./client/core/OpenAPI");
 function getCmsIntegrationApiConfigFromEnvironment() {
     const cmsUrl = getMandatory('OPTIMIZELY_CMS_URL');
@@ -25,7 +25,6 @@ function getCmsIntegrationApiConfigFromEnvironment() {
         debug
     };
 }
-exports.getCmsIntegrationApiConfigFromEnvironment = getCmsIntegrationApiConfigFromEnvironment;
 function getOptional(variable, defaultValue) {
     const envValue = process.env[variable];
     if (!envValue || envValue == "")

package/dist/getaccesstoken.js

@@ -1,37 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccessToken = void 0;
+exports.getAccessToken = getAccessToken;
 const config_1 = require("./config");
+const OpenAPI_1 = require("./client/core/OpenAPI");
 function isErrorResponse(response) {
     return typeof (response.error) == 'string';
 }
-let _access_token = undefined;
 async function getAccessToken(config) {
-    if (!_access_token) {
-        _access_token = (async (config) => {
-            const options = config ?? (0, config_1.getCmsIntegrationApiConfigFromEnvironment)();
-            const authUrl = `${options.base.href}/oauth/token`;
-            const headers = new Headers();
-            headers.append('Authorization', `Basic ${base64Encode(`${options.clientId}:${options.clientSecret}`)}`);
-            headers.append('Content-Type', 'application/x-www-form-urlencoded');
-            headers.append('Connection', 'close');
-            const body = new URLSearchParams();
-            body.append("grant_type", "client_credentials");
-            if (options.actAs)
-                body.append("act_as", options.actAs);
-            const response = await (await fetch(authUrl, {
-                method: "POST",
-                headers: headers,
-                body: body.toString()
-            })).json();
-            if (isErrorResponse(response))
-                throw new Error("Authentication error: " + response.error_description);
-            return response.access_token;
-        })(config);
+    const options = config ?? (0, config_1.getCmsIntegrationApiConfigFromEnvironment)();
+    const authUrl = new URL(`${OpenAPI_1.OpenAPI.BASE}/oauth/token`, options.base).href;
+    const headers = new Headers();
+    headers.append('Authorization', `Basic ${base64Encode(`${options.clientId}:${options.clientSecret}`)}`);
+    headers.append('Content-Type', 'application/x-www-form-urlencoded');
+    headers.append('Connection', 'close');
+    if (options.debug) {
+        console.log(`⚪ [CMS API] Using authentication endpoint: ${authUrl}`);
+        console.log(`⚪ [CMS API] Retrieving new credentials for ${options.clientId}, acting as ${options.actAs ?? options.clientId ?? '-'}`);
     }
-    return _access_token;
+    const body = new URLSearchParams();
+    body.append("grant_type", "client_credentials");
+    if (options.actAs)
+        body.append("act_as", options.actAs);
+    const httpResponse = await fetch(authUrl, {
+        method: "POST",
+        headers: headers,
+        body: body.toString(),
+        cache: "no-store"
+    });
+    const response = await httpResponse.json();
+    if (isErrorResponse(response))
+        throw new Error("Authentication error: " + response.error_description);
+    return response.access_token;
 }
-exports.getAccessToken = getAccessToken;
 function base64Encode(input) {
     if (btoa && typeof (btoa) == 'function')
         return btoa(input);

package/dist/index.d.ts

@@ -7,8 +7,22 @@ import { type CmsIntegrationApiOptions } from './config';
 import { ApiClient as CmsIntegrationApiClient } from './api-client';
 export declare function createClient(config?: CmsIntegrationApiOptions): CmsIntegrationApiClient;
 export declare enum ContentRoots {
+    /**
+     * The Global root node of the Content Tree
+     */
     SystemRoot = "43f936c99b234ea397b261c538ad07c9",
-    MultiChannelContent = "41118A415C8C4BE08E73520FF3DE8244"
+    /**
+     * The root node of the Multi-Channel Content
+     */
+    MultiChannelContent = "41118A415C8C4BE08E73520FF3DE8244",
+    /**
+     * The root node of the Trash
+     */
+    Trash = "2f40ba47f4fc47aea2440b909d4cf988",
+    /**
+     * The root node of the "For all sites" folder
+     */
+    ForAllSites = "e56f85d0e8334e02976a2d11fe4d598c"
 }
 export declare enum ContentTypeKeys {
     Folder = "SysContentFolder"

package/dist/index.js

@@ -26,7 +26,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContentTypeKeys = exports.ContentRoots = exports.createClient = exports.CmsIntegrationApiClient = exports.ApiClient = exports.CoreClient = exports.IntegrationApi = void 0;
+exports.ContentTypeKeys = exports.ContentRoots = exports.CmsIntegrationApiClient = exports.ApiClient = exports.CoreClient = exports.IntegrationApi = void 0;
+exports.createClient = createClient;
 __exportStar(require("./config"), exports);
 exports.IntegrationApi = __importStar(require("./client"));
 var client_1 = require("./client");
@@ -39,11 +40,24 @@ const api_client_3 = require("./api-client");
 function createClient(config) {
     return new api_client_3.ApiClient(config);
 }
-exports.createClient = createClient;
 var ContentRoots;
 (function (ContentRoots) {
+    /**
+     * The Global root node of the Content Tree
+     */
     ContentRoots["SystemRoot"] = "43f936c99b234ea397b261c538ad07c9";
+    /**
+     * The root node of the Multi-Channel Content
+     */
     ContentRoots["MultiChannelContent"] = "41118A415C8C4BE08E73520FF3DE8244";
+    /**
+     * The root node of the Trash
+     */
+    ContentRoots["Trash"] = "2f40ba47f4fc47aea2440b909d4cf988";
+    /**
+     * The root node of the "For all sites" folder
+     */
+    ContentRoots["ForAllSites"] = "e56f85d0e8334e02976a2d11fe4d598c";
 })(ContentRoots || (exports.ContentRoots = ContentRoots = {}));
 var ContentTypeKeys;
 (function (ContentTypeKeys) {

package/dist/version.json

@@ -1,5 +1,5 @@
 {
     "api": "preview2-1.0.0",
-    "service": "2024.06.11.0833",
-    "cms": "2024.06.11.0833"
+    "service": "2024.06.25.1219",
+    "cms": "2024.06.25.1219"
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@remkoj/optimizely-cms-api",
   "displayName": "Optimizely CMS - Integration API Client",
   "description": "A Javascript client for the Integration API provided by the Optimizely CMS.",
-  "version": "2.0.0-pre5",
+  "version": "2.0.1-pre1",
   "packageManager": "yarn@4.3.0",
   "type": "commonjs",
   "license": "Apache-2.0",
@@ -12,12 +12,12 @@
     "./dist"
   ],
   "devDependencies": {
-    "@types/node": "^20.14.2",
+    "@types/node": "^20.14.9",
     "dotenv": "^16.4.5",
-    "glob": "^10.4.1",
+    "glob": "^10.4.2",
     "openapi-typescript-codegen": "^0.29.0",
     "tslib": "^2.6.3",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "scripts": {
     "clean": "tsc --build --clean",
@@ -28,5 +28,5 @@
     "generate-client": "yarn openapi --input ./integrationapi.spec.json --output ./src/client --name CmsIntegrationApiClient",
     "generate-spec": "yarn node scripts/update-spec.js"
   },
-  "stableVersion": "2.0.0-pre2"
+  "stableVersion": "2.0.1"
 }