[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

src/bornhack/settings.py

@@ -221,22 +221,18 @@
     "SCOPES": {
         # required
         "openid": "OpenID Connect scope",
-
         # deprecated api scope, remove after 2025 camp
         "profile:read": "Allow the remote site to read your bornhack.dk username (uuid), user id, profile public credit name, profile description, and a list of team memberships using the profile API endpoint (scope profile:read). NOTE: This scope is being deprecated soon! Ask the BornHack website team for more info.",
-
         # standard OIDC claim scopes
         "profile": "Allow the remote site to read your profile public_credit_name, description, and update time (scope: profile)",
         "email": "Allow the remote site to read your email address (scope: email)",
         "address": "Allow the remote site to read your profile location (scope: address)",
         "phone": "Allow the remote site to read your profile phonenumber (scope: phone)",
-
         # custom bornhack user claim scopes
         "groups:read": "Allow the remote site to read a list of your group memberships (scope: groups:read).",
         "location:read": "Allow the remote site to read your profile location (scope: loocation:read)",
         "permissions:read": "Allow the remote site to read a list of your assigned permissions (scope: permissions:read).",
         "teams:read": "Allow the remote site to read a list of your team memberships and team lead status (scope: teams:read)",
-
         # api scopes
         "phonebook:admin": "Allow the remote site to read the camp phonebook, including service numbers and unlisted numbers. Also allow the remote site to use to the POC API. This scope is only relevant for POC team leads (scope: phonebook:admin).",
         "phonebook:read": "Allow the remote site to read the camp phonebook (scope: phonebook:read).",

src/profiles/forms.py

@@ -1,9 +1,15 @@
 from django import forms
 from bornhack.oauth_validators import BornhackOAuth2Validator
 
+
 def get_scopes() -> list[str]:
     validator = BornhackOAuth2Validator()
-    return ((scope, scope) for scope in sorted(set(validator.oidc_claim_scope.values())) if scope!="openid")
+    return (
+        (scope, scope)
+        for scope in sorted(set(validator.oidc_claim_scope.values()))
+        if scope != "openid"
+    )
+
 
 class OIDCForm(forms.Form):
     scopes = forms.MultipleChoiceField(

src/profiles/templates/oidc.html

@@ -11,53 +11,53 @@
       <h4>OIDC Claims</h4>
     </div>
     <div class="card-body">
-        <p class="lead">When using BornHack as an IDP (logging into other sites using your BornHack account) you can control which <i>user claims</i> are shared with the remote site by asking for one or more of the following <i>claim scopes</i>:</p>
+      <p class="lead">When using BornHack as an IDP (logging into other sites using your BornHack account) you can control which <i>user claims</i> are shared with the remote site by asking for one or more of the following <i>claim scopes</i>:</p>
       <p><ul>
         {% for scope in all_scopes %}
-        <li><code>{{ scope }}</code></li>
+          <li><code>{{ scope }}</code></li>
         {% endfor %}
       </ul></p>
       <p>Note: In addition to this list the default <code>openid</code> scope is available (it is part of the standard) and must always be included when asking for a jwt.</p>
       <p class="lead">This form allows you to see which OIDC user claims are returned for your user with any combination of scopes.</p>
       <form method="GET">
-      {% bootstrap_form form %}
-      <button class="btn btn-primary" type="submit">Submit</button>
+        {% bootstrap_form form %}
+        <button class="btn btn-primary" type="submit">Submit</button>
       </form>
       <hr>
       {% if not active_scopes %}
-      <p class="lead">Select scopes in the form to see user claims</p>
+        <p class="lead">Select scopes in the form to see user claims</p>
       {% else %}
-      <p class="lead">The following user claims will be returned in a jwt with these scopes:</p>
-      <p>
-      <ul>
-      {% for scope in active_scopes %}
-      <li><code>{{ scope }}</code></li>
-      {% endfor %}
-      </ul>
-      </p>
-      <table class="table table-striped">
-        <tr>
-          <th>Claim Name</th>
-          <th>Required Scope</th>
-          <th>Claim Value (JSON)</th>
-        </tr>
-        <tr>
-          <td><code>sub</code></td>
-          <td><code>openid</code></td>
-          <td>{{ request.user.username }}</td>
-        </tr>
-        {% for claim, value in claims.items %}
-        {% for claimname, scope in scopes.items %}
-        {% if claimname == claim %}
+        <p class="lead">The following user claims will be returned in a jwt with these scopes:</p>
+        <p>
+          <ul>
+            {% for scope in active_scopes %}
+              <li><code>{{ scope }}</code></li>
+            {% endfor %}
+          </ul>
+        </p>
+        <table class="table table-striped">
           <tr>
-            <td><code>{{ claim }}</code></td>
-            <td><code>{{ scope }}</code></td>
-            <td>{{ value }}</td>
+            <th>Claim Name</th>
+            <th>Required Scope</th>
+            <th>Claim Value (JSON)</th>
           </tr>
-        {% endif %}
-        {% endfor %}
-        {% endfor %}
-      </table>
+          <tr>
+            <td><code>sub</code></td>
+            <td><code>openid</code></td>
+            <td>{{ request.user.username }}</td>
+          </tr>
+          {% for claim, value in claims.items %}
+            {% for claimname, scope in scopes.items %}
+              {% if claimname == claim %}
+                <tr>
+                  <td><code>{{ claim }}</code></td>
+                  <td><code>{{ scope }}</code></td>
+                  <td>{{ value }}</td>
+                </tr>
+              {% endif %}
+            {% endfor %}
+          {% endfor %}
+        </table>
       {% endif %}
     </div>
   </div>

src/profiles/templates/profile_base.html

@@ -94,7 +94,7 @@ <h2>Your BornHack Account</h2>
         {% url 'profiles:oidc' as profile_oidc_url %}
         <li class="nav-item">
           <a class="nav-link{% if request.path == profile_oidc_url %} active{% endif %}" href="{{ profile_oidc_url }}">
-              OIDC Scope<i class="fas fa-arrow-right"></i>Claim
+            OIDC Scope<i class="fas fa-arrow-right"></i>Claim
           </a>
         </li>
 

src/profiles/views.py

@@ -122,7 +122,7 @@ def get_form(self, form_class=None):
         if form_class is None:
             form_class = self.get_form_class()
             scopes = self.request.GET.getlist(key="scopes")
-            self.initial['scopes'] = scopes
+            self.initial["scopes"] = scopes
         return form_class(**self.get_form_kwargs())
 
     def get_context_data(self, **kwargs):
@@ -133,7 +133,9 @@ def get_context_data(self, **kwargs):
             if scope in self.request.GET.getlist(key="scopes"):
                 context["claims"][claim] = value
         context["scopes"] = self.scopes
-        context["active_scopes"] = ["openid"] + sorted(set(self.request.GET.getlist(key="scopes")))
+        context["active_scopes"] = ["openid"] + sorted(
+            set(self.request.GET.getlist(key="scopes"))
+        )
         context["all_scopes"] = sorted(set(self.scopes.values()))
-        del(context["all_scopes"][context["all_scopes"].index("openid")])
+        del context["all_scopes"][context["all_scopes"].index("openid")]
         return context