Merge pull request #803 from crowdbotics/qa

Merge qa into master for production release
crowdbotics · Aug 22, 2024 · 950506c · 950506c
2 parents ece83b6 + e0b7cbb
commit 950506c
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 86 deletions.
diff --git a/{{cookiecutter.project_slug}}/Pipfile b/{{cookiecutter.project_slug}}/Pipfile
@@ -19,16 +19,16 @@ waitress = "~=2.1.2"
 whitenoise = "~=6.7.0"
 djangorestframework = "~=3.15.1"
 django-bootstrap4 = "~=22.1"
-django-allauth = "~=0.54.0"
+django-allauth = "~=0.63.6"
 django-extensions = "~=3.2.3"
 packaging = "*"
 pyyaml = "~=6.0"
 pillow = "~=10.4.0"
 pytest = "==8.3.1"
 factory-boy = "==3.3.0"
-google-cloud-secret-manager = "==2.20.1"
+google-cloud-secret-manager = "==2.20.2"
 google-auth = "==2.31.0"
-google-cloud-storage = "==2.17.0"
+google-cloud-storage = "==2.18.0"
 pipenv = "*"
 django-import-export = "*"
 drf-spectacular = "~=0.26.4"

diff --git a/{{cookiecutter.project_slug}}/Pipfile.lock b/{{cookiecutter.project_slug}}/Pipfile.lock
diff --git a/{{cookiecutter.project_slug}}/home/api/v1/serializers.py b/{{cookiecutter.project_slug}}/home/api/v1/serializers.py
@@ -3,7 +3,8 @@
 from django.utils.translation import gettext_lazy as _
 from allauth.account import app_settings as allauth_settings
 from allauth.account.forms import ResetPasswordForm
-from allauth.utils import email_address_exists, generate_unique_username
+from allauth.utils import generate_unique_username
+from allauth.account.utils import assess_unique_email
 from allauth.account.adapter import get_adapter
 from allauth.account.utils import setup_user_email
 from rest_framework import serializers
@@ -38,7 +39,7 @@ def _get_request(self):
     def validate_email(self, email):
         email = get_adapter().clean_email(email)
         if allauth_settings.UNIQUE_EMAIL:
-            if email and email_address_exists(email):
+            if email and assess_unique_email(email):
                 raise serializers.ValidationError(
                     _("A user is already registered with this e-mail address.")
                 )

diff --git a/{{cookiecutter.project_slug}}/home/templates/base.html b/{{cookiecutter.project_slug}}/home/templates/base.html
@@ -1,5 +1,5 @@
 {% raw %}
-{% load staticfiles %}
+{% load static %}
 <!doctype html>
 <html lang="en">
   <head>

diff --git a/{{cookiecutter.project_slug}}/home/templates/home/index.html b/{{cookiecutter.project_slug}}/home/templates/home/index.html
@@ -1,6 +1,6 @@
 {% raw %}
 {% extends '../base.html' %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap4 %}
 
 {% block content %}

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/settings.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/settings.py
@@ -114,6 +114,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'allauth.account.middleware.AccountMiddleware',
 ]
 
 ROOT_URLCONF = '{{cookiecutter.project_slug}}.urls'
@@ -284,7 +285,7 @@
     EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
 
-# GCP config 
+# GCP config
 def google_service_account_config():
     # base64 encoded service_account.json file
     service_account_config = env.str("GS_CREDENTIALS", "")