From d3fd75bff4ef08882defdb08850e2bfb75113cdf Mon Sep 17 00:00:00 2001 From: zurdi Date: Tue, 18 Jun 2024 19:20:26 +0200 Subject: [PATCH] format from trunk --- backend/handler/auth/base_handler.py | 6 ++++-- backend/handler/auth/middleware.py | 26 +++++++++++++++----------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/backend/handler/auth/base_handler.py b/backend/handler/auth/base_handler.py index a6c8b8102..b78c4ce34 100644 --- a/backend/handler/auth/base_handler.py +++ b/backend/handler/auth/base_handler.py @@ -5,8 +5,8 @@ from config import ROMM_AUTH_PASSWORD, ROMM_AUTH_SECRET_KEY, ROMM_AUTH_USERNAME from exceptions.auth_exceptions import OAuthCredentialsException from fastapi import HTTPException, status from joserfc import jwt -from joserfc.jwk import OctKey from joserfc.errors import BadSignatureError +from joserfc.jwk import OctKey from passlib.context import CryptContext from sqlalchemy.exc import IntegrityError from starlette.requests import HTTPConnection @@ -125,7 +125,9 @@ class OAuthHandler: to_encode.update({"exp": expire}) - return jwt.encode({"alg": ALGORITHM}, to_encode, OctKey.import_key(ROMM_AUTH_SECRET_KEY)) + return jwt.encode( + {"alg": ALGORITHM}, to_encode, OctKey.import_key(ROMM_AUTH_SECRET_KEY) + ) async def get_current_active_user_from_bearer_token(self, token: str): from handler.database import db_user_handler diff --git a/backend/handler/auth/middleware.py b/backend/handler/auth/middleware.py index 7b6b64975..37a1f325e 100644 --- a/backend/handler/auth/middleware.py +++ b/backend/handler/auth/middleware.py @@ -3,8 +3,8 @@ import typing from collections import namedtuple from joserfc import jwt -from joserfc.jwk import OctKey from joserfc.errors import BadSignatureError +from joserfc.jwk import OctKey from starlette.datastructures import MutableHeaders, Secret from starlette.requests import HTTPConnection from starlette.types import ASGIApp, Message, Receive, Scope, Send @@ -50,11 +50,13 @@ class SessionMiddleware: ) token = jwt.decode( _jwt, - key=OctKey.import_key(str( - self.jwt_secret.decode - if self.jwt_secret.decode - else self.jwt_secret.encode - )), + key=OctKey.import_key( + str( + self.jwt_secret.decode + if self.jwt_secret.decode + else self.jwt_secret.encode + ) + ), ) assert token.claims == {"1": 2}, "wrong crypto setup" assert token.header == {"typ": "JWT", "alg": jwt_alg}, "wrong crypto setup" @@ -94,11 +96,13 @@ class SessionMiddleware: try: jwt_payload = jwt.decode( data, - key=OctKey.import_key(str( - self.jwt_secret.decode - if self.jwt_secret.decode - else self.jwt_secret.encode - )), + key=OctKey.import_key( + str( + self.jwt_secret.decode + if self.jwt_secret.decode + else self.jwt_secret.encode + ) + ), ) jwt_claims = self._validate_jwt_payload(jwt_payload)