Add django-allauth for Azure authentication (SSO) and email verification

.github/workflows/pytest.yml

@@ -17,6 +17,7 @@ jobs:
       DJANGO_SETTINGS_MODULE: kobo.settings.testing
       REDIS_SESSION_URL: redis://localhost:6379
       SERVICE_ACCOUNT_BACKEND_URL: redis://localhost:6379/4
+      CACHE_URL: redis://localhost:6379/3
     strategy:
       matrix:
         python-version: ['3.8', '3.10']

.gitlab-ci.yml

@@ -13,10 +13,10 @@ build:
   before_script:
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
   script:
-    - docker pull $CI_REGISTRY_IMAGE:CI_COMMIT_REF_NAME || true
-    - docker build --cache-from $CI_REGISTRY_IMAGE:CI_COMMIT_REF_NAME --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME .
+    - docker pull $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} || true
+    - docker build --cache-from $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA --tag $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-} .
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
-    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    - docker push $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME//\//-}
 
 deploy-beta:
   stage: deploy

dependencies/pip/dev_requirements.txt

@@ -94,6 +94,7 @@ cryptography==37.0.1
     #   azure-storage-blob
     #   jwcrypto
     #   paramiko
+    #   pyjwt
     #   pyopenssl
 cssselect==1.1.0
     # via pyquery
@@ -104,6 +105,7 @@ deepmerge==1.0.1
 defusedxml==0.7.1
     # via
     #   djangorestframework-xml
+    #   python3-openid
     #   pyxform
 deprecated==1.2.13
     # via
@@ -119,6 +121,7 @@ django==3.2.15
     # via
     #   -r dependencies/pip/requirements.in
     #   dj-stripe
+    #   django-allauth
     #   django-amazon-ses
     #   django-braces
     #   django-celery-beat
@@ -142,6 +145,8 @@ django==3.2.15
     #   jsonfield
     #   kobo-service-account
     #   model-bakery
+django-allauth==0.52.0
+    # via -r dependencies/pip/requirements.in
 django-amazon-ses==4.0.1
     # via -r dependencies/pip/requirements.in
 django-braces==1.15.0
@@ -184,8 +189,6 @@ django-redis==5.2.0
     # via -r dependencies/pip/requirements.in
 django-redis-sessions==0.6.2
     # via -r dependencies/pip/requirements.in
-django-registration-redux==2.10
-    # via -r dependencies/pip/requirements.in
 django-request-cache==1.2
     # via -r dependencies/pip/requirements.in
 django-reversion==5.0.0
@@ -394,8 +397,10 @@ pygments==2.12.0
     # via
     #   -r dependencies/pip/requirements.in
     #   ipython
-pyjwt==2.3.0
-    # via twilio
+pyjwt[crypto]==2.3.0
+    # via
+    #   django-allauth
+    #   twilio
 pymongo==3.12.3
     # via -r dependencies/pip/requirements.in
 pynacl==1.5.0
@@ -433,6 +438,8 @@ python-dateutil==2.8.2
     #   -r dependencies/pip/requirements.in
     #   botocore
     #   python-crontab
+python3-openid==3.2.0
+    # via django-allauth
 pytz==2022.1
     # via
     #   celery
@@ -455,6 +462,7 @@ requests==2.27.1
     #   -r dependencies/pip/requirements.in
     #   azure-core
     #   coveralls
+    #   django-allauth
     #   django-oauth-toolkit
     #   google-api-core
     #   google-cloud-storage
@@ -466,7 +474,9 @@ requests==2.27.1
     #   twilio
     #   yubico-client
 requests-oauthlib==1.3.1
-    # via msrest
+    # via
+    #   django-allauth
+    #   msrest
 responses==0.20.0
     # via -r dependencies/pip/requirements.in
 rsa==4.8

dependencies/pip/requirements.in

@@ -26,6 +26,7 @@ celery[redis]
 dict2xml
 dj-static
 dj-stripe
+django-allauth
 django-braces
 django-celery-beat
 django-constance[database]
@@ -38,7 +39,6 @@ django-extensions
 django-oauth-toolkit
 django-organizations
 django-redis
-django-registration-redux
 django-storages[azure,boto3]
 django-amazon-ses
 django-webpack-loader

dependencies/pip/requirements.txt

@@ -75,6 +75,7 @@ cryptography==37.0.1
     # via
     #   azure-storage-blob
     #   jwcrypto
+    #   pyjwt
     #   pyopenssl
 cssselect==1.1.0
     # via pyquery
@@ -83,6 +84,7 @@ deepmerge==1.0.1
 defusedxml==0.7.1
     # via
     #   djangorestframework-xml
+    #   python3-openid
     #   pyxform
 deprecated==1.2.13
     # via
@@ -98,6 +100,7 @@ django==3.2.15
     # via
     #   -r dependencies/pip/requirements.in
     #   dj-stripe
+    #   django-allauth
     #   django-amazon-ses
     #   django-braces
     #   django-celery-beat
@@ -120,6 +123,8 @@ django==3.2.15
     #   djangorestframework
     #   jsonfield
     #   kobo-service-account
+django-allauth==0.52.0
+    # via -r dependencies/pip/requirements.in
 django-amazon-ses==4.0.1
     # via -r dependencies/pip/requirements.in
 django-braces==1.15.0
@@ -162,8 +167,6 @@ django-redis==5.2.0
     # via -r dependencies/pip/requirements.in
 django-redis-sessions==0.6.2
     # via -r dependencies/pip/requirements.in
-django-registration-redux==2.10
-    # via -r dependencies/pip/requirements.in
 django-request-cache==1.2
     # via -r dependencies/pip/requirements.in
 django-reversion==5.0.0
@@ -325,8 +328,10 @@ pycparser==2.21
     # via cffi
 pygments==2.12.0
     # via -r dependencies/pip/requirements.in
-pyjwt==2.3.0
-    # via twilio
+pyjwt[crypto]==2.3.0
+    # via
+    #   django-allauth
+    #   twilio
 pymongo==3.12.3
     # via -r dependencies/pip/requirements.in
 pyopenssl==22.0.0
@@ -350,6 +355,8 @@ python-dateutil==2.8.2
     #   -r dependencies/pip/requirements.in
     #   botocore
     #   python-crontab
+python3-openid==3.2.0
+    # via django-allauth
 pytz==2022.1
     # via
     #   celery
@@ -371,6 +378,7 @@ requests==2.27.1
     # via
     #   -r dependencies/pip/requirements.in
     #   azure-core
+    #   django-allauth
     #   django-oauth-toolkit
     #   google-api-core
     #   google-cloud-storage
@@ -382,7 +390,9 @@ requests==2.27.1
     #   twilio
     #   yubico-client
 requests-oauthlib==1.3.1
-    # via msrest
+    # via
+    #   django-allauth
+    #   msrest
 responses==0.20.0
     # via -r dependencies/pip/requirements.in
 rsa==4.8

jsapp/js/account/accountSettings.scss

@@ -8,7 +8,7 @@
   background: colors.$kobo-white;
   overflow-y: auto;
   position: relative;
-  padding: sizes.$x50;
+  padding-top: sizes.$x50;
 
   h4 {
     margin: 0;
@@ -29,35 +29,16 @@
     .form-modal__item--fields {
       height: calc(100% - #{sizes.$x50});
       padding-right: 40px;
+      padding-left: sizes.$x50;
+      padding-bottom: sizes.$x30;
       overflow: auto;
 
       > *:last-child {margin-bottom: 20px;}
     }
 
-    .form-modal__item--api-token {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      flex-wrap: wrap;
-
-      > label {
-        width: 100%;
-      }
-
-      .text-box {
-        display: inline-block;
-        vertical-align: top;
-        width: 50%;
-        margin-right: sizes.$x5;
-
-        .text-box__input {
-          font-family: mdl.$font_mono;
-        }
-      }
-    }
-
     .form-modal__item--username {
       min-height: 32px;
+      padding-left: sizes.$x50;
 
       .account-box__initials {
         display: inline-block;