diff options
author | 2020-06-23 21:18:19 +0000 | |
---|---|---|
committer | 2020-06-23 21:18:19 +0000 | |
commit | 682f7ebb6d0be5ddd8e4c699e1f87fc20a3fe1e3 (patch) | |
tree | acf41c2c41ccb053f7cbf4ff9d814419e9fd9edf /src/laas_dashboard | |
parent | 2b15204ca0f8d9a51c3b4963db904d797ebb8186 (diff) | |
parent | 57d1635845df4a8b045805b66e8fbec5010ce97f (diff) |
Merge "Revert "Enable OpenID""
Diffstat (limited to 'src/laas_dashboard')
-rw-r--r-- | src/laas_dashboard/settings.py | 17 | ||||
-rw-r--r-- | src/laas_dashboard/urls.py | 3 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/laas_dashboard/settings.py b/src/laas_dashboard/settings.py index 0b23960..62fc9ec 100644 --- a/src/laas_dashboard/settings.py +++ b/src/laas_dashboard/settings.py @@ -30,7 +30,6 @@ INSTALLED_APPS = [ 'api', 'django.contrib.admin', 'django.contrib.auth', - 'mozilla_django_oidc', # needs to be defined after auth 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', @@ -38,7 +37,7 @@ INSTALLED_APPS = [ 'django.contrib.humanize', 'bootstrap4', 'rest_framework', - 'rest_framework.authtoken', + 'rest_framework.authtoken' ] MIDDLEWARE = [ @@ -52,20 +51,6 @@ MIDDLEWARE = [ 'account.middleware.TimezoneMiddleware', ] -AUTHENTICATION_BACKENDS = ['account.views.MyOIDCAB'] - - -# OpenID Authentications -OIDC_RP_CLIENT_ID = os.environ['OIDC_CLIENT_ID'] -OIDC_RP_CLIENT_SECRET = os.environ['OIDC_CLIENT_SECRET'] - -OIDC_OP_AUTHORIZATION_ENDPOINT = os.environ['OIDC_AUTHORIZATION_ENDPOINT'] -OIDC_OP_TOKEN_ENDPOINT = os.environ['OIDC_TOKEN_ENDPOINT'] -OIDC_OP_USER_ENDPOINT = os.environ['OIDC_USER_ENDPOINT'] - -LOGIN_REDIRECT_URL = os.environ['DASHBOARD_URL'] -LOGOUT_REDIRECT_URL = os.environ['DASHBOARD_URL'] - ROOT_URLCONF = 'laas_dashboard.urls' TEMPLATE_OVERRIDE = os.environ.get("TEMPLATE_OVERRIDE_DIR", "") # the user's custom template dir diff --git a/src/laas_dashboard/urls.py b/src/laas_dashboard/urls.py index 7a37d7e..17cbe84 100644 --- a/src/laas_dashboard/urls.py +++ b/src/laas_dashboard/urls.py @@ -41,8 +41,7 @@ urlpatterns = [ url(r'^admin/', admin.site.urls), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), url(r'^api/', include('api.urls')), - url(r'^messages/', include('notifier.urls', namespace='notifier')), - url(r'^oidc/', include('mozilla_django_oidc.urls')), + url(r'^messages/', include('notifier.urls', namespace='notifier')) ] if settings.DEBUG is True: |