bump version: 0.1.23-beta -> 0.1.24-beta

prepare 0.1.24
Merge branch '32-automatically-set-owner-field-when-creating-oauth-provider' into 'master'
2019-03-20 23:00:33 +01:00 · 2019-03-20 23:00:22 +01:00 · 2019-03-20 21:20:54 +00:00 · 2019-03-20 21:17:36 +00:00 · 2019-03-20 20:09:27 +01:00 · 2019-03-20 20:03:28 +01:00
26 changed files with 121 additions and 22 deletions
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.23-beta
+current_version = 0.1.24-beta
 tag = True
 commit = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-(?P<release>.*)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -54,7 +54,7 @@ package-docker:
    before_script:
        - echo "{\"auths\":{\"docker.$NEXUS_URL\":{\"auth\":\"$NEXUS_AUTH\"}}}" > /kaniko/.docker/config.json
    script:
-        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.pkg.beryju.org/passbook:latest --destination docker.pkg.beryju.org/passbook:0.1.23-beta
+        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.pkg.beryju.org/passbook:latest --destination docker.pkg.beryju.org/passbook:0.1.24-beta
    stage: build
    only:
        - tags
--- a/client-packages/allauth/setup.py
+++ b/client-packages/allauth/setup.py
@ -3,7 +3,7 @@ from setuptools import setup

 setup(
    name='django-allauth-passbook',
-    version='0.1.23-beta',
+    version='0.1.24-beta',
    description='passbook support for django-allauth',
    # long_description='\n'.join(read_simple('docs/index.md')[2:]),
    long_description_content_type='text/markdown',
--- a/client-packages/sentry-auth-passbook/setup.py
+++ b/client-packages/sentry-auth-passbook/setup.py
@ -18,7 +18,7 @@ tests_require = [

 setup(
    name='sentry-auth-passbook',
-    version='0.1.23-beta',
+    version='0.1.24-beta',
    author='BeryJu.org',
    author_email='support@beryju.org',
    url='https://passbook.beryju.org',
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,11 @@
+passbook (0.1.24) stable; urgency=medium
+
+  * bump version: 0.1.22-beta -> 0.1.23-beta
+  * add modal for OAuth Providers showing the URLs
+  * remove user field from form. Closes #32
+
+ -- Jens Langhammer <jens.langhammer@beryju.org>  Wed, 20 Mar 2019 21:59:21 +0000
+
 passbook (0.1.23) stable; urgency=medium

  * add support for OpenID-Connect Discovery
--- a/helm/passbook/Chart.yaml
+++ b/helm/passbook/Chart.yaml
@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "0.1.23-beta"
+appVersion: "0.1.24-beta"
 description: A Helm chart for passbook.
 name: passbook
-version: "0.1.23-beta"
+version: "0.1.24-beta"
 icon: https://passbook.beryju.org/images/logo.png
--- a/helm/passbook/values.yaml
+++ b/helm/passbook/values.yaml
@ -5,7 +5,7 @@
 replicaCount: 1

 image:
-  tag: 0.1.23-beta
+  tag: 0.1.24-beta

 nameOverride: ""

--- a/passbook/init.py
+++ b/passbook/init.py
@ -1,2 +1,2 @@
 """passbook"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/admin/init.py
+++ b/passbook/admin/init.py
@ -1,2 +1,2 @@
 """passbook admin"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/admin/templates/administration/provider/list.html
+++ b/passbook/admin/templates/administration/provider/list.html
@ -57,6 +57,10 @@
                    <a class="btn btn-default btn-sm"
                        href="{{ href }}?back={{ request.get_full_path }}">{% trans name %}</a>
                    {% endfor %}
+                    {% get_htmls provider as htmls %}
+                    {% for html in htmls %}
+                    {{ html|safe }}
+                    {% endfor %}
                </td>
            </tr>
            {% endfor %}
--- a/passbook/admin/templatetags/admin_reflection.py
+++ b/passbook/admin/templatetags/admin_reflection.py
@ -5,6 +5,8 @@ from logging import getLogger
 from django import template
 from django.db.models import Model

+from passbook.lib.utils.template import render_to_string
+
 register = template.Library()
 LOGGER = getLogger(__name__)

@ -29,3 +31,24 @@ def get_links(model_instance):
        pass

    return links
+
+
+@register.simple_tag(takes_context=True)
+def get_htmls(context, model_instance):
+    """Find all html_ methods on an object instance, run them and return as dict"""
+    prefix = 'html_'
+    htmls = []
+
+    if not isinstance(model_instance, Model):
+        LOGGER.warning("Model %s is not instance of Model", model_instance)
+        return htmls
+
+    try:
+        for name, method in inspect.getmembers(model_instance, predicate=inspect.ismethod):
+            if name.startswith(prefix):
+                template, _context = method(context.get('request'))
+                htmls.append(render_to_string(template, _context))
+    except NotImplementedError:
+        pass
+
+    return htmls
--- a/passbook/api/init.py
+++ b/passbook/api/init.py
@ -1,2 +1,2 @@
 """passbook api"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/audit/init.py
+++ b/passbook/audit/init.py
@ -1,2 +1,2 @@
 """passbook audit Header"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/captcha_factor/init.py
+++ b/passbook/captcha_factor/init.py
@ -1,2 +1,2 @@
 """passbook captcha_factor Header"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/core/init.py
+++ b/passbook/core/init.py
@ -1,2 +1,2 @@
 """passbook core"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/hibp_policy/init.py
+++ b/passbook/hibp_policy/init.py
@ -1,2 +1,2 @@
 """passbook hibp_policy"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/ldap/init.py
+++ b/passbook/ldap/init.py
@ -1,2 +1,2 @@
 """Passbook ldap app Header"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/lib/init.py
+++ b/passbook/lib/init.py
@ -1,2 +1,2 @@
 """passbook lib"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/oauth_client/init.py
+++ b/passbook/oauth_client/init.py
@ -1,2 +1,2 @@
 """passbook oauth_client Header"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/oauth_provider/init.py
+++ b/passbook/oauth_provider/init.py
@ -1,2 +1,2 @@
 """passbook oauth_provider Header"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/oauth_provider/forms.py
+++ b/passbook/oauth_provider/forms.py
@ -11,5 +11,5 @@ class OAuth2ProviderForm(forms.ModelForm):
    class Meta:

        model = OAuth2Provider
-        fields = ['name', 'user', 'redirect_uris', 'client_type',
+        fields = ['name', 'redirect_uris', 'client_type',
                  'authorization_grant_type', 'client_id', 'client_secret', ]
--- a/passbook/oauth_provider/models.py
+++ b/passbook/oauth_provider/models.py
@ -1,5 +1,6 @@
 """Oauth2 provider product extension"""

+from django.shortcuts import reverse
 from django.utils.translation import gettext as _
 from oauth2_provider.models import AbstractApplication

@ -14,6 +15,20 @@ class OAuth2Provider(Provider, AbstractApplication):
    def __str__(self):
        return "OAuth2 Provider %s" % self.name

+    def html_setup_urls(self, request):
+        """return template and context modal with URLs for authorize, token, openid-config, etc"""
+        return "oauth2_provider/setup_url_modal.html", {
+            'provider': self,
+            'authorize_url': request.build_absolute_uri(
+                reverse('passbook_oauth_provider:oauth2-authorize')),
+            'token_url': request.build_absolute_uri(
+                reverse('passbook_oauth_provider:token')),
+            'userinfo_url': request.build_absolute_uri(
+                reverse('passbook_api:openid')),
+            'openid_url': request.build_absolute_uri(
+                reverse('passbook_oauth_provider:openid-discovery'))
+        }
+
    class Meta:

        verbose_name = _('OAuth2 Provider')
--- a/passbook/oauth_provider/templates/oauth2_provider/setup_url_modal.html
+++ b/passbook/oauth_provider/templates/oauth2_provider/setup_url_modal.html
@ -0,0 +1,49 @@
+{% load i18n %}
+
+<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#{{ provider.pk }}">{% trans 'View Setup URLs' %}</button>
+<div class="modal fade" id="{{ provider.pk }}" tabindex="-1" role="dialog" aria-labelledby="{{ provider.pk }}Label" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true" aria-label="Close">
+          <span class="pficon pficon-close"></span>
+        </button>
+        <h4 class="modal-title" id="{{ provider.pk }}Label">{% trans 'Setup URLs' %}</h4>
+      </div>
+      <div class="modal-body">
+        <form class="form-horizontal">
+          <div class="form-group">
+            <label class="col-sm-3 control-label">{% trans 'Authroize URL' %}</label>
+            <div class="col-sm-9">
+              <input type="text"class="form-control" readonly value="{{ authorize_url }}">
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="col-sm-3 control-label">{% trans 'Token URL' %}</label>
+            <div class="col-sm-9">
+              <input type="text" class="form-control" readonly value="{{ token_url }}">
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="col-sm-3 control-label">{% trans 'Userinfo Endpoint' %}</label>
+            <div class="col-sm-9">
+              <input type="text" class="form-control" readonly value="{{ userinfo_url }}">
+            </div>
+          </div>
+        </form>
+        <hr>
+        <form class="form-horizontal">
+          <div class="form-group">
+            <label class="col-sm-3 control-label">{% trans 'OpenID Configuration URL' %}</label>
+            <div class="col-sm-9">
+              <input type="text"class="form-control" readonly value="{{ openid_url }}">
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">{% trans 'Close' %}</button>
+      </div>
+    </div>
+  </div>
+</div>
--- a/passbook/otp/init.py
+++ b/passbook/otp/init.py
@ -1,2 +1,2 @@
 """passbook otp Header"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/password_expiry_policy/init.py
+++ b/passbook/password_expiry_policy/init.py
@ -1,2 +1,2 @@
 """passbook password_expiry"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/saml_idp/init.py
+++ b/passbook/saml_idp/init.py
@ -1,2 +1,2 @@
 """passbook saml_idp Header"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
Author	SHA1	Message	Date
Jens Langhammer	6f7b917c38	bump version: 0.1.23-beta -> 0.1.24-beta	2019-03-20 23:00:33 +01:00
Jens Langhammer	1456ee6d3e	prepare 0.1.24	2019-03-20 23:00:22 +01:00
Jens Langhammer	5155204283	Merge branch '32-automatically-set-owner-field-when-creating-oauth-provider' into 'master' Resolve "Automatically set owner field when creating OAuth Provider" Closes #32 See merge request BeryJu.org/passbook!16	2019-03-20 21:20:54 +00:00
Jens Langhammer	5509ec9b0f	Merge branch '29-oauth-provider-add-extra-info-button-to-show-urls' into 'master' Resolve "OAuth Provider: Add extra info button to show URLs" Closes #29 See merge request BeryJu.org/passbook!15	2019-03-20 21:17:36 +00:00
Jens Langhammer	d6f9b2e47d	remove user field from form. Closes #32	2019-03-20 20:09:27 +01:00
Jens Langhammer	67aa4aef11	add modal for OAuth Providers showing the URLs	2019-03-20 20:03:28 +01:00