From 5a3c1137abb01b00bba0388deaf013674bb85c10 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sat, 19 Sep 2020 00:31:57 +0200
Subject: [PATCH] providers/oauth2: add more info to configuration modal

---
 passbook/providers/oauth2/models.py           |  4 ++--
 .../providers/oauth2/setup_url_modal.html     | 20 ++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/passbook/providers/oauth2/models.py b/passbook/providers/oauth2/models.py
index 4baa7b97f..647ddd899 100644
--- a/passbook/providers/oauth2/models.py
+++ b/passbook/providers/oauth2/models.py
@@ -293,6 +293,7 @@ class OAuth2Provider(Provider):
                 "providers/oauth2/setup_url_modal.html",
                 {
                     "provider": self,
+                    "issuer": self.get_issuer(request),
                     "authorize": request.build_absolute_uri(
                         reverse("passbook_providers_oauth2:authorize",)
                     ),
@@ -339,7 +340,6 @@ class BaseGrantModel(models.Model):
         abstract = True
 
 
-# pylint: disable=too-many-instance-attributes
 class AuthorizationCode(ExpiringModel, BaseGrantModel):
     """OAuth2 Authorization Code"""
 
@@ -366,7 +366,7 @@ class AuthorizationCode(ExpiringModel, BaseGrantModel):
 
 
 @dataclass
-# plyint: disable=too-many-instance-attributes
+# pylint: disable=too-many-instance-attributes
 class IDToken:
     """The primary extension that OpenID Connect makes to OAuth 2.0 to enable End-Users to be
     Authenticated is the ID Token data structure. The ID Token is a security token that contains
diff --git a/passbook/providers/oauth2/templates/providers/oauth2/setup_url_modal.html b/passbook/providers/oauth2/templates/providers/oauth2/setup_url_modal.html
index c653dabbe..51bd4e2e9 100644
--- a/passbook/providers/oauth2/templates/providers/oauth2/setup_url_modal.html
+++ b/passbook/providers/oauth2/templates/providers/oauth2/setup_url_modal.html
@@ -13,6 +13,19 @@
             </div>
             <div class="pf-c-modal-box__body" id="modal-description">
                 <form class="pf-c-form">
+                    <div class="pf-c-form__group">
+                        <label class="pf-c-form__label" for="help-text-simple-form-name">
+                            <span class="pf-c-form__label-text">{% trans 'OpenID Configuration URL' %}</span>
+                        </label>
+                        <input class="pf-c-form-control" readonly type="text" value="{{ provider_info }}" />
+                    </div>
+                    <div class="pf-c-form__group">
+                        <label class="pf-c-form__label" for="help-text-simple-form-name">
+                            <span class="pf-c-form__label-text">{% trans 'OpenID Configuration Issuer' %}</span>
+                        </label>
+                        <input class="pf-c-form-control" readonly type="text" value="{{ issuer }}" />
+                    </div>
+                    <hr>
                     <div class="pf-c-form__group">
                         <label class="pf-c-form__label" for="help-text-simple-form-name">
                             <span class="pf-c-form__label-text">{% trans 'Authorize URL' %}</span>
@@ -31,13 +44,6 @@
                         </label>
                         <input class="pf-c-form-control" readonly type="text" value="{{ userinfo }}" />
                     </div>
-                    <hr>
-                    <div class="pf-c-form__group">
-                        <label class="pf-c-form__label" for="help-text-simple-form-name">
-                            <span class="pf-c-form__label-text">{% trans 'OpenID Configuration URL' %}</span>
-                        </label>
-                        <input class="pf-c-form-control" readonly type="text" value="{{ provider_info }}" />
-                    </div>
                 </form>
             </div>
             <footer class="pf-c-modal-box__footer pf-m-align-left">