diff --git a/ippisite/db.sqlite3.REMOVED.git-id b/ippisite/db.sqlite3.REMOVED.git-id index e31aa9c9bcfb442e815c8a2889316d1748ba30b9..eb9b8958b420fb861651b121f6ebb91b62efb6d0 100644 --- a/ippisite/db.sqlite3.REMOVED.git-id +++ b/ippisite/db.sqlite3.REMOVED.git-id @@ -1 +1 @@ -521ff1feba549fd94abfbcedbfea449190f6f3b2 \ No newline at end of file +fccd9d61cb42d14bf067967988c8ee76a6d781ff \ No newline at end of file diff --git a/ippisite/ippidb/templates/base.html b/ippisite/ippidb/templates/base.html index d8a44a403544ca4bdf206d3c024ec7fadba365c5..288c82399106eb2b90e390650b5b996f353f5875 100644 --- a/ippisite/ippidb/templates/base.html +++ b/ippisite/ippidb/templates/base.html @@ -1,3 +1,5 @@ +{% load socialaccount %} + <!DOCTYPE html> <html lang="en"> <head> @@ -60,6 +62,11 @@ <li> <a href="/admin-session">Admin</a> </li> + {% if user.is_authenticated %} + <li>Welcome {{ user.username }} !!! <a href="{% url 'logout' %}">logout</a></li> + {% else %} + <li><a href="{% provider_login_url 'github' %}"><i class="fab fa-github" title="Login with github"></i> Login with GitHub</a></li> + {% endif %} </ul> </div> </nav> diff --git a/ippisite/ippisite/settings.py b/ippisite/ippisite/settings.py index 00ae82933f2c8ad674af4e7a2c2e83066abeab54..da6df9dfc60ad430bec7d3d6f758ab5a8c624381 100644 --- a/ippisite/ippisite/settings.py +++ b/ippisite/ippisite/settings.py @@ -46,7 +46,12 @@ INSTALLED_APPS = [ 'ippidb', 'formtools', 'debug_toolbar', - 'mod_wsgi.server' + 'mod_wsgi.server', + 'django.contrib.sites', + 'allauth', + 'allauth.account', + 'allauth.socialaccount', + 'allauth.socialaccount.providers.github', ] MIDDLEWARE = [ @@ -140,3 +145,15 @@ GRAPH_MODELS = { 'all_applications': True, 'group_models': True, } + +# myproject/settings.py +AUTHENTICATION_BACKENDS = ( + "django.contrib.auth.backends.ModelBackend", + "allauth.account.auth_backends.AuthenticationBackend", +) + +SITE_ID = 1 + +LOGIN_REDIRECT_URL = '/' + +LOGOUT_REDIRECT_URL = '/' diff --git a/ippisite/ippisite/urls.py b/ippisite/ippisite/urls.py index 188260bbfe48f77b75bee56b8e8051cc486b4dcf..72d80c8fcbb790b927da38c2ecde6cdb2315fd79 100644 --- a/ippisite/ippisite/urls.py +++ b/ippisite/ippisite/urls.py @@ -19,4 +19,6 @@ from django.contrib import admin urlpatterns = [ url(r'^', include('ippidb.urls')), url(r'^admin-django/', admin.site.urls), + url(r'^accounts/', include('allauth.urls')), + url(r'^auth/', include('django.contrib.auth.urls')), ] diff --git a/ippisite/requirements.txt b/ippisite/requirements.txt index dc066e8875c6236dd4a70f0ef541332e15c9c566..6df5a10110e0329ff8a39b5cc4b06fca6a6a7756 100644 --- a/ippisite/requirements.txt +++ b/ippisite/requirements.txt @@ -9,3 +9,4 @@ django-formtools django-debug-toolbar mod_wsgi bioblend +django-allauth