groombook-engineer[bot]
77971a1ac9
* fix(GRO-766): prevent horizontal overflow on portal mobile pages - Add overflow-x-hidden to main content area in CustomerPortal - Add w-full overflow-hidden to content wrapper div - Add flex-wrap to BillingPayments tab button row Co-Authored-By: Paperclip <noreply@paperclip.ing> * fix(GRO-769): proxy logo uploads through API server to fix mixed content The pre-signed URL flow used an internal HTTP endpoint for S3 uploads, which browsers blocked as mixed content on HTTPS pages. Instead of generating a pre-signed URL that the browser uploads to directly, the new /logo/upload endpoint receives the file via multipart POST and streams it to S3 from the API server using the internal endpoint. This resolves the mixed content error that was blocking logo uploads on dev.groombook.dev. Co-Authored-By: Paperclip <noreply@paperclip.ing> --------- Co-authored-by: Test User <test@example.com> Co-authored-by: Paperclip <noreply@paperclip.ing>
89 lines
2.2 KiB
TypeScript
89 lines
2.2 KiB
TypeScript
import {
|
|
S3Client,
|
|
PutObjectCommand,
|
|
DeleteObjectCommand,
|
|
GetObjectCommand,
|
|
} from "@aws-sdk/client-s3";
|
|
import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
|
|
|
|
let s3Instance: S3Client | null = null;
|
|
|
|
function getS3Client(): S3Client {
|
|
if (!s3Instance) {
|
|
s3Instance = new S3Client({
|
|
endpoint: process.env.S3_ENDPOINT,
|
|
region: process.env.S3_REGION ?? "us-east-1",
|
|
credentials: {
|
|
accessKeyId: process.env.S3_ACCESS_KEY_ID ?? "",
|
|
secretAccessKey: process.env.S3_SECRET_ACCESS_KEY ?? "",
|
|
},
|
|
forcePathStyle: true, // required for Ceph RGW
|
|
});
|
|
}
|
|
return s3Instance;
|
|
}
|
|
|
|
function getBucket(): string {
|
|
return process.env.S3_BUCKET ?? "groombook-pet-photos";
|
|
}
|
|
|
|
/** Generate a presigned PUT URL for uploading a pet photo. Expires in 15 min. */
|
|
export async function getPresignedUploadUrl(
|
|
key: string,
|
|
contentType: string,
|
|
sizeBytes: number,
|
|
expiresIn = 900
|
|
): Promise<string> {
|
|
const client = getS3Client();
|
|
const command = new PutObjectCommand({
|
|
Bucket: getBucket(),
|
|
Key: key,
|
|
ContentType: contentType,
|
|
ContentLength: sizeBytes,
|
|
});
|
|
return getSignedUrl(client, command, { expiresIn });
|
|
}
|
|
|
|
/** Generate a presigned GET URL for viewing a pet photo. Expires in 1 hour. */
|
|
export async function getPresignedGetUrl(
|
|
key: string,
|
|
expiresIn = 3600
|
|
): Promise<string> {
|
|
const client = getS3Client();
|
|
const command = new GetObjectCommand({
|
|
Bucket: getBucket(),
|
|
Key: key,
|
|
});
|
|
return getSignedUrl(client, command, { expiresIn });
|
|
}
|
|
|
|
/** Delete a pet photo object from storage. */
|
|
export async function deleteObject(key: string): Promise<void> {
|
|
const client = getS3Client();
|
|
await client.send(
|
|
new DeleteObjectCommand({
|
|
Bucket: getBucket(),
|
|
Key: key,
|
|
})
|
|
);
|
|
}
|
|
|
|
/** Upload an object directly to S3 (server-side only, not a pre-signed URL). */
|
|
export async function putObject(
|
|
key: string,
|
|
body: Buffer | Uint8Array | string,
|
|
contentType: string,
|
|
contentLength: number
|
|
): Promise<void> {
|
|
const client = getS3Client();
|
|
await client.send(
|
|
new PutObjectCommand({
|
|
Bucket: getBucket(),
|
|
Key: key,
|
|
Body: body,
|
|
ContentType: contentType,
|
|
ContentLength: contentLength,
|
|
})
|
|
);
|
|
}
|