From 2e238b2676943988f4f7d0ce8033a3adea1c8b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=20Gramn=C3=A6s=20Tjernshaugen?=
 <jotjernshaugen@gmail.com>
Date: Mon, 19 Feb 2024 22:50:19 +0100
Subject: [PATCH] Ignore this LMAO

---
 .github/workflows/deploy.yml          |  2 --
 src/utils/downloadFileFromS3Bucket.ts | 10 +++++-----
 src/utils/getPresignedS3URL.ts        | 12 ++++++------
 src/utils/uploadFileToS3Bucket.ts     | 12 ++++++------
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index fc7f66a..45b96db 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -44,8 +44,6 @@ jobs:
           NEXT_PUBLIC_AUTH_CLIENT_ID: ${{ secrets.NEXT_PUBLIC_AUTH_CLIENT_ID }}
           NEXT_PUBLIC_OW4_ADDRESS: ${{ secrets.NEXT_PUBLIC_OW4_ADDRESS }}
           NEXT_PUBLIC_SENTRY_DSN: ${{ secrets.NEXT_PUBLIC_SENTRY_DSN }}
-          NEXT_AWS_REGION: ${{ secrets.NEXT_AWS_REGION }}
-          NEXT_AWS_S3_BUCKET_NAME: ${{ secrets.NEXT_AWS_S3_BUCKET_NAME }}
       - name: Trigger deploy.sh remotely
         uses: appleboy/ssh-action@master
         with:
diff --git a/src/utils/downloadFileFromS3Bucket.ts b/src/utils/downloadFileFromS3Bucket.ts
index b7937f9..7803ea1 100644
--- a/src/utils/downloadFileFromS3Bucket.ts
+++ b/src/utils/downloadFileFromS3Bucket.ts
@@ -1,14 +1,14 @@
 import AWS from "aws-sdk";
 
-const credentials = (process.env.NEXT_AWS_ACCESS_KEY_ID && process.env.NEXT_AWS_SECRET_ACCESS_KEY) ?
+const credentials = (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) ?
   {
-    accessKeyId: process.env.NEXT_AWS_ACCESS_KEY_ID,
-    secretAccessKey: process.env.NEXT_AWS_SECRET_ACCESS_KEY,
+    accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+    secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
   } :
   undefined;
 
 AWS.config.update({
-  region: process.env.NEXT_AWS_REGION,
+  region: process.env.AWS_REGION,
   credentials,
 })
 
@@ -18,7 +18,7 @@ export async function downloadFileFromS3Bucket(key: string): Promise<File> {
   });
 
   const params = {
-    Bucket: process.env.NEXT_AWS_S3_BUCKET_NAME as string,
+    Bucket: process.env.AWS_S3_BUCKET_NAME as string,
     Key: key,
   };
 
diff --git a/src/utils/getPresignedS3URL.ts b/src/utils/getPresignedS3URL.ts
index e547b6f..719e16a 100644
--- a/src/utils/getPresignedS3URL.ts
+++ b/src/utils/getPresignedS3URL.ts
@@ -1,25 +1,25 @@
 import AWS from "aws-sdk";
 
-const credentials = (process.env.NEXT_AWS_ACCESS_KEY_ID && process.env.NEXT_AWS_SECRET_ACCESS_KEY) ?
+const credentials = (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) ?
   {
-    accessKeyId: process.env.NEXT_AWS_ACCESS_KEY_ID,
-    secretAccessKey: process.env.NEXT_AWS_SECRET_ACCESS_KEY,
+    accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+    secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
   } :
   undefined;
 
 AWS.config.update({
-  region: process.env.NEXT_AWS_REGION,
+  region: process.env.AWS_REGION,
   credentials,
 })
 
 export const getPresignedS3URL = async (name: string, contentType: string) => {
   const s3 = new AWS.S3({
     apiVersion: '2006-03-01',
-    params: { Bucket: process.env.NEXT_AWS_S3_BUCKET_NAME },
+    params: { Bucket: process.env.AWS_S3_BUCKET_NAME },
   })
 
   const params = {
-    Bucket: process.env.NEXT_AWS_S3_BUCKET_NAME,
+    Bucket: process.env.AWS_S3_BUCKET_NAME,
     Key: `uploads/${+new Date()}-${name}`,
     ContentType: contentType,
   }
diff --git a/src/utils/uploadFileToS3Bucket.ts b/src/utils/uploadFileToS3Bucket.ts
index f0b9b71..07f664c 100644
--- a/src/utils/uploadFileToS3Bucket.ts
+++ b/src/utils/uploadFileToS3Bucket.ts
@@ -1,14 +1,14 @@
 import AWS from "aws-sdk";
 
-const credentials = (process.env.NEXT_AWS_ACCESS_KEY_ID && process.env.NEXT_AWS_SECRET_ACCESS_KEY) ?
+const credentials = (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) ?
   {
-    accessKeyId: process.env.NEXT_AWS_ACCESS_KEY_ID,
-    secretAccessKey: process.env.NEXT_AWS_SECRET_ACCESS_KEY,
+    accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+    secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
   } :
   undefined;
 
 AWS.config.update({
-  region: process.env.NEXT_AWS_REGION,
+  region: process.env.AWS_REGION,
   credentials,
 })
 
@@ -16,11 +16,11 @@ AWS.config.update({
 export async function uploadFileToS3Bucket(file: Uint8Array, key: string): Promise<string> {
   const s3 = new AWS.S3({
     apiVersion: '2006-03-01',
-    params: { Bucket: process.env.NEXT_AWS_S3_BUCKET_NAME as string },
+    params: { Bucket: process.env.AWS_S3_BUCKET_NAME as string },
   });
 
   const params = {
-    Bucket: process.env.NEXT_AWS_S3_BUCKET_NAME as string,
+    Bucket: process.env.AWS_S3_BUCKET_NAME as string,
     Key: key,
     Body: file,
     ACL: 'public-read',