@scality/data-browser-library 1.0.0-preview.9 → 1.0.3

package/dist/hooks/useFeatures.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Hook to check if a feature is enabled in the S3 configuration.
+ *
+ * @param feature - The feature name to check
+ * @returns true if enabled, false if disabled, undefined if config not available
+ */
+export declare function useFeatures(feature: string): boolean | undefined;

package/dist/hooks/useFeatures.js

@@ -0,0 +1,8 @@
+import { useDataBrowserContext } from "../components/providers/DataBrowserProvider.js";
+function useFeatures(feature) {
+    const { getS3Config } = useDataBrowserContext();
+    if (!getS3Config) return;
+    const config = getS3Config();
+    return config.features?.includes(feature) ?? false;
+}
+export { useFeatures };

package/dist/hooks/useISVBucketDetection.js

@@ -1,12 +1,12 @@
-import { useGetBucketTagging } from "./bucketConfiguration.js";
-import { useFeatures } from "../utils/useFeatures.js";
 import { BUCKET_TAG_APPLICATION, BUCKET_TAG_VEEAM_APPLICATION, COMMVAULT_APPLICATION, VEEAM_BACKUP_REPLICATION, VEEAM_OFFICE_365, VEEAM_OFFICE_365_V8, VEEAM_VBO_APPLICATION } from "../utils/constants.js";
+import { useGetBucketTagging } from "./bucketConfiguration.js";
+import { useFeatures } from "./useFeatures.js";
 const useISVBucketStatus = (bucketName)=>{
-    const isISVFeatureEnabled = useFeatures("ISV");
+    const isISVFeatureEnabled = useFeatures('ISV');
     const { data: bucketTags, status: bucketTagsStatus } = useGetBucketTagging({
         Bucket: bucketName
     }, {
-        enabled: isISVFeatureEnabled
+        enabled: true === isISVFeatureEnabled
     });
     const veeamTagApplication = bucketTags?.TagSet?.find((tag)=>tag.Key === BUCKET_TAG_VEEAM_APPLICATION)?.Value;
     const ISVApplicationTag = bucketTags?.TagSet?.find((tag)=>tag.Key === BUCKET_TAG_APPLICATION)?.Value;
@@ -19,8 +19,8 @@ const useISVBucketStatus = (bucketName)=>{
         isVeeamBucket: isVeeam,
         isCommvaultBucket,
         isISVManaged,
-        isvApplication: isCommvaultBucket ? "Commvault" : isVeeam ? "Veeam" : void 0,
-        isLoading: isISVFeatureEnabled && "pending" === bucketTagsStatus,
+        isvApplication: isCommvaultBucket ? 'Commvault' : isVeeam ? 'Veeam' : void 0,
+        isLoading: isISVFeatureEnabled && 'pending' === bucketTagsStatus,
         bucketTagsStatus
     };
 };

package/dist/hooks/useIsBucketEmpty.js

@@ -1,16 +1,16 @@
 import { useMemo } from "react";
 import { useListObjects } from "./objectOperations.js";
-const isInfiniteData = (data)=>null != data && "object" == typeof data && "pages" in data && Array.isArray(data.pages);
+const isInfiniteData = (data)=>null != data && 'object' == typeof data && 'pages' in data && Array.isArray(data.pages);
 const useIsBucketEmpty = (bucketName)=>{
     const { data, status, error } = useListObjects({
         Bucket: bucketName,
         MaxKeys: 1,
-        Delimiter: "/"
+        Delimiter: '/'
     }, {
         enabled: !!bucketName
     });
     const isEmpty = useMemo(()=>{
-        if ("pending" === status || !data) return null;
+        if ('pending' === status || !data) return null;
         if (!isInfiniteData(data)) return null;
         for (const page of data.pages){
             if (page?.Contents && page.Contents.length > 0) {
@@ -29,7 +29,7 @@ const useIsBucketEmpty = (bucketName)=>{
     ]);
     return {
         isEmpty,
-        isLoading: "pending" === status,
+        isLoading: 'pending' === status,
         error: error instanceof Error ? error : null
     };
 };

package/dist/hooks/useLimitedAccessFlow.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Limited Access Flow Orchestrator
+ *
+ * This module centralizes all logic related to handling users with limited S3 permissions
+ * (specifically users who lack ListBuckets permission but have access to specific buckets).
+ *
+ * It provides a clean abstraction that:
+ * - Encapsulates storage key patterns
+ * - Manages the limited access flag
+ * - Provides navigation logic
+ * - Coordinates between authentication, storage, and routing
+ */
+import type { LoginConfig } from './loginOperations';
+export interface UseLimitedAccessFlowOptions {
+    /**
+     * Callback invoked when a user successfully authenticates with limited access.
+     * This should be used to persist the config and transition the app state.
+     */
+    onLimitedAccessGranted: (config: LoginConfig) => void;
+}
+export interface LimitedAccessFlowHandlers {
+    /**
+     * Activates the limited access flow for a given S3 configuration.
+     * Sets the necessary flags and navigates to the bucket accessor form.
+     */
+    activateLimitedAccessFlow: (config: LoginConfig) => void;
+}
+/**
+ * Hook that orchestrates the limited access flow.
+ *
+ * This hook provides methods to activate and check the limited access mode
+ * for users who lack ListBuckets permission.
+ *
+ * @example
+ * ```tsx
+ * const { activateLimitedAccessFlow } = useLimitedAccessFlow({
+ *   onLimitedAccessGranted: (config) => {
+ *     setAppConfig(config);
+ *   }
+ * });
+ *
+ * // In login error handler:
+ * if (error.name === 'AccessDenied') {
+ *   activateLimitedAccessFlow(variables);
+ * }
+ * ```
+ */
+export declare const useLimitedAccessFlow: (options: UseLimitedAccessFlowOptions) => LimitedAccessFlowHandlers;

package/dist/hooks/useLimitedAccessFlow.js

@@ -0,0 +1,23 @@
+import { useCallback } from "react";
+import { useNavigate } from "react-router";
+import { computeS3ConfigIdentifier } from "../utils/s3ConfigIdentifier.js";
+import { setLimitedAccessFlag } from "./useAccessibleBuckets.js";
+const useLimitedAccessFlow = (options)=>{
+    const navigate = useNavigate();
+    const { onLimitedAccessGranted } = options;
+    const activateLimitedAccessFlow = useCallback((config)=>{
+        const s3ConfigIdentifier = computeS3ConfigIdentifier(config);
+        setLimitedAccessFlag(s3ConfigIdentifier, true);
+        onLimitedAccessGranted(config);
+        navigate('/buckets/-/access', {
+            replace: true
+        });
+    }, [
+        navigate,
+        onLimitedAccessGranted
+    ]);
+    return {
+        activateLimitedAccessFlow
+    };
+};
+export { useLimitedAccessFlow };

package/dist/hooks/useS3Client.d.ts

@@ -1 +1,7 @@
+/**
+ * Hook to get the S3 client instance.
+ *
+ * Recreates client only when s3ConfigIdentifier changes.
+ * The client is memoized to avoid unnecessary recreations.
+ */
 export declare const useS3Client: () => import("@aws-sdk/client-s3").S3Client;

package/dist/hooks/useS3Client.js

@@ -2,12 +2,13 @@ import { useMemo } from "react";
 import { useDataBrowserContext } from "../components/providers/DataBrowserProvider.js";
 import { createS3Client } from "../utils/s3Client.js";
 const useS3Client = ()=>{
-    const { getS3Config } = useDataBrowserContext();
+    const { s3ConfigIdentifier, getS3Config } = useDataBrowserContext();
+    if (!getS3Config) throw new Error('useS3Client: S3 config not available. Ensure DataBrowserProvider has getS3Config prop set.');
     return useMemo(()=>{
         const config = getS3Config();
         return createS3Client(config);
     }, [
-        getS3Config
+        s3ConfigIdentifier
     ]);
 };
 export { useS3Client };

package/dist/hooks/useS3ConfigSwitch.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Hook that handles navigation and query cleanup when S3 config changes.
+ * Must be used inside both DataBrowserProvider and DataBrowserUICustomizationProvider.
+ *
+ * When the S3 config identifier changes:
+ * - Navigates to the buckets page first (to trigger component unmounting)
+ * - Clears all queries associated with the previous config (after navigation)
+ *
+ * @internal This hook is designed for internal use within DataBrowserUI only.
+ */
+export declare const useS3ConfigSwitch: () => void;

package/dist/hooks/useS3ConfigSwitch.js

@@ -0,0 +1,37 @@
+import { useQueryClient } from "@tanstack/react-query";
+import { useEffect, useRef } from "react";
+import { useNavigate } from "react-router";
+import { useDataBrowserContext } from "../components/providers/DataBrowserProvider.js";
+import { useDataBrowserUICustomization } from "../contexts/DataBrowserUICustomizationContext.js";
+import { normalizePath } from "./useDataBrowserNavigate.js";
+const useS3ConfigSwitch = ()=>{
+    const { s3ConfigIdentifier } = useDataBrowserContext();
+    const { basePath = '' } = useDataBrowserUICustomization();
+    const queryClient = useQueryClient();
+    const navigate = useNavigate();
+    const prevConfigIdRef = useRef();
+    useEffect(()=>{
+        if (void 0 !== prevConfigIdRef.current && prevConfigIdRef.current !== s3ConfigIdentifier) {
+            const previousConfigId = prevConfigIdRef.current;
+            const bucketsPath = normalizePath(basePath, '/buckets');
+            navigate(bucketsPath, {
+                replace: true
+            });
+            queueMicrotask(()=>{
+                queryClient.removeQueries({
+                    queryKey: [
+                        previousConfigId
+                    ],
+                    exact: false
+                });
+            });
+        }
+        prevConfigIdRef.current = s3ConfigIdentifier;
+    }, [
+        s3ConfigIdentifier,
+        navigate,
+        basePath,
+        queryClient
+    ]);
+};
+export { useS3ConfigSwitch };

package/dist/hooks/useSupportedNotificationEvents.d.ts

@@ -0,0 +1,6 @@
+import type { S3EventType } from '../config/types';
+/**
+ * Hook to get supported notification events from the DataBrowser configuration
+ * If no supported events are configured, returns undefined (meaning all events are supported)
+ */
+export declare function useSupportedNotificationEvents(): S3EventType[] | undefined;

package/dist/hooks/useSupportedNotificationEvents.js

@@ -0,0 +1,8 @@
+import { useDataBrowserContext } from "../components/providers/DataBrowserProvider.js";
+function useSupportedNotificationEvents() {
+    const { getS3Config } = useDataBrowserContext();
+    if (!getS3Config) return;
+    const config = getS3Config();
+    return config?.s3Capabilities?.supportedNotificationEvents;
+}
+export { useSupportedNotificationEvents };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-export * from "./components";
-export * from "./hooks";
-export * from "./types";
-export * from "./utils";
-export * from "./config/factory";
-export * from "./config/types";
+export * from './components';
+export * from './config/factory';
+export * from './config/types';
+export * from './hooks';
+export * from './types';
+export * from './utils';

package/dist/index.js

@@ -1,6 +1,6 @@
 export * from "./components/index.js";
+export * from "./config/factory.js";
+export * from "./config/types.js";
 export * from "./hooks/index.js";
 export * from "./types/index.js";
 export * from "./utils/index.js";
-export * from "./config/factory.js";
-export * from "./config/types.js";

package/dist/schemas/bucketPolicySchema.json

@@ -20,10 +20,7 @@
       "items": {
         "type": "object",
         "required": ["Effect"],
-        "oneOf": [
-          { "required": ["Principal"] },
-          { "required": ["NotPrincipal"] }
-        ],
+        "oneOf": [{ "required": ["Principal"] }, { "required": ["NotPrincipal"] }],
         "properties": {
           "Sid": {
             "type": "string",
@@ -276,10 +273,7 @@
             "oneOf": [{ "required": ["Action"] }, { "required": ["NotAction"] }]
           },
           {
-            "oneOf": [
-              { "required": ["Resource"] },
-              { "required": ["NotResource"] }
-            ]
+            "oneOf": [{ "required": ["Resource"] }, { "required": ["NotResource"] }]
           }
         ]
       }
@@ -306,11 +300,7 @@
           {
             "type": "array",
             "items": {
-              "oneOf": [
-                { "type": "string" },
-                { "type": "number" },
-                { "type": "boolean" }
-              ]
+              "oneOf": [{ "type": "string" }, { "type": "number" }, { "type": "boolean" }]
             },
             "description": "Multiple condition values"
           }

package/dist/test/msw/handlers/deleteBucket.d.ts

@@ -1 +1 @@
-export declare const deleteBucketHandler: import("msw").RestHandler<import("msw").MockedRequest<import("msw").DefaultRequestBody>>;
+export declare const deleteBucketHandler: import("msw").HttpHandler;

package/dist/test/msw/handlers/deleteBucket.js

@@ -1,14 +1,24 @@
-import { rest } from "msw";
+import { HttpResponse, http } from "msw";
 import { createS3ErrorXml, getS3BaseUrl } from "../utils.js";
-const deleteBucketHandler = rest["delete"](`${getS3BaseUrl()}/:bucketName`, (req, res, ctx)=>{
-    const { bucketName } = req.params;
-    if ("string" == typeof bucketName) {
-        if (bucketName.includes("non-existent-bucket")) return res(ctx.status(404), ctx.xml(createS3ErrorXml("NoSuchBucket", "The specified bucket does not exist", bucketName)));
-        if (bucketName.includes("bucket-not-empty")) return res(ctx.status(409), ctx.xml(createS3ErrorXml("BucketNotEmpty", "The bucket you tried to delete is not empty", bucketName)));
-        if (bucketName.includes("restricted-bucket")) return res(ctx.status(403), ctx.xml(createS3ErrorXml("AccessDenied", "Access Denied")));
-        if (bucketName.includes("network-error-bucket")) return res.networkError("Failed to connect");
-        if (bucketName.includes("error-callback-bucket")) return res(ctx.status(500), ctx.xml(createS3ErrorXml("InternalError", "We encountered an internal error. Please try again.")));
+const deleteBucketHandler = http["delete"](`${getS3BaseUrl()}/:bucketName`, async ({ params })=>{
+    const { bucketName } = params;
+    if ('string' == typeof bucketName) {
+        if (bucketName.includes('non-existent-bucket')) return HttpResponse.xml(createS3ErrorXml('NoSuchBucket', 'The specified bucket does not exist', bucketName), {
+            status: 404
+        });
+        if (bucketName.includes('bucket-not-empty')) return HttpResponse.xml(createS3ErrorXml('BucketNotEmpty', 'The bucket you tried to delete is not empty', bucketName), {
+            status: 409
+        });
+        if (bucketName.includes('restricted-bucket')) return HttpResponse.xml(createS3ErrorXml('AccessDenied', 'Access Denied'), {
+            status: 403
+        });
+        if (bucketName.includes('network-error-bucket')) return HttpResponse.error();
+        if (bucketName.includes('error-callback-bucket')) return HttpResponse.xml(createS3ErrorXml('InternalError', 'We encountered an internal error. Please try again.'), {
+            status: 500
+        });
     }
-    return res(ctx.status(204));
+    return new Response(null, {
+        status: 204
+    });
 });
 export { deleteBucketHandler };

package/dist/test/msw/handlers/getBucketAcl.d.ts

@@ -1 +1 @@
-export declare const getBucketAclHandler: import("msw").RestHandler<import("msw").MockedRequest<import("msw").DefaultRequestBody>>;
+export declare const getBucketAclHandler: import("msw").HttpHandler;

package/dist/test/msw/handlers/getBucketAcl.js

@@ -1,14 +1,18 @@
-import { rest } from "msw";
+import { HttpResponse, http } from "msw";
 import { createS3ErrorXml, getS3BaseUrl } from "../utils.js";
-const getBucketAclHandler = rest.get(`${getS3BaseUrl()}/:bucketName`, (req, res, ctx)=>{
-    const { bucketName } = req.params;
-    const url = new URL(req.url);
-    if (!url.searchParams.has("acl")) return;
-    if ("string" == typeof bucketName) {
-        if (bucketName.includes("non-existent-bucket")) return res(ctx.status(404), ctx.xml(createS3ErrorXml("NoSuchBucket", "The specified bucket does not exist", bucketName)));
-        if (bucketName.includes("access-denied-bucket")) return res(ctx.status(403), ctx.xml(createS3ErrorXml("AccessDenied", "Access Denied")));
-        if (bucketName.includes("network-error-bucket")) return res.networkError("Failed to connect");
-        if (bucketName.includes("private-bucket")) return res(ctx.status(200), ctx.xml(`<?xml version="1.0" encoding="UTF-8"?>
+const getBucketAclHandler = http.get(`${getS3BaseUrl()}/:bucketName`, async ({ request, params })=>{
+    const { bucketName } = params;
+    const url = new URL(request.url);
+    if (!url.searchParams.has('acl')) return;
+    if ('string' == typeof bucketName) {
+        if (bucketName.includes('non-existent-bucket')) return HttpResponse.xml(createS3ErrorXml('NoSuchBucket', 'The specified bucket does not exist', bucketName), {
+            status: 404
+        });
+        if (bucketName.includes('access-denied-bucket')) return HttpResponse.xml(createS3ErrorXml('AccessDenied', 'Access Denied'), {
+            status: 403
+        });
+        if (bucketName.includes('network-error-bucket')) return HttpResponse.error();
+        if (bucketName.includes('private-bucket')) return HttpResponse.xml(`<?xml version="1.0" encoding="UTF-8"?>
             <AccessControlPolicy xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
               <Owner>
                 <ID>owner-canonical-id-123</ID>
@@ -23,8 +27,10 @@ const getBucketAclHandler = rest.get(`${getS3BaseUrl()}/:bucketName`, (req, res,
                   <Permission>FULL_CONTROL</Permission>
                 </Grant>
               </AccessControlList>
-            </AccessControlPolicy>`));
-        if (bucketName.includes("public-read-bucket")) return res(ctx.status(200), ctx.xml(`<?xml version="1.0" encoding="UTF-8"?>
+            </AccessControlPolicy>`, {
+            status: 200
+        });
+        if (bucketName.includes('public-read-bucket')) return HttpResponse.xml(`<?xml version="1.0" encoding="UTF-8"?>
             <AccessControlPolicy xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
               <Owner>
                 <ID>owner-canonical-id-123</ID>
@@ -45,8 +51,10 @@ const getBucketAclHandler = rest.get(`${getS3BaseUrl()}/:bucketName`, (req, res,
                   <Permission>READ</Permission>
                 </Grant>
               </AccessControlList>
-            </AccessControlPolicy>`));
-        if (bucketName.includes("shared-bucket")) return res(ctx.status(200), ctx.xml(`<?xml version="1.0" encoding="UTF-8"?>
+            </AccessControlPolicy>`, {
+            status: 200
+        });
+        if (bucketName.includes('shared-bucket')) return HttpResponse.xml(`<?xml version="1.0" encoding="UTF-8"?>
             <AccessControlPolicy xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
               <Owner>
                 <ID>owner-canonical-id-123</ID>
@@ -74,9 +82,11 @@ const getBucketAclHandler = rest.get(`${getS3BaseUrl()}/:bucketName`, (req, res,
                   <Permission>READ</Permission>
                 </Grant>
               </AccessControlList>
-            </AccessControlPolicy>`));
+            </AccessControlPolicy>`, {
+            status: 200
+        });
     }
-    return res(ctx.status(200), ctx.xml(`<?xml version="1.0" encoding="UTF-8"?>
+    return HttpResponse.xml(`<?xml version="1.0" encoding="UTF-8"?>
         <AccessControlPolicy xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
           <Owner>
             <ID>owner-canonical-id-123</ID>
@@ -91,6 +101,8 @@ const getBucketAclHandler = rest.get(`${getS3BaseUrl()}/:bucketName`, (req, res,
               <Permission>FULL_CONTROL</Permission>
             </Grant>
           </AccessControlList>
-        </AccessControlPolicy>`));
+        </AccessControlPolicy>`, {
+        status: 200
+    });
 });
 export { getBucketAclHandler };

package/dist/test/msw/handlers/getBucketLocation.d.ts

@@ -1 +1 @@
-export declare const getBucketLocationHandler: import("msw").RestHandler<import("msw").MockedRequest<import("msw").DefaultRequestBody>>;
+export declare const getBucketLocationHandler: import("msw").HttpHandler;

package/dist/test/msw/handlers/getBucketLocation.js

@@ -1,23 +1,37 @@
-import { rest } from "msw";
+import { HttpResponse, http } from "msw";
 import { createS3ErrorXml, getS3BaseUrl } from "../utils.js";
-const getBucketLocationHandler = rest.get(`${getS3BaseUrl()}/:bucketName`, (req, res, ctx)=>{
-    const { bucketName } = req.params;
-    const url = new URL(req.url);
-    if (!url.searchParams.has("location")) return;
-    if ("string" == typeof bucketName) {
-        if (bucketName.includes("non-existent-bucket")) return res(ctx.status(404), ctx.xml(createS3ErrorXml("NoSuchBucket", "The specified bucket does not exist", bucketName)));
-        if (bucketName.includes("access-denied-bucket")) return res(ctx.status(403), ctx.xml(createS3ErrorXml("AccessDenied", "Access Denied")));
-        if (bucketName.includes("network-error-bucket")) return res.networkError("Failed to connect");
+const getBucketLocationHandler = http.get(`${getS3BaseUrl()}/:bucketName`, async ({ request, params })=>{
+    const { bucketName } = params;
+    const url = new URL(request.url);
+    if (!url.searchParams.has('location')) return;
+    if ('string' == typeof bucketName) {
+        if (bucketName.includes('non-existent-bucket')) return HttpResponse.xml(createS3ErrorXml('NoSuchBucket', 'The specified bucket does not exist', bucketName), {
+            status: 404
+        });
+        if (bucketName.includes('access-denied-bucket')) return HttpResponse.xml(createS3ErrorXml('AccessDenied', 'Access Denied'), {
+            status: 403
+        });
+        if (bucketName.includes('network-error-bucket')) return HttpResponse.error();
         let locationConstraint = null;
-        if (bucketName.includes("eu-west-1")) locationConstraint = "eu-west-1";
-        else if (bucketName.includes("ap-southeast-1")) locationConstraint = "ap-southeast-1";
-        else if (bucketName.includes("us-west-2")) locationConstraint = "us-west-2";
+        if (bucketName.includes('eu-west-1')) locationConstraint = 'eu-west-1';
+        else if (bucketName.includes('ap-southeast-1')) locationConstraint = 'ap-southeast-1';
+        else if (bucketName.includes('us-west-2')) locationConstraint = 'us-west-2';
         const response = locationConstraint ? `<?xml version="1.0" encoding="UTF-8"?>
            <LocationConstraint xmlns="http://s3.amazonaws.com/doc/2006-03-01/">${locationConstraint}</LocationConstraint>` : `<?xml version="1.0" encoding="UTF-8"?>
            <LocationConstraint xmlns="http://s3.amazonaws.com/doc/2006-03-01/"></LocationConstraint>`;
-        return res(ctx.status(200), ctx.set("Content-Type", "application/xml"), ctx.body(response));
+        return HttpResponse.xml(response, {
+            status: 200,
+            headers: {
+                'Content-Type': 'application/xml'
+            }
+        });
     }
-    return res(ctx.status(200), ctx.set("Content-Type", "application/xml"), ctx.body(`<?xml version="1.0" encoding="UTF-8"?>
-        <LocationConstraint xmlns="http://s3.amazonaws.com/doc/2006-03-01/"></LocationConstraint>`));
+    return HttpResponse.xml(`<?xml version="1.0" encoding="UTF-8"?>
+        <LocationConstraint xmlns="http://s3.amazonaws.com/doc/2006-03-01/"></LocationConstraint>`, {
+        status: 200,
+        headers: {
+            'Content-Type': 'application/xml'
+        }
+    });
 });
 export { getBucketLocationHandler };

package/dist/test/msw/handlers/getBucketPolicy.d.ts

@@ -8,4 +8,4 @@
  * - "invalid-json-bucket" returns malformed JSON for testing
  * - Other buckets return a default allow-all policy
  */
-export declare const getBucketPolicyHandler: import("msw").RestHandler<import("msw").MockedRequest<import("msw").DefaultRequestBody>>;
+export declare const getBucketPolicyHandler: import("msw").HttpHandler;

package/dist/test/msw/handlers/getBucketPolicy.js

@@ -1,65 +1,80 @@
-import { rest } from "msw";
+import { HttpResponse, http } from "msw";
 import { createS3ErrorXml, getS3BaseUrl } from "../utils.js";
-const getBucketPolicyHandler = rest.get(`${getS3BaseUrl()}/:bucketName`, (req, res, ctx)=>{
-    const { bucketName } = req.params;
-    const url = new URL(req.url);
-    if (!url.searchParams.has("policy")) return;
-    if ("no-policy-bucket" === bucketName) return res(ctx.status(404), ctx.set("Content-Type", "application/xml"), ctx.body(createS3ErrorXml("NoSuchBucketPolicy", "The bucket policy does not exist", bucketName)));
-    if ("access-denied-bucket" === bucketName) return res(ctx.status(403), ctx.set("Content-Type", "application/xml"), ctx.body(createS3ErrorXml("AccessDenied", "Access Denied", bucketName)));
-    if ("invalid-json-bucket" === bucketName) return res(ctx.status(200), ctx.set("Content-Type", "application/json"), ctx.body('{"Version": "2012-10-17", "Statement": [invalid json}'));
+const getBucketPolicyHandler = http.get(`${getS3BaseUrl()}/:bucketName`, async ({ request, params })=>{
+    const { bucketName } = params;
+    const url = new URL(request.url);
+    if (!url.searchParams.has('policy')) return;
+    if ('no-policy-bucket' === bucketName) return HttpResponse.xml(createS3ErrorXml('NoSuchBucketPolicy', 'The bucket policy does not exist', bucketName), {
+        status: 404,
+        headers: {
+            'Content-Type': 'application/xml'
+        }
+    });
+    if ('access-denied-bucket' === bucketName) return HttpResponse.xml(createS3ErrorXml('AccessDenied', 'Access Denied', bucketName), {
+        status: 403,
+        headers: {
+            'Content-Type': 'application/xml'
+        }
+    });
+    if ('invalid-json-bucket' === bucketName) return HttpResponse.text('{"Version": "2012-10-17", "Statement": [invalid json}', {
+        status: 200,
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    });
     let policy;
-    policy = "string" == typeof bucketName && bucketName.startsWith("policy-readonly-") ? {
-        Version: "2012-10-17",
+    policy = 'string' == typeof bucketName && bucketName.startsWith('policy-readonly-') ? {
+        Version: '2012-10-17',
         Statement: [
             {
-                Sid: "PublicReadGetObject",
-                Effect: "Allow",
-                Principal: "*",
-                Action: "s3:GetObject",
+                Sid: 'PublicReadGetObject',
+                Effect: 'Allow',
+                Principal: '*',
+                Action: 's3:GetObject',
                 Resource: `arn:aws:s3:::${bucketName}/*`
             }
         ]
-    } : "string" == typeof bucketName && bucketName.startsWith("policy-complex-") ? {
-        Version: "2012-10-17",
+    } : 'string' == typeof bucketName && bucketName.startsWith('policy-complex-') ? {
+        Version: '2012-10-17',
         Statement: [
             {
-                Sid: "AllowSpecificUser",
-                Effect: "Allow",
+                Sid: 'AllowSpecificUser',
+                Effect: 'Allow',
                 Principal: {
-                    AWS: "arn:aws:iam::123456789012:user/ExampleUser"
+                    AWS: 'arn:aws:iam::123456789012:user/ExampleUser'
                 },
                 Action: [
-                    "s3:GetObject",
-                    "s3:PutObject"
+                    's3:GetObject',
+                    's3:PutObject'
                 ],
                 Resource: `arn:aws:s3:::${bucketName}/*`
             },
             {
-                Sid: "DenyInsecureConnections",
-                Effect: "Deny",
-                Principal: "*",
-                Action: "s3:*",
+                Sid: 'DenyInsecureConnections',
+                Effect: 'Deny',
+                Principal: '*',
+                Action: 's3:*',
                 Resource: [
                     `arn:aws:s3:::${bucketName}`,
                     `arn:aws:s3:::${bucketName}/*`
                 ],
                 Condition: {
                     Bool: {
-                        "aws:SecureTransport": "false"
+                        'aws:SecureTransport': 'false'
                     }
                 }
             }
         ]
     } : {
-        Version: "2012-10-17",
+        Version: '2012-10-17',
         Statement: [
             {
-                Sid: "DefaultStatement",
-                Effect: "Allow",
+                Sid: 'DefaultStatement',
+                Effect: 'Allow',
                 Principal: {
-                    AWS: "arn:aws:iam::123456789012:root"
+                    AWS: 'arn:aws:iam::123456789012:root'
                 },
-                Action: "s3:*",
+                Action: 's3:*',
                 Resource: [
                     `arn:aws:s3:::${bucketName}`,
                     `arn:aws:s3:::${bucketName}/*`
@@ -67,6 +82,11 @@ const getBucketPolicyHandler = rest.get(`${getS3BaseUrl()}/:bucketName`, (req, r
             }
         ]
     };
-    return res(ctx.status(200), ctx.set("Content-Type", "application/json"), ctx.body(JSON.stringify(policy)));
+    return HttpResponse.json(policy, {
+        status: 200,
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    });
 });
 export { getBucketPolicyHandler };

package/dist/test/msw/handlers/headObject.d.ts

@@ -1 +1 @@
-export declare const headObjectHandler: import("msw").RestHandler<import("msw").MockedRequest<import("msw").DefaultRequestBody>>;
+export declare const headObjectHandler: import("msw").HttpHandler;