introduce S3_PUBLIC_GATEWAY

This will fix the problem of differing domains in docker-compose locally
but it also sets the ground for a later use of a image resize service.

Author: roschaefer

backend/src/config/index.ts

@@ -102,12 +102,14 @@ const s3 = {
   AWS_ENDPOINT: env.AWS_ENDPOINT,
   AWS_REGION: env.AWS_REGION,
   AWS_BUCKET: env.AWS_BUCKET,
+  S3_PUBLIC_GATEWAY: env.S3_PUBLIC_GATEWAY,
   S3_CONFIGURED:
     env.AWS_ACCESS_KEY_ID &&
     env.AWS_SECRET_ACCESS_KEY &&
     env.AWS_ENDPOINT &&
     env.AWS_REGION &&
-    env.AWS_BUCKET,
+    env.AWS_BUCKET &&
+    env.S3_PUBLIC_GATEWAY,
 }
 
 const options = {

backend/src/graphql/resolvers/images/images.ts

@@ -31,12 +31,15 @@ export interface ImageInput {
 }
 
 export interface Images {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   deleteImage: (resource, relationshipType, opts: DeleteImageOpts) => Promise<any>
+
   mergeImage: (
     resource,
     relationshipType,
     imageInput: ImageInput | null | undefined,
     opts: MergeImageOpts,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ) => Promise<any>
 }
 

backend/src/graphql/resolvers/images/imagesS3.ts

@@ -30,14 +30,21 @@ import type { FileUpload } from 'graphql-upload'
 export const images = (
   config: Pick<
     typeof CONFIG,
-    'AWS_ACCESS_KEY_ID' | 'AWS_SECRET_ACCESS_KEY' | 'AWS_ENDPOINT' | 'AWS_REGION' | 'AWS_BUCKET'
+    | 'AWS_ACCESS_KEY_ID'
+    | 'AWS_SECRET_ACCESS_KEY'
+    | 'AWS_ENDPOINT'
+    | 'AWS_REGION'
+    | 'AWS_BUCKET'
+    | 'S3_PUBLIC_GATEWAY'
   >,
 ) => {
   // const widths = [34, 160, 320, 640, 1024]
-  const { AWS_BUCKET: Bucket } = config
+  const { AWS_BUCKET: Bucket, S3_PUBLIC_GATEWAY } = config
 
   const { AWS_ENDPOINT, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY } = config
-  if (!(AWS_ENDPOINT && AWS_ACCESS_KEY_ID && AWS_SECRET_ACCESS_KEY)) {
+  if (
+    !(AWS_ENDPOINT && AWS_ACCESS_KEY_ID && AWS_SECRET_ACCESS_KEY && Bucket && S3_PUBLIC_GATEWAY)
+  ) {
     throw new Error('Missing AWS credentials.')
   }
   const s3 = new S3Client({
@@ -174,7 +181,9 @@ export const images = (
     if (!Location) {
       throw new Error('File upload did not return `Location`')
     }
-    return Location
+    const publicLocation = new URL(S3_PUBLIC_GATEWAY)
+    publicLocation.pathname = new URL(Location).pathname
+    return publicLocation.href
   }
 
   const s3Delete: FileDeleteCallback = async (url) => {

docker-compose.override.yml

@@ -33,6 +33,7 @@ services:
       - SMTP_PORT=1025
       - SMTP_HOST=mailserver
       - AWS_ENDPOINT=http://minio:9000
+      - S3_PUBLIC_GATEWAY=http://localhost:9000
     volumes:
       - ./backend:/app