Merge pull request #53 from druling/cors_fix

fixing cors error

Author: ayushsinghal90

.env.example

@@ -1,5 +1,6 @@
 PORT=3000
-DEV=True
+ENV=dev
+DEBUG=True
 ALLOWED_HOSTS=localhost,127.0.0.1,
 
 # Google OAuth Credentials

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build, Push, and Deploy
 on:
   push:
     branches:
-      - adding_actions
+      - cors_fix
 
 jobs:
   build-and-push:

build/docker/Dockerfile

@@ -14,6 +14,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # Set the working directory in the container
 WORKDIR /app
 
+# Ensure required directories exist
+RUN mkdir -p /app/static /app/media
+
 # Copy the requirements file to the container
 COPY ../../requirements.txt /app/
 

commons/clients/boto_client.py

@@ -3,7 +3,7 @@
 from django.conf import settings
 
 
-def boto_client(service=None):
+def boto_client(service=None, config=None):
     if service is None:
         raise ValueError("Service name is required")
 
@@ -15,4 +15,6 @@ def boto_client(service=None):
         )
     else:
         # Production AWS configuration
-        return boto3.client(service, region_name=settings.AWS_DEFAULT_REGION)
+        return boto3.client(
+            service, region_name=settings.AWS_DEFAULT_REGION, config=config
+        )

commons/enums/BaseResourceEnum.py

@@ -0,0 +1,19 @@
+from enum import Enum
+from django.conf import settings
+
+
+env = settings.ENV
+
+
+class BaseResourceEnum(Enum):
+    def __str__(self):
+        return f"{env}-{self.value}"
+
+    @property
+    def value(self) -> str:
+        return f"{env}-{super().value}"
+
+    @classmethod
+    def choices(cls):
+        """Generate choices for use in Django models."""
+        return [(item.value, item.name) for item in cls]

file_upload/enum/Buckets.py

@@ -1,7 +1,7 @@
-from commons.enums.BaseEnum import BaseEnum
+from commons.enums.BaseResourceEnum import BaseResourceEnum
 
 
-class BucketType(BaseEnum):
+class BucketType(BaseResourceEnum):
     MENU = "druling-menus"
     RESTAURANT = "druling-restaurants"
     DRULING = "druling"

file_upload/services/s3/s3.py

@@ -1,4 +1,5 @@
 import logging
+from botocore.client import Config
 
 from commons.clients.boto_client import boto_client
 from setup import settings
@@ -13,7 +14,7 @@ def get_client():
         Get an S3 client for AWS or LocalStack.
         :return: Configured S3 client.
         """
-        return boto_client("s3")
+        return boto_client("s3", config=Config(signature_version="s3v4"))
 
     @staticmethod
     def get_endpoint(bucket):

setup/settings.py

@@ -24,7 +24,8 @@
 SECRET_KEY = os.getenv(
     "SECRET_KEY", "django-insecure-@1z*@ng_0yz=i62%mhd#ey+%qib3mwi!ut9ecikxi&t(t=resw"
 )
-DEBUG = os.getenv("DEV", "False") == "True"
+ENV = os.getenv("ENV", "dev")
+DEBUG = os.getenv("DEBUG", "False") == "True"
 ALLOWED_HOSTS = os.getenv("ALLOWED_HOSTS", "*").split(
     ","
 )  # Comma-separated values in .env
@@ -218,8 +219,8 @@
     CORS_ALLOW_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"]
 else:
     CORS_ALLOW_ALL_ORIGINS = False
-    CORS_ALLOWED_ORIGIN = [
-        "https://dev.druling.com/",
+    CORS_ALLOWED_ORIGIN_REGEXES = [
+        r"^https://.*\.druling\.com$",
     ]
 
 LOCALSTACK_PORT = os.getenv("LOCALSTACK_PORT", "4566")

user/services/email_verify.py

@@ -28,7 +28,7 @@ def send_code(self, data):
             "company_name": "Druling",
             "verification_code": code,
             "user_email": email,
-            "support_email": "support@yourcompany.com",
+            "support_email": "support@druling.com",
             "expiry_time": "10",
             "current_year": datetime.now().year,
         }