trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix oauth2 authorisation form not working

This commit is contained in:
Jens Langhammer 2018-11-25 12:31:55 +01:00
parent 9967319294
commit 76a43a7818
No known key found for this signature in database
GPG Key ID: BEBC05297D92821B
6 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
passbook/core/settings.py
View File

@ -56,6 +56,7 @@ INSTALLED_APPS = [
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'reversion', 'reversion',
'rest_framework', 'rest_framework',
'crispy_forms',
'passbook.core', 'passbook.core',
'passbook.admin', 'passbook.admin',
'passbook.api', 'passbook.api',
@ -66,9 +67,6 @@ INSTALLED_APPS = [
'passbook.oauth_provider', 'passbook.oauth_provider',
'passbook.saml_idp', 'passbook.saml_idp',
'passbook.tfa', 'passbook.tfa',
'crispy_forms',
'oauth2_provider',
'corsheaders',
] ]
# Message Tag fix for bootstrap CSS Classes # Message Tag fix for bootstrap CSS Classes
@ -246,16 +244,11 @@ with CONFIG.cd('log'):
'level': 'DEBUG', 'level': 'DEBUG',
'propagate': True, 'propagate': True,
}, },
'flower': { 'oauth2_provider': {
'handlers': LOG_HANDLERS, 'handlers': LOG_HANDLERS,
'level': 'DEBUG', 'level': 'DEBUG',
'propagate': True, 'propagate': True,
}, },
'celery': {
'handlers': LOG_HANDLERS,
'level': 'WARNING',
'propagate': True,
},
} }
} }

2
passbook/core/templates/base/skeleton.html
View File

@ -14,7 +14,7 @@
<link rel="stylesheet" type="text/css" href="{% static 'css/patternfly.min.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'css/patternfly.min.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/patternfly-additions.min.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'css/patternfly-additions.min.css' %}">
</head> </head>
<body {% if is_login or client_id %} class="login-pf" {% endif %}> <body {% if is_login %} class="login-pf" {% endif %}>
{% block body %} {% block body %}
{% endblock %} {% endblock %}
<script src="{% static 'js/jquery.min.js' %}"></script> <script src="{% static 'js/jquery.min.js' %}"></script>

4
passbook/oauth_provider/settings.py
View File

@ -3,6 +3,10 @@
CORS_ORIGIN_ALLOW_ALL = True CORS_ORIGIN_ALLOW_ALL = True
REQUEST_APPROVAL_PROMPT = 'auto' REQUEST_APPROVAL_PROMPT = 'auto'
INSTALLED_APPS = [
'oauth2_provider',
'corsheaders',
]
MIDDLEWARE = [ MIDDLEWARE = [
'oauth2_provider.middleware.OAuth2TokenMiddleware', 'oauth2_provider.middleware.OAuth2TokenMiddleware',
'corsheaders.middleware.CorsMiddleware', 'corsheaders.middleware.CorsMiddleware',

2
passbook/oauth_provider/templates/oauth2_provider/authorize.html
View File

@ -42,7 +42,7 @@
<a href="{% url 'passbook_core:auth-logout' %}">{% trans 'Logout' %}</a> <a href="{% url 'passbook_core:auth-logout' %}">{% trans 'Logout' %}</a>
</p> </p>
<div class="form-group"> <div class="form-group">
<button type="submit" class="btn btn-success btn-lg">{% trans 'Continue' %}</button> <input type="submit" class="btn btn-success btn-lg" name="allow" value="{% trans 'Continue' %}">
<a href="{% back %}" class="btn btn-default btn-lg">{% trans "Cancel" %}</a> <a href="{% back %}" class="btn btn-default btn-lg">{% trans "Cancel" %}</a>
</div> </div>
</div> </div>

4
passbook/oauth_provider/urls.py
View File

@ -2,11 +2,11 @@
from django.urls import include, path from django.urls import include, path
# from passbook.oauth_provider.views import oauth2 from passbook.oauth_provider.views import oauth2
urlpatterns = [ urlpatterns = [
# Custom OAuth 2 Authorize View # Custom OAuth 2 Authorize View
# path('authorize/', oauth2.PassbookAuthorizationView.as_view(), name="oauth2-authorize"), path('authorize/', oauth2.PassbookAuthorizationView.as_view(), name="oauth2-authorize"),
# OAuth API # OAuth API
path('', include('oauth2_provider.urls', namespace='oauth2_provider')), path('', include('oauth2_provider.urls', namespace='oauth2_provider')),
] ]

20
passbook/oauth_provider/views/oauth2.py
View File

@ -1,18 +1,22 @@
"""passbook OAuth2 Views""" """passbook OAuth2 Views"""
# from logging import getLogger from logging import getLogger
# from django.contrib import messages from oauth2_provider.views.base import AuthorizationView
# from django.http import Http404, HttpResponseRedirect
# from django.utils.translation import ugettext as _
# from oauth2_provider.models import get_application_model
# from oauth2_provider.views.base import AuthorizationView
# # from passbook.core.models import Event, UserAcquirableRelationship # from passbook.core.models import Event, UserAcquirableRelationship
# LOGGER = getLogger(__name__) LOGGER = getLogger(__name__)
class PassbookAuthorizationView(AuthorizationView):
"""Custom OAuth2 Authorization View which checks rules, etc"""
def render_to_response(self, context, **kwargs):
# Always set is_login to true for correct css class
context['is_login'] = True
return super().render_to_response(context, **kwargs)
# class PassbookAuthorizationView(AuthorizationView): # class PassbookAuthorizationView(AuthorizationView):
# """Custom OAuth2 Authorization View which checks for invite_only products""" # """Custom OAuth2 Authorization View which checks for invite_only products"""