@orangelogic/orange-dam-content-browser-sdk 2.4.5 → 2.4.6

package/build/components/content-browser/content-browser.d.ts

@@ -44,6 +44,10 @@ export default class CxContentBrowser extends CortexElement {
     allowedFolders: string[];
     availableRepresentativeSubtypes: string[];
     token: string;
+    /**
+     * Host OAuth token (`onRequestToken`), sent as a Bearer header.
+     */
+    bearerToken: string;
     showCollections: boolean;
     showFavoriteFolder: boolean;
     showCloseButton: boolean;

package/build/components/content-browser-browser/content-browser-browser.d.ts

@@ -38,6 +38,7 @@ export default class CxContentBrowserBrowser extends CortexElement {
     seeThru: boolean;
     minQueryLength: number;
     token: string;
+    bearerToken: string;
     baseUrl: string;
     useSiteSession: boolean;
     private searchTerm;

package/build/content-browser.mjs

@@ -5868,6 +5868,7 @@ let CxContentBrowserBrowser = class extends CortexElement {
     this.seeThru = false;
     this.minQueryLength = 2;
     this.token = "";
+    this.bearerToken = "";
     this.baseUrl = "";
     this.useSiteSession = false;
     this.searchTerm = "";
@@ -6065,6 +6066,7 @@ let CxContentBrowserBrowser = class extends CortexElement {
                 auto-page-size
                 reload-on-expand
                 .token=${this.token}
+                .bearerToken=${this.bearerToken}
                 .api=${this.useSiteSession ? apiGetFolders : E}
                 .baseUrl=${this.baseUrl}
                 .form=${this.closest("form")}
@@ -6100,6 +6102,7 @@ let CxContentBrowserBrowser = class extends CortexElement {
                     selected-value=${o$4(this.folderId || void 0)}
                     .api=${this.collectionApi}
                     .token=${this.token}
+                    .bearerToken=${this.bearerToken}
                     .baseUrl=${this.baseUrl}
                   >
                   </cx-folder-select-tree>
@@ -6164,6 +6167,9 @@ __decorateClass$g([
 __decorateClass$g([
   n$6({ attribute: "token", type: String })
 ], CxContentBrowserBrowser.prototype, "token", 2);
+__decorateClass$g([
+  n$6({ attribute: "bearer-token", type: String })
+], CxContentBrowserBrowser.prototype, "bearerToken", 2);
 __decorateClass$g([
   n$6({ attribute: "base-url", type: String })
 ], CxContentBrowserBrowser.prototype, "baseUrl", 2);
@@ -13749,6 +13755,7 @@ class FetchAndMergeAssetsController {
   constructor(host, {
     availableDocTypes,
     baseUrl,
+    bearerToken,
     defaultFolderId,
     defaultIsSeeThrough,
     defaultSearchText,
@@ -13802,7 +13809,7 @@ class FetchAndMergeAssetsController {
     this.defaultSelectedFacets = defaultSelectedFacets;
     this.defaultSortOrderName = defaultSortOrderName;
     this.defaultSortDirection = defaultSortDirection;
-    this.applyTransportMode(useSiteSession, baseUrl, token, useSession);
+    this.applyTransportMode(useSiteSession, baseUrl, token, useSession, bearerToken);
     this.requestInterceptorId = http.interceptors.request.use((config) => {
       var _a3;
       if (this.useSiteSession) {
@@ -13840,6 +13847,11 @@ class FetchAndMergeAssetsController {
       if (this.baseUrl) {
         config.baseURL = this.baseUrl;
       }
+      if (this.bearerToken) {
+        config.headers.set("Authorization", `Bearer ${this.bearerToken}`);
+      } else {
+        config.headers.delete("Authorization");
+      }
       config.params = __spreadProps(__spreadValues({}, config.params), {
         Token: this.token || void 0,
         UseSession: this.useSession || void 0
@@ -13897,22 +13909,23 @@ class FetchAndMergeAssetsController {
    * Site-session mode decides the transport (cookies on the Cortex origin vs. Token/UseSession
    * params), so it has to be applied to the interceptor state and base URL, not just captured once.
    */
-  applyTransportMode(useSiteSession, baseUrl, token, useSession) {
+  applyTransportMode(useSiteSession, baseUrl, token, useSession, bearerToken) {
     this.useSiteSession = useSiteSession;
     this.baseUrl = useSiteSession ? resolveSiteSessionUrl(baseUrl) : baseUrl;
     this.token = useSiteSession ? "" : token;
     this.useSession = useSiteSession ? "" : useSession;
+    this.bearerToken = useSiteSession ? "" : bearerToken;
     http.defaults.baseURL = this.baseUrl;
   }
   /**
    * `setSiteSession(...)` can flip the mode while the host stays mounted, so keep the transport in
    * step with the UI instead of serving requests through the mode the controller was built with.
    */
-  updateSiteSession(useSiteSession, baseUrl, token, useSession) {
+  updateSiteSession(useSiteSession, baseUrl, token, useSession, bearerToken) {
     if (useSiteSession === this.useSiteSession) {
       return;
     }
-    this.applyTransportMode(useSiteSession, baseUrl, token, useSession);
+    this.applyTransportMode(useSiteSession, baseUrl, token, useSession, bearerToken);
     if (this.resolvePendingTokenRefresh) {
       this.resolvePendingTokenRefresh(null);
       this.pendingTokenRefresh = null;
@@ -13926,20 +13939,21 @@ class FetchAndMergeAssetsController {
     }
     this.host.requestUpdate();
   }
-  updateAuth(token, useSession) {
+  updateAuth(token, useSession, bearerToken) {
     if (this.useSiteSession) {
       return;
     }
-    const tokenChanged = this.token !== token;
+    const tokenChanged = this.token !== token || this.bearerToken !== bearerToken;
     const wasLoggedOut = !this.isLoggedIn;
     this.token = token;
     this.useSession = useSession;
+    this.bearerToken = bearerToken;
     if (tokenChanged && this.resolvePendingTokenRefresh) {
-      this.resolvePendingTokenRefresh(token || null);
+      this.resolvePendingTokenRefresh(bearerToken || token || null);
       this.pendingTokenRefresh = null;
       this.resolvePendingTokenRefresh = null;
     }
-    if (tokenChanged && wasLoggedOut && token) {
+    if (tokenChanged && wasLoggedOut && (bearerToken || token)) {
       this.isLoggedIn = true;
       this.fetchInitialData();
       if (this.lastRequest) {
@@ -14422,6 +14436,7 @@ let CxContentBrowser = class extends CortexElement {
     this.allowedFolders = [];
     this.availableRepresentativeSubtypes = [];
     this.token = "";
+    this.bearerToken = "";
     this.showCollections = false;
     this.showFavoriteFolder = false;
     this.showCloseButton = false;
@@ -14515,6 +14530,7 @@ let CxContentBrowser = class extends CortexElement {
       this.fetchAndMergeAssetsController = new FetchAndMergeAssetsController(this, {
         availableDocTypes: this.availableDocTypes,
         baseUrl: this.baseUrl,
+        bearerToken: this.bearerToken,
         defaultFolderId: this.defaultFolderId,
         defaultIsSeeThrough: this.defaultIsSeeThrough,
         defaultSearchText: this.defaultSearchText,
@@ -14598,7 +14614,7 @@ let CxContentBrowser = class extends CortexElement {
   }
   handleAuthChange() {
     var _a2;
-    (_a2 = this.fetchAndMergeAssetsController) == null ? void 0 : _a2.updateAuth(this.token, this.useSession);
+    (_a2 = this.fetchAndMergeAssetsController) == null ? void 0 : _a2.updateAuth(this.token, this.useSession, this.bearerToken);
   }
   handleSiteSessionChange() {
     var _a2;
@@ -14609,7 +14625,8 @@ let CxContentBrowser = class extends CortexElement {
       this.useSiteSession,
       this.baseUrl,
       this.token,
-      this.useSession
+      this.useSession,
+      this.bearerToken
     );
   }
   handleSortOrderChange(event) {
@@ -14976,6 +14993,7 @@ let CxContentBrowser = class extends CortexElement {
             folder-id=${o$4(this.lastRequest.folderId || void 0)}
             folder-title=${o$4(this.folderTitle || void 0)}
             token=${this.useSiteSession ? "" : this.token}
+            bearer-token=${this.useSiteSession ? "" : this.bearerToken}
             base-url=${this.baseUrl}
             use-session=${this.useSiteSession ? "" : this.useSession}
             ?use-site-session=${this.useSiteSession}
@@ -15143,6 +15161,9 @@ __decorateClass([
 __decorateClass([
   n$6({ attribute: "token", reflect: false, type: String })
 ], CxContentBrowser.prototype, "token", 2);
+__decorateClass([
+  n$6({ attribute: "bearer-token", reflect: false, type: String })
+], CxContentBrowser.prototype, "bearerToken", 2);
 __decorateClass([
   n$6({ attribute: "show-collections", reflect: true, type: Boolean })
 ], CxContentBrowser.prototype, "showCollections", 2);
@@ -15272,7 +15293,7 @@ __decorateClass([
   watch("lastRequest", { waitUntilFirstUpdate: true })
 ], CxContentBrowser.prototype, "handleLastRequestChange", 1);
 __decorateClass([
-  watch(["token", "useSession"], { waitUntilFirstUpdate: true })
+  watch(["token", "useSession", "bearerToken"], { waitUntilFirstUpdate: true })
 ], CxContentBrowser.prototype, "handleAuthChange", 1);
 __decorateClass([
   watch("useSiteSession", { waitUntilFirstUpdate: true })

package/build/index.mjs

@@ -5934,6 +5934,7 @@ let CxContentBrowserBrowser = class extends CortexElement {
     this.seeThru = false;
     this.minQueryLength = 2;
     this.token = "";
+    this.bearerToken = "";
     this.baseUrl = "";
     this.useSiteSession = false;
     this.searchTerm = "";
@@ -6131,6 +6132,7 @@ let CxContentBrowserBrowser = class extends CortexElement {
                 auto-page-size
                 reload-on-expand
                 .token=${this.token}
+                .bearerToken=${this.bearerToken}
                 .api=${this.useSiteSession ? apiGetFolders : E}
                 .baseUrl=${this.baseUrl}
                 .form=${this.closest("form")}
@@ -6166,6 +6168,7 @@ let CxContentBrowserBrowser = class extends CortexElement {
                     selected-value=${o$5(this.folderId || void 0)}
                     .api=${this.collectionApi}
                     .token=${this.token}
+                    .bearerToken=${this.bearerToken}
                     .baseUrl=${this.baseUrl}
                   >
                   </cx-folder-select-tree>
@@ -6230,6 +6233,9 @@ __decorateClass$g([
 __decorateClass$g([
   n$6({ attribute: "token", type: String })
 ], CxContentBrowserBrowser.prototype, "token", 2);
+__decorateClass$g([
+  n$6({ attribute: "bearer-token", type: String })
+], CxContentBrowserBrowser.prototype, "bearerToken", 2);
 __decorateClass$g([
   n$6({ attribute: "base-url", type: String })
 ], CxContentBrowserBrowser.prototype, "baseUrl", 2);
@@ -13815,6 +13821,7 @@ class FetchAndMergeAssetsController {
   constructor(host, {
     availableDocTypes,
     baseUrl,
+    bearerToken,
     defaultFolderId,
     defaultIsSeeThrough,
     defaultSearchText,
@@ -13868,7 +13875,7 @@ class FetchAndMergeAssetsController {
     this.defaultSelectedFacets = defaultSelectedFacets;
     this.defaultSortOrderName = defaultSortOrderName;
     this.defaultSortDirection = defaultSortDirection;
-    this.applyTransportMode(useSiteSession, baseUrl, token2, useSession);
+    this.applyTransportMode(useSiteSession, baseUrl, token2, useSession, bearerToken);
     this.requestInterceptorId = http.interceptors.request.use((config) => {
       var _a3;
       if (this.useSiteSession) {
@@ -13906,6 +13913,11 @@ class FetchAndMergeAssetsController {
       if (this.baseUrl) {
         config.baseURL = this.baseUrl;
       }
+      if (this.bearerToken) {
+        config.headers.set("Authorization", `Bearer ${this.bearerToken}`);
+      } else {
+        config.headers.delete("Authorization");
+      }
       config.params = __spreadProps(__spreadValues({}, config.params), {
         Token: this.token || void 0,
         UseSession: this.useSession || void 0
@@ -13963,22 +13975,23 @@ class FetchAndMergeAssetsController {
    * Site-session mode decides the transport (cookies on the Cortex origin vs. Token/UseSession
    * params), so it has to be applied to the interceptor state and base URL, not just captured once.
    */
-  applyTransportMode(useSiteSession, baseUrl, token2, useSession) {
+  applyTransportMode(useSiteSession, baseUrl, token2, useSession, bearerToken) {
     this.useSiteSession = useSiteSession;
     this.baseUrl = useSiteSession ? resolveSiteSessionUrl(baseUrl) : baseUrl;
     this.token = useSiteSession ? "" : token2;
     this.useSession = useSiteSession ? "" : useSession;
+    this.bearerToken = useSiteSession ? "" : bearerToken;
     http.defaults.baseURL = this.baseUrl;
   }
   /**
    * `setSiteSession(...)` can flip the mode while the host stays mounted, so keep the transport in
    * step with the UI instead of serving requests through the mode the controller was built with.
    */
-  updateSiteSession(useSiteSession, baseUrl, token2, useSession) {
+  updateSiteSession(useSiteSession, baseUrl, token2, useSession, bearerToken) {
     if (useSiteSession === this.useSiteSession) {
       return;
     }
-    this.applyTransportMode(useSiteSession, baseUrl, token2, useSession);
+    this.applyTransportMode(useSiteSession, baseUrl, token2, useSession, bearerToken);
     if (this.resolvePendingTokenRefresh) {
       this.resolvePendingTokenRefresh(null);
       this.pendingTokenRefresh = null;
@@ -13992,20 +14005,21 @@ class FetchAndMergeAssetsController {
     }
     this.host.requestUpdate();
   }
-  updateAuth(token2, useSession) {
+  updateAuth(token2, useSession, bearerToken) {
     if (this.useSiteSession) {
       return;
     }
-    const tokenChanged = this.token !== token2;
+    const tokenChanged = this.token !== token2 || this.bearerToken !== bearerToken;
     const wasLoggedOut = !this.isLoggedIn;
     this.token = token2;
     this.useSession = useSession;
+    this.bearerToken = bearerToken;
     if (tokenChanged && this.resolvePendingTokenRefresh) {
-      this.resolvePendingTokenRefresh(token2 || null);
+      this.resolvePendingTokenRefresh(bearerToken || token2 || null);
       this.pendingTokenRefresh = null;
       this.resolvePendingTokenRefresh = null;
     }
-    if (tokenChanged && wasLoggedOut && token2) {
+    if (tokenChanged && wasLoggedOut && (bearerToken || token2)) {
       this.isLoggedIn = true;
       this.fetchInitialData();
       if (this.lastRequest) {
@@ -14488,6 +14502,7 @@ let CxContentBrowser = class extends CortexElement {
     this.allowedFolders = [];
     this.availableRepresentativeSubtypes = [];
     this.token = "";
+    this.bearerToken = "";
     this.showCollections = false;
     this.showFavoriteFolder = false;
     this.showCloseButton = false;
@@ -14581,6 +14596,7 @@ let CxContentBrowser = class extends CortexElement {
       this.fetchAndMergeAssetsController = new FetchAndMergeAssetsController(this, {
         availableDocTypes: this.availableDocTypes,
         baseUrl: this.baseUrl,
+        bearerToken: this.bearerToken,
         defaultFolderId: this.defaultFolderId,
         defaultIsSeeThrough: this.defaultIsSeeThrough,
         defaultSearchText: this.defaultSearchText,
@@ -14664,7 +14680,7 @@ let CxContentBrowser = class extends CortexElement {
   }
   handleAuthChange() {
     var _a2;
-    (_a2 = this.fetchAndMergeAssetsController) == null ? void 0 : _a2.updateAuth(this.token, this.useSession);
+    (_a2 = this.fetchAndMergeAssetsController) == null ? void 0 : _a2.updateAuth(this.token, this.useSession, this.bearerToken);
   }
   handleSiteSessionChange() {
     var _a2;
@@ -14675,7 +14691,8 @@ let CxContentBrowser = class extends CortexElement {
       this.useSiteSession,
       this.baseUrl,
       this.token,
-      this.useSession
+      this.useSession,
+      this.bearerToken
     );
   }
   handleSortOrderChange(event) {
@@ -15042,6 +15059,7 @@ let CxContentBrowser = class extends CortexElement {
             folder-id=${o$5(this.lastRequest.folderId || void 0)}
             folder-title=${o$5(this.folderTitle || void 0)}
             token=${this.useSiteSession ? "" : this.token}
+            bearer-token=${this.useSiteSession ? "" : this.bearerToken}
             base-url=${this.baseUrl}
             use-session=${this.useSiteSession ? "" : this.useSession}
             ?use-site-session=${this.useSiteSession}
@@ -15209,6 +15227,9 @@ __decorateClass([
 __decorateClass([
   n$6({ attribute: "token", reflect: false, type: String })
 ], CxContentBrowser.prototype, "token", 2);
+__decorateClass([
+  n$6({ attribute: "bearer-token", reflect: false, type: String })
+], CxContentBrowser.prototype, "bearerToken", 2);
 __decorateClass([
   n$6({ attribute: "show-collections", reflect: true, type: Boolean })
 ], CxContentBrowser.prototype, "showCollections", 2);
@@ -15338,7 +15359,7 @@ __decorateClass([
   watch("lastRequest", { waitUntilFirstUpdate: true })
 ], CxContentBrowser.prototype, "handleLastRequestChange", 1);
 __decorateClass([
-  watch(["token", "useSession"], { waitUntilFirstUpdate: true })
+  watch(["token", "useSession", "bearerToken"], { waitUntilFirstUpdate: true })
 ], CxContentBrowser.prototype, "handleAuthChange", 1);
 __decorateClass([
   watch("useSiteSession", { waitUntilFirstUpdate: true })
@@ -31930,7 +31951,7 @@ const readAccessKey = (authState) => __async(null, null, function* () {
   return readStoredAccessKey(authState.siteUrl);
 });
 const refreshAccessToken = () => __async(null, null, function* () {
-  var _a2;
+  var _a2, _b2, _c2;
   if (store.getState()[AUTH_FEATURE_KEY].useSiteSession) {
     return null;
   }
@@ -31945,6 +31966,20 @@ const refreshAccessToken = () => __async(null, null, function* () {
     if (authState.useSiteSession) {
       return null;
     }
+    if (authState.useHeaders) {
+      try {
+        const result = yield (_c2 = (_b2 = window.OrangeDAMContentBrowser) == null ? void 0 : _b2._onRequestToken) == null ? void 0 : _c2.call(_b2);
+        if (!store.getState()[AUTH_FEATURE_KEY].useHeaders) {
+          return null;
+        }
+        if (result == null ? void 0 : result.token) {
+          store.dispatch(updateAuthTokens({ accessKey: result.token }));
+          return result.token;
+        }
+      } catch (e2) {
+      }
+      return null;
+    }
     let accessKey;
     try {
       accessKey = yield readAccessKey(authState);
@@ -32203,6 +32238,7 @@ const authSlice = createSlice({
           state.accessToken = accessToken;
           state.status = "authenticated";
           state.siteUrl = siteUrl;
+          state.useHeaders = false;
           storeData(AUTH_FEATURE_ACCESS_KEY_KEY, accessKey != null ? accessKey : "");
           storeData(AUTH_FEATURE_SITE_URL_KEY, siteUrl);
         }
@@ -32229,6 +32265,10 @@ const authStateSelector = (rootState) => rootState[AUTH_FEATURE_KEY].status;
 const applySessionSelector = (rootState) => rootState[AUTH_FEATURE_KEY].useSession;
 const applyHeadersSelector = (rootState) => !!rootState[AUTH_FEATURE_KEY].useHeaders;
 const siteSessionSelector = (rootState) => !!rootState[AUTH_FEATURE_KEY].useSiteSession;
+const bearerTokenSelector = (rootState) => {
+  const { accessKey, useHeaders } = rootState[AUTH_FEATURE_KEY];
+  return useHeaders ? accessKey : void 0;
+};
 const appAuthUrlSelector = (rootState) => {
   const siteUrl = rootState[AUTH_FEATURE_KEY].siteUrl;
   return siteUrl ? getRequestUrl(siteUrl, `AppAuth?RID=${rootState[AUTH_FEATURE_KEY].nonce}`) : "";
@@ -32452,6 +32492,7 @@ const AssetsPicker = reactExports.forwardRef(function AssetsPicker2({ accessToke
   const appDispatch = useAppDispatch();
   const useSession = useAppSelector(applySessionSelector);
   const useSiteSession = useAppSelector(siteSessionSelector);
+  const bearerToken = useAppSelector(bearerTokenSelector);
   const {
     allowFavorites,
     allowFormatDialogPin,
@@ -32697,6 +32738,7 @@ const AssetsPicker = reactExports.forwardRef(function AssetsPicker2({ accessToke
       "default-search-text": defaultSettings.searchText,
       "default-folder-id": defaultSettings.lastLocation,
       token: accessToken != null ? accessToken : "",
+      bearerToken: bearerToken != null ? bearerToken : "",
       "base-url": siteUrl != null ? siteUrl : "",
       "use-session": useSession,
       "use-site-session": useSiteSession,

package/build/store/auth/auth.slice.d.ts

@@ -196,6 +196,7 @@ export declare const authStateSelector: (rootState: RootState) => "authenticated
 export declare const applySessionSelector: (rootState: RootState) => string;
 export declare const applyHeadersSelector: (rootState: RootState) => boolean;
 export declare const siteSessionSelector: (rootState: RootState) => boolean;
+export declare const bearerTokenSelector: (rootState: RootState) => string | undefined;
 export declare const appAuthUrlSelector: (rootState: RootState) => string;
 export declare const cancelAuth: import("@reduxjs/toolkit").AsyncThunk<void, void, import("@reduxjs/toolkit").AsyncThunkConfig>;
 export declare const oAuth: import("@reduxjs/toolkit").AsyncThunk<OAuthRes, {

package/build/tools/fetch-and-merge-assets.d.ts

@@ -8,6 +8,7 @@ import type { ReactiveController } from 'lit';
 type FetchAndMergeAssetsControllerOptions = {
     availableDocTypes: string[];
     baseUrl: string;
+    bearerToken: string;
     defaultFolderId: string;
     defaultIsSeeThrough: boolean;
     defaultSearchText: string;
@@ -37,6 +38,7 @@ export declare class FetchAndMergeAssetsController implements ReactiveController
     private loading;
     private isLoggedIn;
     private token;
+    private bearerToken;
     private useSession;
     private useSiteSession;
     private baseUrl;
@@ -52,7 +54,7 @@ export declare class FetchAndMergeAssetsController implements ReactiveController
     private readonly defaultIsSeeThrough;
     private requestInterceptorId;
     private responseInterceptorId;
-    constructor(host: CortexElement, { availableDocTypes, baseUrl, defaultFolderId, defaultIsSeeThrough, defaultSearchText, defaultSelectedFacets, defaultSortDirection, defaultSortOrderName, token, useSession, useSiteSession, }: FetchAndMergeAssetsControllerOptions);
+    constructor(host: CortexElement, { availableDocTypes, baseUrl, bearerToken, defaultFolderId, defaultIsSeeThrough, defaultSearchText, defaultSelectedFacets, defaultSortDirection, defaultSortOrderName, token, useSession, useSiteSession, }: FetchAndMergeAssetsControllerOptions);
     private waitForNewToken;
     /**
      * Site-session mode decides the transport (cookies on the Cortex origin vs. Token/UseSession
@@ -63,8 +65,8 @@ export declare class FetchAndMergeAssetsController implements ReactiveController
      * `setSiteSession(...)` can flip the mode while the host stays mounted, so keep the transport in
      * step with the UI instead of serving requests through the mode the controller was built with.
      */
-    updateSiteSession(useSiteSession: boolean, baseUrl: string, token: string, useSession: string): void;
-    updateAuth(token: string, useSession: string): void;
+    updateSiteSession(useSiteSession: boolean, baseUrl: string, token: string, useSession: string, bearerToken: string): void;
+    updateAuth(token: string, useSession: string, bearerToken: string): void;
     private fetchInitialData;
     private _debounceTimeout;
     private _debouncePromise;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orangelogic/orange-dam-content-browser-sdk",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "description": "OrangeDAM Content Browser SDK source code",
   "main": "./build/OrangeDAMContentBrowserSDK.min.js",
   "module": "./build/index.mjs",