diff options
Diffstat (limited to 'gn_auth/auth')
| -rw-r--r-- | gn_auth/auth/authentication/oauth2/server.py | 11 | ||||
| -rw-r--r-- | gn_auth/auth/authorisation/resources/groups/views.py | 4 | ||||
| -rw-r--r-- | gn_auth/auth/authorisation/users/masquerade/models.py | 3 | ||||
| -rw-r--r-- | gn_auth/auth/authorisation/users/views.py | 1 |
4 files changed, 10 insertions, 9 deletions
diff --git a/gn_auth/auth/authentication/oauth2/server.py b/gn_auth/auth/authentication/oauth2/server.py index 7b65c8e..a8109b7 100644 --- a/gn_auth/auth/authentication/oauth2/server.py +++ b/gn_auth/auth/authentication/oauth2/server.py @@ -1,13 +1,10 @@ """Initialise the OAuth2 Server""" -import os import uuid -from pathlib import Path from typing import Callable -from datetime import datetime, timedelta +from datetime import datetime -from pymonad.either import Left from flask import Flask, current_app -from authlib.jose import jwt, KeySet, JsonWebKey +from authlib.jose import jwt, KeySet from authlib.oauth2.rfc6749.errors import InvalidClientError from authlib.integrations.flask_oauth2 import AuthorizationServer from authlib.oauth2.rfc6749 import OAuth2Request @@ -15,7 +12,9 @@ from authlib.integrations.flask_helpers import create_oauth_request from gn_auth.auth.db import sqlite3 as db from gn_auth.auth.jwks import ( - list_jwks, newest_jwk_with_rotation, jwks_directory, generate_and_save_private_key) + list_jwks, + jwks_directory, + newest_jwk_with_rotation) from .models.oauth2client import client as fetch_client from .models.oauth2token import OAuth2Token, save_token diff --git a/gn_auth/auth/authorisation/resources/groups/views.py b/gn_auth/auth/authorisation/resources/groups/views.py index f98783b..920f504 100644 --- a/gn_auth/auth/authorisation/resources/groups/views.py +++ b/gn_auth/auth/authorisation/resources/groups/views.py @@ -48,7 +48,9 @@ def create_group(): with require_oauth.acquire("profile group") as the_token: group_name=request_json().get("group_name", "").strip() if not bool(group_name): - raise GroupCreationError(f"Could not create the group. Invalid Group name provided was `{group_name}`") + raise GroupCreationError( + "Could not create the group. Invalid Group name provided was " + f"`{group_name}`") db_uri = current_app.config["AUTH_DB"] with db.connection(db_uri) as conn: diff --git a/gn_auth/auth/authorisation/users/masquerade/models.py b/gn_auth/auth/authorisation/users/masquerade/models.py index a55e462..8ac1a68 100644 --- a/gn_auth/auth/authorisation/users/masquerade/models.py +++ b/gn_auth/auth/authorisation/users/masquerade/models.py @@ -37,7 +37,8 @@ def can_masquerade(func): masq_privs = [] for roles in user_roles(conn, token.user): for role in roles["roles"]: - privileges = [p for p in role.privileges if p.privilege_id == "system:user:masquerade"] + privileges = [p for p in role.privileges + if p.privilege_id == "system:user:masquerade"] masq_privs.extend(privileges) if len(masq_privs) == 0: diff --git a/gn_auth/auth/authorisation/users/views.py b/gn_auth/auth/authorisation/users/views.py index 8559696..4b56c3d 100644 --- a/gn_auth/auth/authorisation/users/views.py +++ b/gn_auth/auth/authorisation/users/views.py @@ -312,7 +312,6 @@ def list_all_users() -> Response: @users.route("/handle-unverified", methods=["POST"]) def handle_unverified(): """Handle case where user tries to login but is unverified""" - form = request_json() email = request.args["email"] # TODO: Maybe have a GN2_URI setting here? # or pass the client_id here? |