@galadrim/galadmin 0.2.9 → 0.2.11

package/dist/types/config.d.ts

@@ -132,8 +132,8 @@ export type FileUploadProperties = {
     originalNameField?: string;
     s3Config?: {
         host: string;
-        accessKeyId: string;
-        secretAccessKey: string;
+        accessKeyId?: string;
+        secretAccessKey?: string;
         bucket: string;
         subfolder?: string;
         signedUrlNeeded?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galadrim/galadmin",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -9,7 +9,8 @@
     "test:coverage": "TEST_INTEGRATION=1 jest --coverage --runInBand --projects jest.config.js jest.integration.config.js",
     "test:integration": "TEST_INTEGRATION=1 jest --config jest.integration.config.js --runInBand",
     "test:all": "npm run test:unit && npm run test:integration",
-    "build": "tsc"
+    "build": "tsc",
+    "typecheck": "tsc --noEmit --incremental false"
   },
   "engines": {
     "node": ">=22"

package/src/api.ts

@@ -1390,10 +1390,12 @@ export default (db, config) => {
           const s3 = new S3Client({
             endpoint,
             region: s3Config.region,
-            credentials: {
-              accessKeyId: s3Config.accessKeyId,
-              secretAccessKey: s3Config.secretAccessKey,
-            },
+            ...(s3Config.accessKeyId && {
+              credentials: {
+                accessKeyId: s3Config.accessKeyId,
+                secretAccessKey: s3Config.secretAccessKey ?? "",
+              },
+            }),
             forcePathStyle: false,
           });
           if (s3Config.signedUrlNeeded) {

package/src/types/config.ts

@@ -147,8 +147,8 @@ export type FileUploadProperties = {
   originalNameField?: string;
   s3Config?: {
     host: string;
-    accessKeyId: string;
-    secretAccessKey: string;
+    accessKeyId?: string;
+    secretAccessKey?: string;
     bucket: string;
     subfolder?: string;
     signedUrlNeeded?: boolean;

package/tests/integration/routes.upload.integration.test.ts

@@ -162,6 +162,61 @@ describeIntegration("upload routes against real databases", () => {
         expect(Buffer.isBuffer(sentCommand.Body)).toBe(true);
       });
 
+      it("lets the SDK resolve credentials when no accessKeyId is configured", async () => {
+        const s3Mock = jest.requireMock("@aws-sdk/client-s3");
+        const column = fileColumn({
+          s3Config: {
+            host: "s3.example.com",
+            bucket: "b",
+          },
+        });
+        const { app, colId } = appWithColumn(column);
+        await s3Request(app, colId).expect(200);
+        expect(s3Mock.S3Client.mock.calls[0][0]).not.toHaveProperty(
+          "credentials",
+        );
+      });
+
+      it("lets the SDK resolve credentials when accessKeyId is an empty string", async () => {
+        const s3Mock = jest.requireMock("@aws-sdk/client-s3");
+        const column = fileColumn({
+          s3Config: {
+            host: "s3.example.com",
+            accessKeyId: "",
+            secretAccessKey: "",
+            bucket: "b",
+          },
+        });
+        const { app, colId } = appWithColumn(column);
+        await s3Request(app, colId).expect(200);
+        expect(s3Mock.S3Client.mock.calls[0][0]).not.toHaveProperty(
+          "credentials",
+        );
+      });
+
+      it("lets the SDK resolve credentials in the signed-URL flow when no accessKeyId is configured", async () => {
+        const presignerMock = jest.requireMock("@aws-sdk/s3-request-presigner");
+        const s3Mock = jest.requireMock("@aws-sdk/client-s3");
+        const column = fileColumn({
+          s3Config: {
+            host: "s3.example.com",
+            bucket: "b",
+            signedUrlNeeded: true,
+            region: "eu-west-3",
+          },
+        });
+        const { app, colId } = appWithColumn(column);
+        await s3Request(app, colId).expect(200);
+        expect(s3Mock.S3Client.mock.calls[0][0]).not.toHaveProperty(
+          "credentials",
+        );
+        expect(presignerMock.getSignedUrl).toHaveBeenCalledWith(
+          s3Mock.S3Client.mock.results[0].value,
+          expect.anything(),
+          { expiresIn: 150 },
+        );
+      });
+
       it("prefixes https:// to hosts missing a scheme", async () => {
         const s3Mock = jest.requireMock("@aws-sdk/client-s3");
         const column = fileColumn({