BitwisePushkar · BitwisePushkar · Oct 26, 2025 · Oct 15, 2025 · Oct 16, 2025 · Oct 18, 2025
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -8,7 +8,8 @@ on:
       - authentication
       - pushkar
       - Arnav
-      - feature/*    # future feature branches
+      - chat
+      - feature/*
 
 jobs:
   ci-cd:
@@ -39,7 +40,8 @@ jobs:
           github.ref == 'refs/heads/development' || 
           github.ref == 'refs/heads/authentication' || 
           github.ref == 'refs/heads/pushkar' || 
-          github.ref == 'refs/heads/Arnav'
+          github.ref == 'refs/heads/Arnav' || 
+          github.ref == 'refs/heads/chat'
         uses: appleboy/ssh-action@v1.0.0
         with:
           host: ${{ secrets.EC2_HOST }}
@@ -49,7 +51,7 @@ jobs:
             # Navigate to Django project folder
             cd /home/ubuntu/tripsync-backend/auth
 
-            # Pull latest code from the branch
+            # Pull latest code
             git pull origin $GITHUB_REF_NAME
 
             # Activate virtual environment
@@ -58,10 +60,14 @@ jobs:
             # Install requirements
             pip install -r ../requirements.txt
 
-            # Run migrations and collect static files
+            # Apply migrations and collect static files
             python manage.py migrate
             python manage.py collectstatic --noinput
 
-            # Restart Gunicorn and Nginx
+            # Restart Redis (if managed manually)
+            sudo systemctl restart redis-server
+
+            # Restart Daphne and Nginx
+            sudo systemctl restart daphne
             sudo systemctl restart gunicorn
             sudo systemctl restart nginx
diff --git a/auth/.dockerignore b/auth/.dockerignore
diff --git a/auth/Dockerfile b/auth/Dockerfile
diff --git a/auth/account/migrations/__pycache__/0001_initial.cpython-310.pyc b/auth/account/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/auth/account/utils.py b/auth/account/utils.py
@@ -1,162 +1,65 @@
-from sendgrid import SendGridAPIClient
-from sendgrid.helpers.mail import Mail, Email, To, Content
 from django.conf import settings
 import logging
 
 logger = logging.getLogger(__name__)
 
 def send_otp_email(email, otp, purpose="verification"):
+    """
+    Send OTP email using SendGrid HTTP API (works on Render Free tier)
+    """
     try:
-        sendgrid_api_key = getattr(settings, 'SENDGRID_API_KEY', None)
-        if not sendgrid_api_key:
-            logger.error("SENDGRID_API_KEY not configured in settings")
-            return False
-
-        from_email = getattr(settings, 'DEFAULT_FROM_EMAIL', 'noreply@tripsync.com')
+        from sendgrid import SendGridAPIClient
+        from sendgrid.helpers.mail import Mail
 
         if purpose == "verification":
             subject = "Email Verification OTP - TripSync"
             html_content = f"""
-            <!DOCTYPE html>
             <html>
-            <head>
-                <style>
-                    body {{ font-family: Arial, sans-serif; line-height: 1.6; color: #333; }}
-                    .container {{ max-width: 600px; margin: 0 auto; padding: 20px; }}
-                    .header {{ background-color: #4F46E5; color: white; padding: 20px; text-align: center; border-radius: 5px 5px 0 0; }}
-                    .content {{ background-color: #f9fafb; padding: 30px; border: 1px solid #e5e7eb; }}
-                    .otp-box {{ background-color: #fff; border: 2px dashed #4F46E5; padding: 20px; text-align: center; margin: 20px 0; border-radius: 5px; }}
-                    .otp-code {{ font-size: 32px; font-weight: bold; color: #4F46E5; letter-spacing: 5px; }}
-                    .footer {{ background-color: #f3f4f6; padding: 15px; text-align: center; font-size: 12px; color: #6b7280; border-radius: 0 0 5px 5px; }}
-                    .warning {{ color: #dc2626; font-weight: bold; }}
-                </style>
-            </head>
             <body>
-                <div class="container">
-                    <div class="header">
-                        <h1>Welcome to TripSync!</h1>
-                    </div>
-                    <div class="content">
-                        <h2>Email Verification</h2>
-                        <p>Hello,</p>
-                        <p>Thank you for registering with TripSync - Your Travel Planning Companion!</p>
-                        <p>To verify your email address, please use the following OTP code:</p>
-
-                        <div class="otp-box">
-                            <div class="otp-code">{otp}</div>
-                        </div>
-
-                        <p><strong>This OTP is valid for 10 minutes.</strong></p>
-                        <p class="warning">⚠️ Please do not share this OTP with anyone.</p>
-                        <p>If you did not request this verification, please ignore this email.</p>
-                    </div>
-                    <div class="footer">
-                        <p>© 2024 TripSync. All rights reserved.</p>
-                        <p>This is an automated email, please do not reply.</p>
-                    </div>
-                </div>
+                <h2>Welcome to TripSync!</h2>
+                <p>Your email verification OTP is:</p>
+                <h1 style="color: #4CAF50; font-size: 32px; letter-spacing: 5px;">{otp}</h1>
+                <p>This OTP is valid for 10 minutes.</p>
+                <p><small>If you didn't request this, please ignore this email.</small></p>
+                <br>
+                <p>Best regards,<br>TripSync Team</p>
             </body>
             </html>
             """
-            plain_content = f"""
-Hello,
-
-Welcome to TripSync - Your Travel Planning Companion!
-
-Your OTP for email verification is: {otp}
-
-This OTP is valid for 10 minutes. Please do not share this OTP with anyone.
-
-If you did not request this, please ignore this email.
-
-Best regards,
-TripSync Team
-            """
         else:
             subject = "Password Reset OTP - TripSync"
             html_content = f"""
-            <!DOCTYPE html>
             <html>
-            <head>
-                <style>
-                    body {{ font-family: Arial, sans-serif; line-height: 1.6; color: #333; }}
-                    .container {{ max-width: 600px; margin: 0 auto; padding: 20px; }}
-                    .header {{ background-color: #dc2626; color: white; padding: 20px; text-align: center; border-radius: 5px 5px 0 0; }}
-                    .content {{ background-color: #f9fafb; padding: 30px; border: 1px solid #e5e7eb; }}
-                    .otp-box {{ background-color: #fff; border: 2px dashed #dc2626; padding: 20px; text-align: center; margin: 20px 0; border-radius: 5px; }}
-                    .otp-code {{ font-size: 32px; font-weight: bold; color: #dc2626; letter-spacing: 5px; }}
-                    .footer {{ background-color: #f3f4f6; padding: 15px; text-align: center; font-size: 12px; color: #6b7280; border-radius: 0 0 5px 5px; }}
-                    .warning {{ color: #dc2626; font-weight: bold; }}
-                    .security-notice {{ background-color: #fef2f2; border-left: 4px solid #dc2626; padding: 10px; margin: 15px 0; }}
-                </style>
-            </head>
             <body>
-                <div class="container">
-                    <div class="header">
-                        <h1>Password Reset Request</h1>
-                    </div>
-                    <div class="content">
-                        <h2>Reset Your Password</h2>
-                        <p>Hello,</p>
-                        <p>You have requested to reset your password for your TripSync account.</p>
-                        <p>Your OTP for password reset is:</p>
-
-                        <div class="otp-box">
-                            <div class="otp-code">{otp}</div>
-                        </div>
-
-                        <p><strong>This OTP is valid for 10 minutes.</strong></p>
-
-                        <div class="security-notice">
-                            <p class="warning">🔒 Security Notice</p>
-                            <p>If you did not request this password reset, please secure your account immediately and contact our support team.</p>
-                        </div>
-
-                        <p class="warning">⚠️ Never share this OTP with anyone, including TripSync staff.</p>
-                    </div>
-                    <div class="footer">
-                        <p>© 2024 TripSync. All rights reserved.</p>
-                        <p>This is an automated email, please do not reply.</p>
-                    </div>
-                </div>
+                <h2>Password Reset Request</h2>
+                <p>Your password reset OTP is:</p>
+                <h1 style="color: #FF5722; font-size: 32px; letter-spacing: 5px;">{otp}</h1>
+                <p>This OTP is valid for 10 minutes.</p>
+                <p><small>If you didn't request this, please secure your account immediately.</small></p>
+                <br>
+                <p>Best regards,<br>TripSync Team</p>
             </body>
             </html>
             """
-            plain_content = f"""
-Hello,
-
-You have requested to reset your password for your TripSync account.
-
-Your OTP for password reset is: {otp}
-
-This OTP is valid for 10 minutes. Please do not share this OTP with anyone.
-
-If you did not request this, please secure your account immediately and contact support.
-
-Best regards,
-TripSync Team
-            """
 
         message = Mail(
-            from_email=Email(from_email),
-            to_emails=To(email),
+            from_email=settings.DEFAULT_FROM_EMAIL,
+            to_emails=email,
             subject=subject,
-            plain_text_content=Content("text/plain", plain_content),
-            html_content=Content("text/html", html_content)
+            html_content=html_content
         )
 
-        sg = SendGridAPIClient(sendgrid_api_key)
+        sg = SendGridAPIClient(settings.SENDGRID_API_KEY)
         response = sg.send(message)
 
         if response.status_code in [200, 201, 202]:
-            logger.info(f"OTP email sent successfully to {email} via SendGrid")
+            logger.info(f"✓ OTP email sent successfully to {email} via SendGrid API")
             return True
         else:
-            logger.error(f"SendGrid returned status code {response.status_code}")
+            logger.error(f"✗ SendGrid API returned status {response.status_code}")
             return False
 
     except Exception as e:
-        logger.error(f"Error sending email via SendGrid: {str(e)}")
-        import traceback
-        logger.error(traceback.format_exc())
+        logger.error(f"✗ SendGrid API error for {email}: {str(e)}")
+        logger.exception("Full traceback:")
         return False
diff --git a/auth/auth/asgi.py b/auth/auth/asgi.py
@@ -0,0 +1,23 @@
+"""
+ASGI config for chatsystemproj project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/
+"""
+import os
+from django.core.asgi import get_asgi_application
+from channels.routing import ProtocolTypeRouter, URLRouter
+from channels.auth import AuthMiddlewareStack
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'auth.settings')
+
+from chat.routing import websocket_urlpatterns
+
+application = ProtocolTypeRouter({
+    'http': get_asgi_application(),
+    'websocket':AuthMiddlewareStack(
+        URLRouter(websocket_urlpatterns)
+    ),
+})
diff --git a/auth/auth/settings.py b/auth/auth/settings.py
@@ -8,11 +8,12 @@
 
 SECRET_KEY = os.environ.get("SECRET_KEY", "unsafe-dev-secret-key")
 
-DEBUG = config('DEBUG', default=False, cast=bool)
+# DEBUG = config('DEBUG', default=False, cast=bool)
+DEBUG = True
 
-ALLOWED_HOSTS = os.environ.get("ALLOWED_HOSTS", "localhost,127.0.0.1,51.20.254.52").split(',')
-
-INSTALLED_APPS = ['django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', 'account.apps.AccountConfig', 'rest_framework', 'rest_framework_simplejwt', 'rest_framework_simplejwt.token_blacklist', 'corsheaders', 'drf_spectacular']
+# ALLOWED_HOSTS = os.environ.get("ALLOWED_HOSTS", "localhost,127.0.0.1,51.20.254.52").split(',')
+ALLOWED_HOSTS = ["*"]
+INSTALLED_APPS = ['channels','daphne','django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', 'account.apps.AccountConfig', 'rest_framework', 'rest_framework_simplejwt', 'rest_framework_simplejwt.token_blacklist', 'corsheaders', 'drf_spectacular','chat.apps.ChatConfig']
 
 MIDDLEWARE = ['django.middleware.security.SecurityMiddleware', 'whitenoise.middleware.WhiteNoiseMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware']
 
@@ -22,14 +23,31 @@
 
 WSGI_APPLICATION = 'auth.wsgi.application'
 
-database_url = os.environ.get("DATABASE_URL","postgresql://arnav_db_user:FupuhQQOsNLTkJKNEp2EA6Q8Kia7hvCu@dpg-d3mk6mvdiees73c95o2g-a.singapore-postgres.render.com/arnav_db")
-if database_url.startswith("postgres://"):
-    database_url = database_url.replace("postgres://", "postgresql://", 1)
-DATABASES = {'default': dj_database_url.parse(database_url, conn_max_age=600, ssl_require=True)}
+ASGI_APPLICATION = 'auth.asgi.application'
+
+REDIS_HOST = config('REDIS_HOST', default='127.0.0.1')
+REDIS_PORT = config('REDIS_PORT', default=6379, cast=int)
+
+CHANNEL_LAYERS = {
+    'default': {
+        'BACKEND': 'channels_redis.core.RedisChannelLayer',
+        'CONFIG': {
+            'hosts': [(REDIS_HOST, REDIS_PORT)],
+        },
+    },
+}
+
+database_url = os.environ.get("DATABASE_URL")
+if database_url:
+    if database_url.startswith("postgres://"):
+        database_url = database_url.replace("postgres://", "postgresql://", 1)
+    DATABASES = {'default': dj_database_url.parse(database_url, conn_max_age=600, ssl_require=True)}
+else:
+    DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3', 'NAME': BASE_DIR / 'db.sqlite3'}}
 
 REST_FRAMEWORK = {'DEFAULT_AUTHENTICATION_CLASSES': ('rest_framework_simplejwt.authentication.JWTAuthentication',), 'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema', 'DEFAULT_RENDERER_CLASSES': ['rest_framework.renderers.JSONRenderer', 'rest_framework.renderers.BrowsableAPIRenderer']}
 
-SPECTACULAR_SETTINGS = {'TITLE': 'TripSync API', 'DESCRIPTION': 'TripSync - API Documentation', 'VERSION': '1.0.0', 'SERVE_INCLUDE_SCHEMA': False, 'CONTACT': {'name': 'TripSync Support', 'email': 'support@tripsync.com'}, 'LICENSE': {'name': 'MIT License'}, 'TAGS': [{'name': 'Authentication', 'description': 'User registration, login and token management'}, {'name': 'Password Reset', 'description': 'Password reset functionality with OTP'}, {'name': 'User Management', 'description': 'User profile and management endpoints'}], 'SERVERS': [{'url': 'http://127.0.0.1:8000', 'description': 'Development server'}, {'url': 'https://tripsync-backend-ruak.onrender.com', 'description': 'Production server'}], 'COMPONENT_SPLIT_REQUEST': True, 'SWAGGER_UI_SETTINGS': {'deepLinking': True, 'persistAuthorization': True, 'displayOperationId': False, 'filter': True}}
+SPECTACULAR_SETTINGS = {'TITLE': 'TripSync API', 'DESCRIPTION': 'TripSync - API Documentation', 'VERSION': '1.0.0', 'SERVE_INCLUDE_SCHEMA': False, 'CONTACT': {'name': 'TripSync Support', 'email': 'support@tripsync.com'}, 'LICENSE': {'name': 'MIT License'}, 'TAGS': [{'name': 'Authentication', 'description': 'User registration, login and token management'}, {'name': 'Password Reset', 'description': 'Password reset functionality with OTP'}], 'SERVERS': [{'url': 'http://127.0.0.1:8000', 'description': 'Development server'}, {'url': 'https://tripsync-backend-ruak.onrender.com', 'description': 'Production server'}], 'COMPONENT_SPLIT_REQUEST': True, 'SWAGGER_UI_SETTINGS': {'deepLinking': True, 'persistAuthorization': True, 'displayOperationId': False, 'filter': True}}
 
 AUTH_PASSWORD_VALIDATORS = [{'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'}, {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', 'OPTIONS': {'min_length': 8}}, {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator'}, {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'}]
 
@@ -58,7 +76,7 @@
 
 CORS_ALLOW_METHODS = ['DELETE', 'GET', 'OPTIONS', 'PATCH', 'POST', 'PUT']
 
-CORS_ALLOW_HEADERS = ['accept', 'accept-encoding', 'authorization', 'content-type', 'dnt', 'origin', 'user-agent', 'x-csrftoken', 'x-requested-with']
+CORS_ALLOW_HEADERS = ['accept', 'accept-encoding', 'authorization', 'content-type', 'dnt', 'origin', 'user-agent', 'x-csrftoken', 'x-requested-with','sec-websocket-key','sec-websocket-version','sec-websocket-extensions' ]
 
 if not DEBUG:
     SECURE_SSL_REDIRECT = False
@@ -75,6 +93,12 @@
     CSRF_COOKIE_SECURE = False
     SESSION_COOKIE_SECURE = False
 
+CSRF_TRUSTED_ORIGINS = [
+    'http://127.0.0.1:8000',
+    'http://localhost:8000',
+    'http://51.20.254.52'
+]
+
 SENDGRID_API_KEY = config('SENDGRID_API_KEY', default='')
 DEFAULT_FROM_EMAIL = config('DEFAULT_FROM_EMAIL', default='TripSync <noreply@example.com>')
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'

diff --git a/auth/auth/urls.py b/auth/auth/urls.py
@@ -4,8 +4,6 @@
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from django.http import JsonResponse
-from django.conf import settings
-from django.conf.urls.static import static
 
 @api_view(['GET'])
 def root_redirect(request):
@@ -22,10 +20,8 @@ def health_check(request):
      path('health/', health_check, name='health-check'),
     path('admin/', admin.site.urls),
     path('api/account/', include('account.urls')),
+    path('api/chat/', include('chat.urls')),
     path('api/schema/', SpectacularAPIView.as_view(), name='schema'),
     path('api/docs/', SpectacularSwaggerView.as_view(url_name='schema'), name='swagger-ui'),
     path('api/redoc/', SpectacularRedocView.as_view(url_name='schema'), name='redoc'),
 ]
-if settings.DEBUG:
-    urlpatterns += static(settings.MEDIA_URL, document_root = settings.MEDIA_ROOT)
-    urlpatterns += static(settings.STATIC_URL, document_root = settings.STATIC_URL)
diff --git a/auth/chat/__init__.py b/auth/chat/__init__.py
diff --git a/auth/chat/admin.py b/auth/chat/admin.py
@@ -0,0 +1,5 @@
+from django.contrib import admin
+from .models import *
+
+admin.site.register(Conversation)
+admin.site.register(Message)
diff --git a/auth/chat/apps.py b/auth/chat/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ChatConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'chat'