aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSawyer Bergeron <sbergeron@iol.unh.edu>2020-06-23 21:18:19 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-06-23 21:18:19 +0000
commit682f7ebb6d0be5ddd8e4c699e1f87fc20a3fe1e3 (patch)
treeacf41c2c41ccb053f7cbf4ff9d814419e9fd9edf /src
parent2b15204ca0f8d9a51c3b4963db904d797ebb8186 (diff)
parent57d1635845df4a8b045805b66e8fbec5010ce97f (diff)
Merge "Revert "Enable OpenID""
Diffstat (limited to 'src')
-rw-r--r--src/account/views.py15
-rw-r--r--src/laas_dashboard/settings.py17
-rw-r--r--src/laas_dashboard/urls.py3
-rw-r--r--src/templates/akraino/base.html20
-rw-r--r--src/templates/akraino/dashboard/landing.html7
-rw-r--r--src/templates/base/base.html2
-rw-r--r--src/templates/base/dashboard/landing.html2
7 files changed, 2 insertions, 64 deletions
diff --git a/src/account/views.py b/src/account/views.py
index 912a432..1cb2275 100644
--- a/src/account/views.py
+++ b/src/account/views.py
@@ -28,7 +28,6 @@ from django.views.generic import RedirectView, TemplateView, UpdateView
from django.shortcuts import render
from jira import JIRA
from rest_framework.authtoken.models import Token
-from mozilla_django_oidc.auth import OIDCAuthenticationBackend
from account.forms import AccountSettingsForm
@@ -59,20 +58,6 @@ class AccountSettingsView(UpdateView):
return context
-class MyOIDCAB(OIDCAuthenticationBackend):
- def filter_users_by_claims(self, claims):
- email = claims.get(email=email)
- if not email:
- return self.UserModel.objects.none()
-
- try:
- profile = Profile.objects.get(email=email)
- return profile.user
-
- except Profile.DoesNotExist:
- return self.UserModel.objects.none()
-
-
class JiraLoginView(RedirectView):
def get_redirect_url(self, *args, **kwargs):
consumer = oauth.Consumer(settings.OAUTH_CONSUMER_KEY, settings.OAUTH_CONSUMER_SECRET)
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:
diff --git a/src/templates/akraino/base.html b/src/templates/akraino/base.html
index b93dcd2..1368476 100644
--- a/src/templates/akraino/base.html
+++ b/src/templates/akraino/base.html
@@ -22,23 +22,3 @@
{% endblock logo %}
{% block dropDown %}
{% endblock dropDown %}
-
-{% block login %}
- <div class="dropdown-menu dropdown-menu-right">
- {% if user.is_authenticated %}
- <a href="{% url 'account:settings' %}" class="text-dark dropdown-item">
- <i class="fas fa-cog"></i>
- Settings
- </a>
- <a href="{% url 'oidc_logout' %}" class="text-dark dropdown-item">
- <i class="fas fa-sign-out-alt"></i>
- Logout
- </a>
- {% else %}
- <a href="{% url 'oidc_authentication_init' %}" class="text-dark dropdown-item">
- <i class="fas fa-sign-in-alt"></i>
- Login with LFID
- </a>
- {% endif %}
- </div>
-{% endblock login %} \ No newline at end of file
diff --git a/src/templates/akraino/dashboard/landing.html b/src/templates/akraino/dashboard/landing.html
index 39eebb6..d7f434b 100644
--- a/src/templates/akraino/dashboard/landing.html
+++ b/src/templates/akraino/dashboard/landing.html
@@ -18,12 +18,5 @@
<p>To get started, book a pod below:</p>
<a class="btn btnAkr btn-lg d-flex flex-column justify-content-center align-content-center border text-white p-4" href="/booking/quick/">Book a Pod</a>
{% endblock btnGrp %}
-
-{% block biglogin %}
-<h4 class="text-center">
- To get started, please log in with <a href="{% url 'oidc_authentication_init' %}"> Linux Foundation ID</a>
-</h4>
-{% endblock biglogin %}
-
{% block returningUsers %}
{% endblock returningUsers %}
diff --git a/src/templates/base/base.html b/src/templates/base/base.html
index f86cff8..cc6d38d 100644
--- a/src/templates/base/base.html
+++ b/src/templates/base/base.html
@@ -44,7 +44,6 @@
{% endif %}
<i class="fas fa-caret-down rotate"></i>
</a>
- {% block login %}
<div class="dropdown-menu dropdown-menu-right">
{% if user.is_authenticated %}
<a href="{% url 'account:settings' %}" class="text-dark dropdown-item">
@@ -62,7 +61,6 @@
</a>
{% endif %}
</div>
- {% endblock login %}
</li>
</ul>
</div>
diff --git a/src/templates/base/dashboard/landing.html b/src/templates/base/dashboard/landing.html
index c46b0fa..dd09dc4 100644
--- a/src/templates/base/dashboard/landing.html
+++ b/src/templates/base/dashboard/landing.html
@@ -28,11 +28,9 @@
<div class="col-12 col-lg-6 mb-4">
<h2 class="border-bottom">Get Started</h2>
{% if request.user.is_anonymous %}
- {% block biglogin %}
<h4 class="text-center">
To get started, please log in with your <a href="/accounts/login">Linux Foundation Jira account</a>
</h4>
- {% endblock biglogin %}
{% else %}
{% block btnGrp %}
<p>To get started, book a server below:</p>