tsc

Author: Brendonovich

apps/web/app/api/desktop/[...route]/s3Config.ts

@@ -3,6 +3,7 @@ import { db } from "@cap/database";
 import { decrypt, encrypt } from "@cap/database/crypto";
 import { nanoId } from "@cap/database/helpers";
 import { s3Buckets } from "@cap/database/schema";
+import { S3Bucket } from "@cap/web-domain";
 import { zValidator } from "@hono/zod-validator";
 import { eq } from "drizzle-orm";
 import { Hono } from "hono";
@@ -31,7 +32,7 @@ app.post(
 		try {
 			// Encrypt the sensitive data
 			const encryptedConfig = {
-				id: nanoId(),
+				id: S3Bucket.S3BucketId.make(nanoId()),
 				provider: data.provider,
 				accessKeyId: await encrypt(data.accessKeyId),
 				secretAccessKey: await encrypt(data.secretAccessKey),

apps/web/app/api/upload/[...route]/multipart.ts

@@ -251,7 +251,7 @@ app.post(
 						"Sending to S3:",
 						JSON.stringify(
 							{
-								Bucket: bucket.name,
+								Bucket: bucket.bucketName,
 								Key: fileKey,
 								UploadId: uploadId,
 								Parts: formattedParts,

apps/web/app/embed/[videoId]/page.tsx

@@ -134,6 +134,8 @@ export default async function EmbedVideoPage(props: Props) {
 					public: videos.public,
 					videoStartTime: videos.videoStartTime,
 					audioStartTime: videos.audioStartTime,
+					awsRegion: videos.awsRegion,
+					awsBucket: videos.awsBucket,
 					xStreamInfo: videos.xStreamInfo,
 					jobId: videos.jobId,
 					jobStatus: videos.jobStatus,

apps/web/app/s/[videoId]/page.tsx

@@ -274,6 +274,8 @@ export default async function ShareVideoPage(props: Props) {
 					public: videos.public,
 					videoStartTime: videos.videoStartTime,
 					audioStartTime: videos.audioStartTime,
+					awsRegion: videos.awsRegion,
+					awsBucket: videos.awsBucket,
 					xStreamInfo: videos.xStreamInfo,
 					jobId: videos.jobId,
 					jobStatus: videos.jobStatus,