From ae3c092238a38bfd116d140e5157febe419d75d8 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 13 Mar 2019 16:49:30 +0100 Subject: [PATCH] add user settings for Sources --- passbook/core/models.py | 6 +++ passbook/core/templates/overview/base.html | 2 +- passbook/core/templates/user/base.html | 10 ++++ .../templatetags/passbook_user_settings.py | 16 +++++- passbook/oauth_client/models.py | 12 ++++- .../templates/account/dyn_extra/10_pre.html | 6 --- .../account/dyn_extra/11_facebook.html | 6 --- .../account/dyn_extra/12_twitter.html | 6 --- .../account/dyn_extra/13_google.html | 7 --- .../account/dyn_extra/15_github.html | 6 --- .../account/dyn_extra/16_discord.html | 7 --- .../account/dyn_extra/17_reddit.html | 7 --- .../templates/account/dyn_extra/19_post.html | 6 --- .../mod/auth/oauth/client/settings.html | 54 ------------------- .../templates/oauth_client/user.html | 18 +++++++ passbook/oauth_client/urls.py | 4 +- passbook/oauth_client/views/user.py | 20 +++++++ 17 files changed, 84 insertions(+), 109 deletions(-) delete mode 100644 passbook/oauth_client/templates/account/dyn_extra/10_pre.html delete mode 100644 passbook/oauth_client/templates/account/dyn_extra/11_facebook.html delete mode 100644 passbook/oauth_client/templates/account/dyn_extra/12_twitter.html delete mode 100644 passbook/oauth_client/templates/account/dyn_extra/13_google.html delete mode 100644 passbook/oauth_client/templates/account/dyn_extra/15_github.html delete mode 100644 passbook/oauth_client/templates/account/dyn_extra/16_discord.html delete mode 100644 passbook/oauth_client/templates/account/dyn_extra/17_reddit.html delete mode 100644 passbook/oauth_client/templates/account/dyn_extra/19_post.html delete mode 100644 passbook/oauth_client/templates/mod/auth/oauth/client/settings.html create mode 100644 passbook/oauth_client/templates/oauth_client/user.html create mode 100644 passbook/oauth_client/views/user.py diff --git a/passbook/core/models.py b/passbook/core/models.py index c9c9ad7ac..41ab18e3d 100644 --- a/passbook/core/models.py +++ b/passbook/core/models.py @@ -186,6 +186,12 @@ class Source(PolicyModel): """Return additional Info, such as a callback URL. Show in the administration interface.""" return None + def has_user_settings(self): + """Entrypoint to integrate with User settings. Can either return False if no + user settings are available, or a tuple or string, string, string where the first string + is the name the item has, the second string is the icon and the third is the view-name.""" + return False + def __str__(self): return self.name diff --git a/passbook/core/templates/overview/base.html b/passbook/core/templates/overview/base.html index 07aed11a0..973f5c136 100644 --- a/passbook/core/templates/overview/base.html +++ b/passbook/core/templates/overview/base.html @@ -26,7 +26,7 @@
  • diff --git a/passbook/core/templatetags/passbook_user_settings.py b/passbook/core/templatetags/passbook_user_settings.py index 8e529d68c..7aeb01620 100644 --- a/passbook/core/templatetags/passbook_user_settings.py +++ b/passbook/core/templatetags/passbook_user_settings.py @@ -2,7 +2,7 @@ from django import template -from passbook.core.models import Factor +from passbook.core.models import Factor, Source from passbook.core.policies import PolicyEngine register = template.Library() @@ -20,3 +20,17 @@ def user_factors(context): if policy_engine.passing and _link: matching_factors.append(_link) return matching_factors + +@register.simple_tag(takes_context=True) +def user_sources(context): + """Return a list of all sources which are enabled for the user""" + user = context.get('request').user + _all_sources = Source.objects.filter(enabled=True).select_subclasses() + matching_sources = [] + for factor in _all_sources: + _link = factor.has_user_settings() + policy_engine = PolicyEngine(factor.policies.all()) + policy_engine.for_user(user).with_request(context.get('request')).build() + if policy_engine.passing and _link: + matching_sources.append(_link) + return matching_sources diff --git a/passbook/oauth_client/models.py b/passbook/oauth_client/models.py index d7eb37fac..451e0342b 100644 --- a/passbook/oauth_client/models.py +++ b/passbook/oauth_client/models.py @@ -1,7 +1,7 @@ """OAuth Client models""" from django.db import models -from django.urls import reverse_lazy +from django.urls import reverse, reverse_lazy from django.utils.translation import gettext as _ from passbook.core.models import Source, UserSourceConnection @@ -38,6 +38,16 @@ class OAuthSource(Source): return "Callback URL: '%s'" % reverse_lazy('passbook_oauth_client:oauth-client-callback', kwargs={'source_slug': self.slug}) + def has_user_settings(self): + """Entrypoint to integrate with User settings. Can either return False if no + user settings are available, or a tuple or string, string, string where the first string + is the name the item has, the second string is the icon and the third is the view-name.""" + icon = 'img/%s.svg' % self.get_login_button[1] + view_name = 'passbook_oauth_client:oauth-client-user' + return self.name, icon, reverse((view_name), kwargs={ + 'source_slug': self.slug + }) + class Meta: verbose_name = _('Generic OAuth Source') diff --git a/passbook/oauth_client/templates/account/dyn_extra/10_pre.html b/passbook/oauth_client/templates/account/dyn_extra/10_pre.html deleted file mode 100644 index e3b748c9f..000000000 --- a/passbook/oauth_client/templates/account/dyn_extra/10_pre.html +++ /dev/null @@ -1,6 +0,0 @@ -{% load passbook_oauth_client %} - -{% any_provider as enabled %} -{% if enabled %} -
    -{% endif %} diff --git a/passbook/oauth_client/templates/account/dyn_extra/11_facebook.html b/passbook/oauth_client/templates/account/dyn_extra/11_facebook.html deleted file mode 100644 index 2ab75301e..000000000 --- a/passbook/oauth_client/templates/account/dyn_extra/11_facebook.html +++ /dev/null @@ -1,6 +0,0 @@ -{% load passbook_oauth_client %} - -{% provider_exists 'facebook' as facebook_enabled %} -{% if facebook_enabled %} - -{% endif %} diff --git a/passbook/oauth_client/templates/account/dyn_extra/12_twitter.html b/passbook/oauth_client/templates/account/dyn_extra/12_twitter.html deleted file mode 100644 index 297498f19..000000000 --- a/passbook/oauth_client/templates/account/dyn_extra/12_twitter.html +++ /dev/null @@ -1,6 +0,0 @@ -{% load passbook_oauth_client %} - -{% provider_exists 'twitter' as twitter_enabled %} -{% if twitter_enabled %} - -{% endif %} diff --git a/passbook/oauth_client/templates/account/dyn_extra/13_google.html b/passbook/oauth_client/templates/account/dyn_extra/13_google.html deleted file mode 100644 index 59774061b..000000000 --- a/passbook/oauth_client/templates/account/dyn_extra/13_google.html +++ /dev/null @@ -1,7 +0,0 @@ -{% load passbook_oauth_client %} -{% load static %} - -{% provider_exists 'google' as google_enabled %} -{% if google_enabled %} - -{% endif %} diff --git a/passbook/oauth_client/templates/account/dyn_extra/15_github.html b/passbook/oauth_client/templates/account/dyn_extra/15_github.html deleted file mode 100644 index 43dba5d68..000000000 --- a/passbook/oauth_client/templates/account/dyn_extra/15_github.html +++ /dev/null @@ -1,6 +0,0 @@ -{% load passbook_oauth_client %} - -{% provider_exists 'github' as github_enabled %} -{% if github_enabled %} - -{% endif %} diff --git a/passbook/oauth_client/templates/account/dyn_extra/16_discord.html b/passbook/oauth_client/templates/account/dyn_extra/16_discord.html deleted file mode 100644 index 44248fb3d..000000000 --- a/passbook/oauth_client/templates/account/dyn_extra/16_discord.html +++ /dev/null @@ -1,7 +0,0 @@ -{% load passbook_oauth_client %} -{% load static %} - -{% provider_exists 'discord' as discord_enabled %} -{% if discord_enabled %} - -{% endif %} diff --git a/passbook/oauth_client/templates/account/dyn_extra/17_reddit.html b/passbook/oauth_client/templates/account/dyn_extra/17_reddit.html deleted file mode 100644 index 64d2241f6..000000000 --- a/passbook/oauth_client/templates/account/dyn_extra/17_reddit.html +++ /dev/null @@ -1,7 +0,0 @@ -{% load passbook_oauth_client %} -{% load static %} - -{% provider_exists 'reddit' as reddit_enabled %} -{% if reddit_enabled %} - -{% endif %} diff --git a/passbook/oauth_client/templates/account/dyn_extra/19_post.html b/passbook/oauth_client/templates/account/dyn_extra/19_post.html deleted file mode 100644 index 461971d9d..000000000 --- a/passbook/oauth_client/templates/account/dyn_extra/19_post.html +++ /dev/null @@ -1,6 +0,0 @@ -{% load passbook_oauth_client %} - -{% any_provider as enabled %} -{% if enabled %} -
    -{% endif %} diff --git a/passbook/oauth_client/templates/mod/auth/oauth/client/settings.html b/passbook/oauth_client/templates/mod/auth/oauth/client/settings.html deleted file mode 100644 index 582013a06..000000000 --- a/passbook/oauth_client/templates/mod/auth/oauth/client/settings.html +++ /dev/null @@ -1,54 +0,0 @@ -{% extends "user/base.html" %} - -{% load utils %} -{% load i18n %} - -{% block title %} -{% title "Overview" %} -{% endblock %} - -{% block content %} -

    {% trans "OAuth2" %}

    -
    -
    -
    -
    - {% trans "Connected Accounts" %} -
    -
    - {% if provider_state %} - - - - - - - - - - {% for data in provider_state %} - - - - - - - - {% endfor %} - -
    - {% trans 'Provider' %}{% trans 'Status' %}{% trans 'Action' %}{% trans 'ID' %}
    {% trans data.provider.ui_name %}{{ data.state|yesno:"Connected,Not Connected" }} - {% if data.state == False %} - Connect - {% else %} - Disconnect - {% endif %} - {{ data.aas.first.identifier }}
    - {% else %} -

    {% trans "No Providers configured!" %}

    - {% endif %} -
    -
    -
    -
    -{% endblock %} diff --git a/passbook/oauth_client/templates/oauth_client/user.html b/passbook/oauth_client/templates/oauth_client/user.html new file mode 100644 index 000000000..689a11888 --- /dev/null +++ b/passbook/oauth_client/templates/oauth_client/user.html @@ -0,0 +1,18 @@ +{% extends "user/base.html" %} + +{% load i18n %} + +{% block page %} +

    {{ source.name }}

    +{% if connections.exists %} +

    {% trans 'Connected.' %}

    + + {% trans 'Disconnect' %} + +{% else %} +

    Not connected.

    + + {% trans 'Connect' %} + +{% endif %} +{% endblock %} diff --git a/passbook/oauth_client/urls.py b/passbook/oauth_client/urls.py index 1469fad08..e633f0a3a 100644 --- a/passbook/oauth_client/urls.py +++ b/passbook/oauth_client/urls.py @@ -3,7 +3,7 @@ from django.urls import path from passbook.oauth_client.source_types.manager import RequestKind -from passbook.oauth_client.views import core, dispatcher +from passbook.oauth_client.views import core, dispatcher, user urlpatterns = [ path('login//', dispatcher.DispatcherView.as_view( @@ -12,4 +12,6 @@ urlpatterns = [ kind=RequestKind.callback), name='oauth-client-callback'), path('disconnect//', core.DisconnectView.as_view(), name='oauth-client-disconnect'), + path('user//', user.UserSettingsView.as_view(), + name='oauth-client-user'), ] diff --git a/passbook/oauth_client/views/user.py b/passbook/oauth_client/views/user.py new file mode 100644 index 000000000..0fd3378e5 --- /dev/null +++ b/passbook/oauth_client/views/user.py @@ -0,0 +1,20 @@ +"""passbook oauth_client user views""" +from django.contrib.auth.mixins import LoginRequiredMixin +from django.shortcuts import get_object_or_404 +from django.views.generic import TemplateView + +from passbook.oauth_client.models import OAuthSource, UserOAuthSourceConnection + + +class UserSettingsView(LoginRequiredMixin, TemplateView): + """Show user current connection state""" + + template_name = 'oauth_client/user.html' + + def get_context_data(self, **kwargs): + source = get_object_or_404(OAuthSource, slug=self.kwargs.get('source_slug')) + connections = UserOAuthSourceConnection.objects.filter(user=self.request.user, + source=source) + kwargs['source'] = source + kwargs['connections'] = connections + return super().get_context_data(**kwargs)