Merge branch 'master' into 'SDC-1005-multiple-summary-structures'

merge keycloak changes into branch

See merge request !323

atdb/atdb/settings/base.py

@@ -45,8 +45,7 @@ INSTALLED_APPS = [
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
-    'allauth.socialaccount.providers.keycloak',
-
+    'allauth.socialaccount.providers.openid_connect',
 ]
 
 MIDDLEWARE = [
@@ -59,6 +58,7 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'allauth.account.middleware.AccountMiddleware',
     #'silk.middleware.SilkyMiddleware',
 ]
 
@@ -228,17 +228,27 @@ AUTHENTICATION_BACKENDS = [
     "allauth.account.auth_backends.AuthenticationBackend",
 ]
 
-try:
-    KEYCLOAK_URL = os.environ['KEYCLOAK_URL']
-except:
-    KEYCLOAK_URL = 'https://keycloak.astron.nl/auth'
-
+# Set your keycloak url and realm
 SOCIALACCOUNT_PROVIDERS = {
-    'keycloak': {
-        'KEYCLOAK_URL': KEYCLOAK_URL,
-        'KEYCLOAK_REALM': 'SDC',
-        'SCOPE': ['openid', 'profile', 'email']
+    "openid_connect": {
+        "SERVERS": [
+            {
+                "id": "keycloak",
+                "name": "Keycloak",
+                "server_url": os.getenv(
+                    "KEYCLOAK_URL", "https://keycloak.astron.nl/auth"
+                )
+                + "/realms/"
+                + os.getenv("KEYCLOAK_REALM", "SDC")
+                + "/.well-known/openid-configuration",
+                "APP": {
+                    "client_id": os.getenv("KEYCLOAK_CLIENT_ID"),
+                    "secret": os.getenv("KEYCLOAK_CLIENT_SECRET"),
+                },
+                "SCOPE": ["openid", "profile", "email"],
             }
+        ]
+    },
 }
 
 try:
@@ -247,7 +257,6 @@ except:
     LOGIN_REDIRECT_URL = '/atdb/'
 
 logger.info("LOGIN_REDIRECT_URL:" + LOGIN_REDIRECT_URL)
-logger.info("KEYCLOAK_URL:" + KEYCLOAK_URL)
 
 
 SESSION_COOKIE_NAME = 'atdb_session_id'

atdb/atdb/settings/dev.py

@@ -13,8 +13,6 @@ DATABASES = {
          'ENGINE': 'django.db.backends.postgresql_psycopg2',
          'USER': 'atdb_admin',
          'PASSWORD': 'atdb123',
-         #'NAME': 'atdb_ldv_astronauth_6feb2023',
-          #'NAME': 'atdb_ldv_27jun2023',
          'NAME': 'atdb_ldv_8aug2023',
          'HOST': 'localhost',
          'PORT': '5432',
@@ -27,10 +25,3 @@ DATABASES = {
 AUTH_PASSWORD_VALIDATORS = []
 
 LOGIN_REDIRECT_URL = "http://localhost:8000/atdb"
-SOCIALACCOUNT_PROVIDERS = {
-    'keycloak': {
-        'KEYCLOAK_URL': 'https://sdc-dev.astron.nl/auth',
-        'KEYCLOAK_REALM': 'SDC',
-        'SCOPE': ['openid', 'profile', 'email']
-    }
-}
\ No newline at end of file

atdb/requirements/base.txt

 astronauth==0.3.3
 Django==3.2
-django-allauth==0.52.0
+django-allauth==0.57.0  # note allauth only supports Django >= 3.2
 django-bootstrap-pagination==1.7.0
 django-bootstrap3==14.2.0
 django-cors-headers==3.6.0

atdb/run.bat

-SET DEBUG=True
-SET DATABASE_HOST=localhost
-SET DATABASE_PORT=5432
-SET DATABASE_NAME=atdb_ldv
-SET DATABASE_USER=atdb_admin
-SET DATABASE_PASSWORD=atdb123
-python manage.py runserver --settings=atdb.settings.dev

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -31,7 +31,7 @@
             {% include 'taskdatabase/pagination.html' %}
         </div>
     </div>
-    <p class="footer"> Version 31 Aug 2023
+    <p class="footer"> Version 3 Oct 2023
 </div>
 
 {% include 'taskdatabase/refresh.html' %}