@gen3/core 0.11.62 → 0.12.1

package/dist/cjs/index.js

@@ -51,8 +51,10 @@ const GUID_PREFIX_PATTERN = /^dg.[a-zA-Z0-9]+\//;
 const GEN3_MDS_API = process.env.NEXT_PUBLIC_GEN3_MDS_API || `${GEN3_API}/mds`;
 const GEN3_DOWNLOADS_ENDPOINT = process.env.NEXT_PUBLIC_GEN3_DOWNLOADS_ENDPOINT || 'downloads';
 const GEN3_FENCE_API = process.env.NEXT_PUBLIC_GEN3_FENCE_API || `${GEN3_API}/user`;
+const GEN3_FENCE_SERVICE = process.env.GEN3_FENCE_SERVICE || 'http://fence-service';
 const GEN3_AI_SEARCH_API = process.env.NEXT_PUBLIC_GEN3_AI_SEARCH_API || `${GEN3_API}/ai-search`;
 const GEN3_AUTHZ_API = process.env.NEXT_PUBLIC_GEN3_AUTHZ_API || `${GEN3_API}/authz`;
+const GEN3_AUTHZ_SERVICE = process.env.GEN3_AUTHZ_SERVICE || 'http://arborist-service';
 const GEN3_REDIRECT_URL = process.env.NEXT_PUBLIC_GEN3_REDIRECT_URL || GEN3_API;
 const GEN3_WORKSPACE_API = process.env.NEXT_PUBLIC_GEN3_WORKSPACE_STATUS_API || `${GEN3_API}/lw-workspace`;
 const GEN3_SUBMISSION_API = process.env.NEXT_PUBLIC_GEN3_SUBMISSION_API || `${GEN3_API}/api/v0/submission`;
@@ -79,47 +81,6 @@ const FILE_DELIMITERS = {
 };
 const CART_LIMIT = 80000;
 
-const isFetchError = (obj)=>{
-    if (typeof obj !== 'object' || obj === null) {
-        return false;
-    }
-    const { url, status, statusText, text } = obj;
-    return typeof url === 'string' && typeof status === 'number' && typeof statusText === 'string' && typeof text === 'string';
-};
-/**
- * Template for fence error response dict
- * @returns: An error dict response from a RESTFUL API request
- */ const buildFetchError = async (res, request)=>{
-    return {
-        url: res.url,
-        status: res.status,
-        statusText: res.statusText,
-        text: await res.text(),
-        request: request
-    };
-};
-/**
- * Template for a standard fence request
- * @returns: response data
- */ const fetchFence = async ({ endpoint, headers, body = {}, method = 'GET', isJSON = true })=>{
-    const res = await fetch(`${GEN3_FENCE_API}${endpoint}`, {
-        method: method,
-        credentials: 'include',
-        headers: headers,
-        body: 'POST' === method ? JSON.stringify(body) : null
-    });
-    if (res.ok) return {
-        data: isJSON ? await res.json() : await res.text(),
-        status: res.status
-    };
-    throw await buildFetchError(res, {
-        endpoint,
-        method,
-        headers,
-        body
-    });
-};
-
 const userAuthApi = react.createApi({
     reducerPath: 'userAuthApi',
     refetchOnMountOrArgChange: 1800,
@@ -268,6 +229,69 @@ const selectHeadersWithCSRFToken = toolkit.createSelector([
 const gen3ServicesReducer = gen3Api.reducer;
 const gen3ServicesReducerMiddleware = gen3Api.middleware;
 
+const isFetchError = (obj)=>{
+    if (typeof obj !== 'object' || obj === null) {
+        return false;
+    }
+    const { url, status, statusText, text } = obj;
+    return typeof url === 'string' && typeof status === 'number' && typeof statusText === 'string' && typeof text === 'string';
+};
+/**
+ * Template for fence error response dict
+ * @returns: An error dict response from a RESTFUL API request
+ */ const buildFetchError = async (res, request)=>{
+    return {
+        url: res.url,
+        status: res.status,
+        statusText: res.statusText,
+        text: await res.text(),
+        request: request
+    };
+};
+
+/**
+ * Performs an asynchronous HTTP request to the Gen3 Fence API and processes the response.
+ *
+ * @template T The expected type of the response data.
+ * @param {FetchRequest} options The options for the fetch request.
+ * @param {string} options.endpoint The API endpoint to which the request will be sent.
+ * @param {Record<string, string>} options.headers An object representing the HTTP headers to include in the request.
+ * @param {Record<string, any>} [options.body={}] The request body to send with the fetch, used if the HTTP method is POST.
+ * @param {string} [options.method='GET'] The HTTP method for the request (e.g., 'GET', 'POST').
+ * @param {boolean} [options.isJSON=true] Determines if the response should be parsed as JSON or returned as plain text.
+ * @param useService { boolean } Uses fence_service instead of public fence API
+ * @returns {Promise<Gen3FenceResponse<T>>} A promise that resolves to the parsed data and response status
+ *                                          or rejects with an error if the request fails.
+ * @throws {Error} Throws an error if the fetch request fails or the response is not successful.
+ */ const fetchFence = async ({ endpoint, headers, body = {}, method = 'GET', isJSON = true }, useService = false)=>{
+    let url = `${GEN3_FENCE_API}${endpoint}`;
+    if (useService) {
+        url = `${GEN3_FENCE_SERVICE}/${endpoint}`;
+    }
+    const res = await fetch(url, {
+        method: method,
+        credentials: 'include',
+        headers: {
+            // Ensure Content-Type is set for JSON POSTs, but allow overrides via 'headers'
+            ...method === 'POST' ? {
+                'Content-Type': 'application/json'
+            } : {},
+            ...headers
+        },
+        body: 'POST' === method ? JSON.stringify(body) : null
+    });
+    if (res.ok) return {
+        data: isJSON ? await res.json() : await res.text(),
+        status: res.status
+    };
+    throw await buildFetchError(res, {
+        endpoint,
+        method,
+        headers,
+        body
+    });
+};
+
 /**
  * Creates a fence API endpoint for handling login/data processes
  * @param endpoints - defined endpoint query for logging in
@@ -3742,7 +3766,6 @@ const authzTags = gen3Api.enhanceEndpoints({
             }),
             createAuthzResource: builder.mutation({
                 query: (request)=>({
-                        // url: `${GEN3_AUTHZ_API}/resources/${request.resourcePath}${request?.path ? `&p=${request.path}` : ''}`,
                         url: `${GEN3_AUTHZ_API}/resources`,
                         method: 'POST',
                         body: request.data
@@ -3759,6 +3782,30 @@ const selectAuthzMappingData = toolkit.createSelector(selectAuthzMapping, (authz
         mappings: []
     });
 
+/**
+ * Low-level helper to fetch Arborist resources for the current user.
+ * Adds an Authorization header when a token is provided and normalizes the response
+ * to a simple string[] of resource paths.
+ *
+ * token { string | null } - access token to use for authorization
+ * useService { boolean } - use the arborist service endpoint instead of the public arborist API
+ */ async function fetchArboristResources(token, useService = false) {
+    const headers = {};
+    if (token) {
+        headers.Authorization = `Bearer ${token}`;
+    }
+    const url = useService ? `${GEN3_AUTHZ_SERVICE}/resource` : `${GEN3_AUTHZ_API}/resources`;
+    const res = await fetch(url, {
+        headers
+    });
+    if (!res.ok) {
+        console.error('@gen3/core:fetchArboristResources /resource failed:', res.status, await res.text());
+        return [];
+    }
+    const data = await res.json();
+    return data.resources ?? [];
+}
+
 class CohortStorage {
     constructor(config){
         this.databaseName = config.databaseName;
@@ -6267,11 +6314,13 @@ exports.FILE_DELIMITERS = FILE_DELIMITERS;
 exports.FILE_FORMATS = FILE_FORMATS;
 exports.GEN3_API = GEN3_API;
 exports.GEN3_AUTHZ_API = GEN3_AUTHZ_API;
+exports.GEN3_AUTHZ_SERVICE = GEN3_AUTHZ_SERVICE;
 exports.GEN3_COMMONS_NAME = GEN3_COMMONS_NAME;
 exports.GEN3_CROSSWALK_API = GEN3_CROSSWALK_API;
 exports.GEN3_DOMAIN = GEN3_DOMAIN;
 exports.GEN3_DOWNLOADS_ENDPOINT = GEN3_DOWNLOADS_ENDPOINT;
 exports.GEN3_FENCE_API = GEN3_FENCE_API;
+exports.GEN3_FENCE_SERVICE = GEN3_FENCE_SERVICE;
 exports.GEN3_GUPPY_API = GEN3_GUPPY_API;
 exports.GEN3_MANIFEST_API = GEN3_MANIFEST_API;
 exports.GEN3_MDS_API = GEN3_MDS_API;
@@ -6337,6 +6386,7 @@ exports.extractFiltersWithPrefixFromFilterSet = extractFiltersWithPrefixFromFilt
 exports.extractIndexAndFieldNameFromFullFieldName = extractIndexAndFieldNameFromFullFieldName;
 exports.extractIndexFromDataLibraryCohort = extractIndexFromDataLibraryCohort;
 exports.extractIndexFromFullFieldName = extractIndexFromFullFieldName;
+exports.fetchArboristResources = fetchArboristResources;
 exports.fetchFence = fetchFence;
 exports.fetchFencePresignedURL = fetchFencePresignedURL;
 exports.fetchJSONDataFromURL = fetchJSONDataFromURL;