feat: add Google and GitHub OAuth sign-in alongside email/password auth

- Add allauth.socialaccount with Google and GitHub providers to INSTALLED_APPS
- Create CustomSocialAccountAdapter for email matching and profile creation
- Add branded OAuth buttons to login and signup templates (responsive + dark mode)
- Create socialaccount signup and connections templates
- Update set_user_type signal to handle social signups safely
- Add 17 tests covering OAuth buttons, adapter logic, and profile creation
- OAuth credentials read from environment variables (no secrets in code)

Author: Rupendra0

web/adapters.py

@@ -0,0 +1,63 @@
+import logging
+
+from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
+from django.contrib.auth.models import User
+
+logger = logging.getLogger(__name__)
+
+
+class CustomSocialAccountAdapter(DefaultSocialAccountAdapter):
+    """Custom adapter to handle social account signups and profile creation."""
+
+    def pre_social_login(self, request, sociallogin):
+        """
+        Connect social login to existing account if emails match.
+
+        When a user signs up with email/password first, then later tries
+        to log in with Google/GitHub using the same email, this links
+        the social account to the existing user instead of creating a duplicate.
+        """
+        if sociallogin.is_existing:
+            return
+
+        email = None
+        if sociallogin.account.extra_data:
+            email = sociallogin.account.extra_data.get("email")
+
+        if not email:
+            email_addresses = sociallogin.email_addresses
+            if email_addresses:
+                email = email_addresses[0].email
+
+        if email:
+            try:
+                user = User.objects.get(email=email)
+                sociallogin.connect(request, user)
+            except User.DoesNotExist:
+                pass
+
+    def populate_user(self, request, sociallogin, data):
+        """Populate user fields from social account data."""
+        user = super().populate_user(request, sociallogin, data)
+
+        # Ensure first_name and last_name are set from social provider data
+        if not user.first_name:
+            user.first_name = data.get("first_name", "")
+        if not user.last_name:
+            user.last_name = data.get("last_name", "")
+
+        return user
+
+    def save_user(self, request, sociallogin, form=None):
+        """Save user and ensure profile is properly set up after social signup."""
+        user = super().save_user(request, sociallogin, form)
+
+        # Ensure profile exists and set defaults for social signups
+        if hasattr(user, "profile"):
+            profile = user.profile
+            # Social signups default to private profile and student role
+            if not profile.is_profile_public:
+                profile.is_profile_public = False
+            profile.save()
+
+        return user

web/models.py

@@ -1159,8 +1159,12 @@ def reading_time(self):
 
 @receiver(user_signed_up)
 def set_user_type(sender, request, user, **kwargs):
-    """Set the user type (teacher/student) when they sign up."""
-    is_teacher = request.POST.get("is_teacher") == "on"
+    """Set the user type (teacher/student) when they sign up.
+
+    For social signups (OAuth), is_teacher defaults to False since
+    the OAuth flow doesn't collect this field.
+    """
+    is_teacher = request.POST.get("is_teacher") == "on" if request else False
     profile = user.profile
     profile.is_teacher = is_teacher
     profile.save()

web/settings.py

@@ -142,6 +142,9 @@
     "channels",
     "allauth",
     "allauth.account",
+    "allauth.socialaccount",
+    "allauth.socialaccount.providers.google",
+    "allauth.socialaccount.providers.github",
     "captcha",
     "markdownx",
     "web",
@@ -305,6 +308,35 @@
     "login": "web.forms.CustomLoginForm",
 }
 
+# Social account settings
+SOCIALACCOUNT_AUTO_SIGNUP = True
+SOCIALACCOUNT_EMAIL_AUTHENTICATION = True
+SOCIALACCOUNT_EMAIL_AUTHENTICATION_AUTO_CONNECT = True
+SOCIALACCOUNT_EMAIL_VERIFICATION = "none"  # Google/GitHub already verify emails
+SOCIALACCOUNT_ADAPTER = "web.adapters.CustomSocialAccountAdapter"
+SOCIALACCOUNT_LOGIN_ON_GET = True
+
+# OAuth provider configuration
+SOCIALACCOUNT_PROVIDERS = {
+    "google": {
+        "APP": {
+            "client_id": env.str("GOOGLE_OAUTH_CLIENT_ID", default=""),
+            "secret": env.str("GOOGLE_OAUTH_CLIENT_SECRET", default=""),
+        },
+        "SCOPE": ["profile", "email"],
+        "AUTH_PARAMS": {"access_type": "online"},
+        "VERIFIED_EMAIL": True,
+    },
+    "github": {
+        "APP": {
+            "client_id": env.str("GITHUB_OAUTH_CLIENT_ID", default=""),
+            "secret": env.str("GITHUB_OAUTH_CLIENT_SECRET", default=""),
+        },
+        "SCOPE": ["user:email"],
+        "VERIFIED_EMAIL": True,
+    },
+}
+
 LANGUAGE_CODE = "en"
 
 TIME_ZONE = "UTC"

web/templates/account/login.html

@@ -2,6 +2,7 @@
 
 {% load static %}
 {% load account %}
+{% load socialaccount %}
 
 {% block extra_head %}
   {{ block.super }}
@@ -16,6 +17,47 @@ <h2 class="mt-10 text-center text-2xl font-bold leading-9 tracking-tight text-gr
       </h2>
     </div>
     <div class="mt-10 sm:mx-auto sm:w-full sm:max-w-md">
+      <!-- Social Login Buttons -->
+      {% get_providers as socialaccount_providers %}
+      {% if socialaccount_providers %}
+        <div class="space-y-3 mb-6">
+          <p class="text-center text-sm font-medium text-gray-500 dark:text-gray-400">Continue with</p>
+          <div class="grid grid-cols-2 gap-3">
+            {% for provider in socialaccount_providers %}
+              {% if provider.id == "google" %}
+                <a href="{% provider_login_url provider.id process='login' %}"
+                   class="flex items-center justify-center gap-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 px-4 py-2.5 text-sm font-medium text-gray-700 dark:text-gray-200 shadow-sm hover:bg-gray-50 dark:hover:bg-gray-600 transition duration-200 focus:outline-none focus:ring-2 focus:ring-orange-500 focus:ring-offset-2">
+                  <svg class="h-5 w-5" viewBox="0 0 24 24">
+                    <path d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92a5.06 5.06 0 0 1-2.2 3.32v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.1z" fill="#4285F4" />
+                    <path d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" fill="#34A853" />
+                    <path d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z" fill="#FBBC05" />
+                    <path d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" fill="#EA4335" />
+                  </svg>
+                  Google
+                </a>
+              {% endif %}
+              {% if provider.id == "github" %}
+                <a href="{% provider_login_url provider.id process='login' %}"
+                   class="flex items-center justify-center gap-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-gray-900 dark:bg-gray-800 px-4 py-2.5 text-sm font-medium text-white shadow-sm hover:bg-gray-800 dark:hover:bg-gray-700 transition duration-200 focus:outline-none focus:ring-2 focus:ring-orange-500 focus:ring-offset-2">
+                  <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 24 24">
+                    <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0 1 12 6.844a9.59 9.59 0 0 1 2.504.337c1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.02 10.02 0 0 0 22 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
+                  </svg>
+                  GitHub
+                </a>
+              {% endif %}
+            {% endfor %}
+          </div>
+        </div>
+        <!-- Divider -->
+        <div class="relative mb-6">
+          <div class="absolute inset-0 flex items-center">
+            <div class="w-full border-t border-gray-300 dark:border-gray-600"></div>
+          </div>
+          <div class="relative flex justify-center text-sm">
+            <span class="bg-white dark:bg-gray-800 px-4 text-gray-500 dark:text-gray-400">Or sign in with email</span>
+          </div>
+        </div>
+      {% endif %}
       <form class="space-y-6" action="{% url 'account_login' %}" method="post">
         {% csrf_token %}
         {% if form.errors %}

web/templates/account/signup.html

@@ -1,6 +1,7 @@
 {% extends "allauth/layouts/base.html" %}
 
 {% load static %}
+{% load socialaccount %}
 
 {% block extra_head %}
   {{ block.super }}
@@ -24,6 +25,40 @@
       <div class="flex flex-col items-center space-y-3">
         <i class="fas fa-graduation-cap text-7xl text-orange-500"></i>
         <div class="text-lg font-medium text-gray-600 dark:text-gray-300">Join our community of learners and teachers</div>
+        <!-- Social Sign Up Section on Left -->
+        {% get_providers as socialaccount_providers %}
+        {% if socialaccount_providers %}
+          <div class="w-full max-w-xs mx-auto mt-6 space-y-3">
+            <p class="text-sm font-medium text-gray-500 dark:text-gray-400">Quick sign up with</p>
+            {% for provider in socialaccount_providers %}
+              {% if provider.id == "google" %}
+                <a href="{% provider_login_url provider.id process='login' %}"
+                   class="flex items-center justify-center gap-3 w-full rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 px-4 py-3 text-sm font-medium text-gray-700 dark:text-gray-200 shadow-sm hover:bg-gray-50 dark:hover:bg-gray-600 transition duration-200 focus:outline-none focus:ring-2 focus:ring-orange-500 focus:ring-offset-2">
+                  <svg class="h-5 w-5" viewBox="0 0 24 24">
+                    <path d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92a5.06 5.06 0 0 1-2.2 3.32v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.1z" fill="#4285F4" />
+                    <path d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" fill="#34A853" />
+                    <path d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z" fill="#FBBC05" />
+                    <path d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" fill="#EA4335" />
+                  </svg>
+                  Sign up with Google
+                </a>
+              {% endif %}
+              {% if provider.id == "github" %}
+                <a href="{% provider_login_url provider.id process='login' %}"
+                   class="flex items-center justify-center gap-3 w-full rounded-lg border border-gray-300 dark:border-gray-600 bg-gray-900 dark:bg-gray-800 px-4 py-3 text-sm font-medium text-white shadow-sm hover:bg-gray-800 dark:hover:bg-gray-700 transition duration-200 focus:outline-none focus:ring-2 focus:ring-orange-500 focus:ring-offset-2">
+                  <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 24 24">
+                    <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0 1 12 6.844a9.59 9.59 0 0 1 2.504.337c1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.02 10.02 0 0 0 22 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
+                  </svg>
+                  Sign up with GitHub
+                </a>
+              {% endif %}
+            {% endfor %}
+            <p class="text-xs text-gray-400 dark:text-gray-500 text-center mt-2">
+              <i class="fas fa-shield-alt mr-1"></i>
+              No extra passwords to remember
+            </p>
+          </div>
+        {% endif %}
       </div>
     </div>
     <!-- Form section -->
@@ -34,6 +69,46 @@ <h2 class="text-xl font-bold text-gray-900 dark:text-white flex items-center jus
           Create Account
         </h2>
       </div>
+      <!-- Mobile-only social buttons -->
+      {% get_providers as socialaccount_providers %}
+      {% if socialaccount_providers %}
+        <div class="md:hidden space-y-3 mb-4">
+          <div class="grid grid-cols-2 gap-3">
+            {% for provider in socialaccount_providers %}
+              {% if provider.id == "google" %}
+                <a href="{% provider_login_url provider.id process='login' %}"
+                   class="flex items-center justify-center gap-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 px-3 py-2.5 text-sm font-medium text-gray-700 dark:text-gray-200 shadow-sm hover:bg-gray-50 dark:hover:bg-gray-600 transition duration-200">
+                  <svg class="h-4 w-4" viewBox="0 0 24 24">
+                    <path d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92a5.06 5.06 0 0 1-2.2 3.32v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.1z" fill="#4285F4" />
+                    <path d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" fill="#34A853" />
+                    <path d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z" fill="#FBBC05" />
+                    <path d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" fill="#EA4335" />
+                  </svg>
+                  Google
+                </a>
+              {% endif %}
+              {% if provider.id == "github" %}
+                <a href="{% provider_login_url provider.id process='login' %}"
+                   class="flex items-center justify-center gap-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-gray-900 dark:bg-gray-800 px-3 py-2.5 text-sm font-medium text-white shadow-sm hover:bg-gray-800 dark:hover:bg-gray-700 transition duration-200">
+                  <svg class="h-4 w-4" fill="currentColor" viewBox="0 0 24 24">
+                    <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0 1 12 6.844a9.59 9.59 0 0 1 2.504.337c1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.02 10.02 0 0 0 22 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
+                  </svg>
+                  GitHub
+                </a>
+              {% endif %}
+            {% endfor %}
+          </div>
+          <!-- Divider -->
+          <div class="relative">
+            <div class="absolute inset-0 flex items-center">
+              <div class="w-full border-t border-gray-300 dark:border-gray-600"></div>
+            </div>
+            <div class="relative flex justify-center text-xs">
+              <span class="bg-white dark:bg-[#1f2937] px-3 text-gray-500 dark:text-gray-400">Or create account with email</span>
+            </div>
+          </div>
+        </div>
+      {% endif %}
       <form id="signup_form"
             method="post"
             action="{% url 'account_signup' %}"