Merge pull request #112 from bsospace/feature/version

♻️ refactor[posts]: update Cloudflare R2 integration

Author: boytur

Jenkinsfile

@@ -31,7 +31,7 @@ pipeline {
                         default:
                             env.ENVIRONMENT = 'other'
                             env.DOCKER_COMPOSE_FILE = ''
-                            echo "Branch ${branchName} is not supported. Skipping deployment."
+                            env.ENV_FILE_CREDENTIAL = 'blog-dev-env-file'
                     }
 
                     echo "Environment: ${env.ENVIRONMENT}"
@@ -41,9 +41,6 @@ pipeline {
         }
 
         stage('Setup .env') {
-            when {
-                expression { env.ENVIRONMENT != 'other' }
-            }
             steps {
                 script {
                     withCredentials([file(credentialsId: env.ENV_FILE_CREDENTIAL, variable: 'SECRET_ENV_FILE')]) {

app/api/posts/edit/[id]/route.ts

@@ -3,20 +3,17 @@ import prisma from "@/prisma/client";
 import { slugify } from "@/app/utils/slugify";
 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.R2_BUCKET_NAME;
-const R2_ACCESS_KEY = process.env.R2_ACCESS_KEY;
-const R2_SECRET_KEY = process.env.R2_SECRET_KEY;
-const R2_ACCOUNT_ID = process.env.R2_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,
   },
 });
 
@@ -32,16 +29,6 @@ async function uploadImagesFromContent(content: string): Promise<string> {
 
     // If it's not an external URL (e.g., https://), consider it a blob
     const isExternalUrl = imgSrc.startsWith("https://");
-    const oldBucketUrl = imgSrc.startsWith("https://bso-image.posyayee.shop/");
-
-    if (oldBucketUrl) {
-      const newImageUrl = imgSrc.replace(
-        "https://bso-image.posyayee.shop/",
-        `https://assets.bsospace.com/`
-      );
-
-      content = content.replace(imgSrc, newImageUrl);
-    }
 
     if (!isExternalUrl) {
       // Separate the image type and base64 data
@@ -59,15 +46,15 @@ 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,
         })
       );
 
       // Create new URL from Cloudflare R2
-      const newImageUrl = `https://bso-image.posyayee.shop/${newFileName}`;
+      const newImageUrl = `${envConfig.cloudflareR2Domain}/${newFileName}`;
       content = content.replace(imgSrc, newImageUrl);
 
       uploads.push(uploadPromise);