Merge pull request #106 from bsospace/develop

Develop

Author: boytur

app/api/posts/create/route.ts

@@ -4,20 +4,16 @@ import prisma from "@/prisma/client";
 import { verifyToken } from "@/app/utils/auth";
 import { v4 as uuidv4 } from "uuid";
 import { S3Client, PutObjectCommand } from "@aws-sdk/client-s3";
+import envConfig from "@/app/configs/envConfig";
 
-// Cloudflare R2 settings
-const R2_BUCKET_NAME = process.env.DESTINATION_BUCKET_NAME;
-const R2_ACCESS_KEY = process.env.DESTINATION_ACCESS_KEY;
-const R2_SECRET_KEY = process.env.DESTINATION_SECRET_KEY;
-const R2_ACCOUNT_ID = process.env.DESTINATION_ACCOUNT_ID;
-const R2_ENDPOINT = `https://${R2_ACCOUNT_ID}.r2.cloudflarestorage.com`;
+const R2_ENDPOINT = `https://${envConfig.cloudflareR2AccessId}.r2.cloudflarestorage.com`;
 
 const s3Client = new S3Client({
   region: "auto",
   endpoint: R2_ENDPOINT,
   credentials: {
-    accessKeyId: R2_ACCESS_KEY!,
-    secretAccessKey: R2_SECRET_KEY!,
+    accessKeyId: envConfig.cloudflareR2AccessKey,
+    secretAccessKey: envConfig.cloudflareR2SecretKey,
   },
 });
 
@@ -49,16 +45,16 @@ async function uploadImagesFromContent(content: string): Promise<string> {
       // Upload image to Cloudflare R2
       const uploadPromise = s3Client.send(
         new PutObjectCommand({
-          Bucket: R2_BUCKET_NAME,
+          Bucket: envConfig.cloudflareR2BucketName,
           Key: newFileName,
           Body: imageBuffer,
           ContentType: contentType, // Set file type based on base64
         })
       );
 
       // Create new URL from Cloudflare R2
-      const newImageUrl = `https://assets.bsospace.com/${newFileName}`;
-      content = content.replace(imgSrc, newImageUrl); // Replace original URL with new URL
+      const newImageUrl = `${envConfig.cloudflareR2Domain}/${newFileName}`;
+      content = content.replace(imgSrc, newImageUrl);
 
       uploads.push(uploadPromise);
     }

app/configs/envConfig.ts

@@ -0,0 +1,90 @@
+
+interface IEvnConfig {
+    [key: string]: string | number | undefined;
+    nodeEnv: string;
+    port: number;
+    developmentUrl?: string;
+    jwtSecret: string;
+    databaseUrl: string;
+    databasePort: number;
+    databaseName: string;
+    databaseUser: string;
+    databasePassword: string;
+    googleClientId?: string;
+    googleClientSecret?: string;
+    gitHubClientId?: string;
+    gitHubClientSecret?: string;
+    discordClientId?: string;
+    discordClientSecret?: string;
+    cloudflareR2BucketName: string;
+    cloudflareR2AccessKey: string;
+    cloudflareR2SecretKey: string;
+    cloudflareR2AccessId: string;
+    cloudflareR2Domain: string;
+    destinationBucketName?: string;
+    destinationAccountId?: string;
+    destinationAccessKey?: string;
+    destinationSecretKey?: string;
+}
+
+const envConfig: IEvnConfig = {
+    nodeEnv: process.env.NODE_ENV || 'development',
+    port: parseInt(process.env.APP_PORT || '3000', 10),
+    developmentUrl: process.env.DEVELOPMENT_URL || '',
+    jwtSecret: process.env.JWT_SECRET || '',
+    databaseUrl: process.env.DATABASE_URL || '',
+    databasePort: parseInt(process.env.DATABASE_PORT || '5432', 10),
+    databaseName: process.env.DATABASE_NAME || '',
+    databaseUser: process.env.PG_USER || '',
+    databasePassword: process.env.PG_PASSWORD || '',
+    googleClientId: process.env.GOOGLE_CLIENT_ID || '',
+    googleClientSecret: process.env.GOOGLE_CLIENT_SECRET || '',
+    gitHubClientId: process.env.GITHUB_CLIENT_ID || '',
+    gitHubClientSecret: process.env.GITHUB_CLIENT_SECRET || '',
+    discordClientId: process.env.DISCORD_CLIENT_ID || '',
+    discordClientSecret: process.env.DISCORD_CLIENT_SECRET || '',
+    cloudflareR2BucketName: process.env.R2_BUCKET_NAME || '',
+    cloudflareR2AccessKey: process.env.R2_ACCESS_KEY || '',
+    cloudflareR2SecretKey: process.env.R2_SECRET_KEY || '',
+    cloudflareR2AccessId: process.env.R2_ACCOUNT_ID || '',
+    cloudflareR2Domain: process.env.R2_DOMAIN || '',
+    destinationBucketName: process.env.DESTINATION_BUCKET_NAME || '',
+    destinationAccountId: process.env.DESTINATION_ACCOUNT_ID || '',
+    destinationAccessKey: process.env.DESTINATION_ACCESS_KEY || '',
+    destinationSecretKey: process.env.DESTINATION_SECRET_KEY || ''
+};
+
+console.table(envConfig);
+
+export const checkEnvConfig = () => {
+    // Define only the required fields
+    const requiredFields: string[] = [
+        'nodeEnv',
+        'port',
+        'jwtSecret',
+        'databaseUrl',
+        'databaseName',
+        'databaseUser',
+        'databasePassword'
+    ];
+
+    for (const field of requiredFields) {
+        if (!envConfig[field] || envConfig[field] === '') {
+            throw new Error(`Missing required environment variable: ${field.toUpperCase()}`);
+        }
+    }
+};
+
+try {
+    checkEnvConfig();
+    console.log('All required environment variables are correctly set.');
+} catch (error) {
+    if (error instanceof Error) {
+        console.error(error.message);
+    } else {
+        console.error('An unknown error occurred.');
+    }
+    process.exit(1); // Exit if missing required environment variable
+}
+
+export default envConfig;