Merge pull request #1121 from thecourseforum/cleanup

Django Session Cleanup (save 5 gb)

Author: Jay-Lalwani

requirements.txt

@@ -23,7 +23,6 @@ psycopg2~=2.9.9
 pylint-django~=2.5.5
 pylint~=3.0.3
 requests~=2.31.0
-social-auth-app-django~=5.4.0
 tqdm~=4.66.1
 types-tqdm~=4.66.0
 uWSGI~=2.0.28

scripts/container-startup.sh

@@ -11,6 +11,8 @@ echo 'collectstatic ran'
 
 python manage.py invalidate_cachalot tcf_website
 
+python manage.py clearsessions
+
 # Add custom commands here
 
 echo 'Starting Django Server...'

tcf_core/auth_pipeline.py

@@ -130,8 +130,6 @@
                 "django.template.context_processors.request",
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
-                "social_django.context_processors.backends",
-                "social_django.context_processors.login_redirect",
                 "tcf_core.context_processors.base",
                 "tcf_core.context_processors.history_cookies",
                 "tcf_core.context_processors.searchbar_context",

tcf_core/settings/base.py

@@ -19,6 +19,5 @@
 
 urlpatterns = [
     path("", include("tcf_website.urls")),
-    path("oauth/", include("social_django.urls")),
     path("admin/", admin.site.urls),
 ]

tcf_core/urls.py

@@ -4,7 +4,7 @@
 # https://docs.djangoproject.com/en/3.0/topics/db/models/#organizing-models-in-a-package
 
 from .ads import ads
-from .auth import collect_extra_info, login, login_error, logout, password_error
+from .auth import login, logout
 from .browse import (
     browse,
     course_instructor,

tcf_website/templates/login/extra_info_form.html

@@ -2,20 +2,16 @@
 
 import logging
 from base64 import b64encode
-from datetime import datetime
 import json
 
 import requests
-from django import forms
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import authenticate, login as auth_login, logout as auth_logout
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseRedirect
 from django.shortcuts import redirect, render
-from django.urls import reverse
 
-from .browse import browse
 
 logger = logging.getLogger(__name__)
 
@@ -101,67 +97,6 @@ def cognito_callback(request):
         return redirect("index")
 
 
-def login_error(request):
-    """Login error view."""
-    messages.error(
-        request,
-        "There was an error logging you in. Please make \
-                   sure you're using an @virginia.edu email address.",
-    )
-    return browse(request)
-
-
-def password_error(request):
-    """Incorrect password error view."""
-    messages.error(
-        request,
-        "There was an error logging you in. Please check \
-                    your email and password",
-    )
-    return browse(request)
-
-
-class ExtraUserInfoForm(forms.Form):
-    """Form to collect extra user info on sign up."""
-
-    current_yr = datetime.now().year
-    max_yr = current_yr + 6
-    grad_year = forms.IntegerField(
-        widget=forms.NumberInput(
-            attrs={
-                "class": "form-control",
-                "min": "1900",
-                "max": max_yr,
-                "value": current_yr,
-            }
-        )
-    )
-
-
-def collect_extra_info(request, method):
-    """Extra sign up info collection view."""
-    if request.method == "POST":
-        form = ExtraUserInfoForm(request.POST)
-        if form.is_valid():
-            # because of FIELDS_STORED_IN_SESSION, this will get copied
-            # to the request dictionary when the pipeline is resumed
-            request.session["grad_year"] = form.cleaned_data["grad_year"]
-
-            # once we have the grad_year stashed in the session, we can
-            # tell the pipeline to resume by using the "complete" endpoint
-            return redirect(
-                reverse("social:complete", args=[method])
-                + "?verification_code="
-                + request.GET["verification_code"]
-                + "&partial_token="
-                + request.GET["partial_token"]
-            )
-    else:
-        form = ExtraUserInfoForm()
-
-    return render(request, "login/extra_info_form.html", {"form": form})
-
-
 def unauthenticated_index(request):
     """Index shown to non-logged in users."""
     return render(request, "landing/landing.html")