Merge pull request #284 from BTLzdravtech/dev

feat: Basic support for Keycloak (OIDC) + fix s3 integration + custom s3 (minio) support

lib/api/controllers/users/userId/deleteUserById.ts

@@ -22,7 +22,7 @@ export default async function deleteUserById(
   }
 
   // Then, we check if the provided password matches the one stored in the database
-  const isPasswordValid = bcrypt.compareSync(body.password, user.password);
+  const isPasswordValid = bcrypt.compareSync(body.password, user.password || "");
 
   if (!isPasswordValid) {
     return {

lib/api/storage/createFile.ts

@@ -14,7 +14,7 @@ export default async function createFile({
 }) {
   if (s3Client) {
     const bucketParams: PutObjectCommandInput = {
-      Bucket: process.env.BUCKET_NAME,
+      Bucket: process.env.SPACES_BUCKET_NAME,
       Key: filePath,
       Body: isBase64 ? Buffer.from(data as string, "base64") : data,
     };

lib/api/storage/moveFile.ts

@@ -5,7 +5,7 @@ import removeFile from "./removeFile";
 
 export default async function moveFile(from: string, to: string) {
   if (s3Client) {
-    const Bucket = process.env.BUCKET_NAME;
+    const Bucket = process.env.SPACES_BUCKET_NAME;
 
     const copyParams = {
       Bucket: Bucket,

lib/api/storage/readFile.ts

@@ -20,7 +20,7 @@ export default async function readFile(filePath: string) {
 
   if (s3Client) {
     const bucketParams: GetObjectCommandInput = {
-      Bucket: process.env.BUCKET_NAME,
+      Bucket: process.env.SPACES_BUCKET_NAME,
       Key: filePath,
     };
 

lib/api/storage/removeFile.ts

@@ -6,7 +6,7 @@ import { PutObjectCommandInput, DeleteObjectCommand } from "@aws-sdk/client-s3";
 export default async function removeFile({ filePath }: { filePath: string }) {
   if (s3Client) {
     const bucketParams: PutObjectCommandInput = {
-      Bucket: process.env.BUCKET_NAME,
+      Bucket: process.env.SPACES_BUCKET_NAME,
       Key: filePath,
     };
 

lib/api/storage/removeFolder.ts

@@ -40,7 +40,7 @@ async function emptyS3Directory(bucket: string, dir: string) {
 export default async function removeFolder({ filePath }: { filePath: string }) {
   if (s3Client) {
     try {
-      await emptyS3Directory(process.env.BUCKET_NAME as string, filePath);
+      await emptyS3Directory(process.env.SPACES_BUCKET_NAME as string, filePath);
     } catch (err) {
       console.log("Error", err);
     }

lib/api/storage/s3Client.ts

@@ -6,7 +6,7 @@ const s3Client: S3 | undefined =
   process.env.SPACES_KEY &&
   process.env.SPACES_SECRET
     ? new S3({
-        forcePathStyle: false,
+        forcePathStyle: !!process.env.SPACES_FORCE_PATH_STYLE,
         endpoint: process.env.SPACES_ENDPOINT,
         region: process.env.SPACES_REGION,
         credentials: {