Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fiware backend #72

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed shub/backends/__init__.py
Empty file.
1 change: 1 addition & 0 deletions shub/plugins/fiware/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AUTHENTICATION_BACKENDS = ('shub.plugins.fiware.keyrock.KeyrockOAuth2',)
File renamed without changes.
1 change: 1 addition & 0 deletions shub/plugins/fiware/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
urlpatterns = []
8 changes: 4 additions & 4 deletions shub/settings/auth.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'''

Copyright (C) 2017-2018 The Board of Trustees of the Leland Stanford Junior
Copyright (C) 2017 The Board of Trustees of the Leland Stanford Junior
University.
Copyright (C) 2017-2018 Vanessa Sochat.
Copyright (C) 2017 Vanessa Sochat.

This program is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published by
Expand Down Expand Up @@ -30,8 +30,7 @@
'social_core.backends.twitter.TwitterOAuth',
'social_core.backends.facebook.FacebookOAuth2',
'social_core.backends.github.GithubOAuth2',
'guardian.backends.ObjectPermissionBackend',
'shub.backends.keyrock.KeyrockOAuth2',
'social_core.backends.gitlab.GitLabOAuth2',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you know why this is an added line here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mmmm no Idea, it appears after the merge. It should be removed?

)


Expand All @@ -49,6 +48,7 @@
'social_core.pipeline.user.user_details',
)


SOCIAL_AUTH_LOGIN_REDIRECT_URL = 'http://127.0.0.1'

# http://psa.matiasaguirre.net/docs/configuration/settings.html#urls-options
Expand Down
3 changes: 2 additions & 1 deletion shub/settings/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,6 @@

# - ldap_auth: Allows sregistry to authenitcate against an LDAP directory
PLUGINS_ENABLED = [
# 'ldap_auth'
# 'ldap_auth',
# 'fiware',
]