diff --git a/examples/demonstration/router_api.py b/examples/demonstration/router_api.py index 6f18ddb..537c15a 100644 --- a/examples/demonstration/router_api.py +++ b/examples/demonstration/router_api.py @@ -28,6 +28,6 @@ def sim_auth(request: Request): max_age=request.auth.expires, expires=request.auth.expires, httponly=request.auth.http, - samesite=request.auth.samesite, + samesite=request.auth.same_site, ) return response diff --git a/src/fastapi_oauth2/config.py b/src/fastapi_oauth2/config.py index 954247c..da9ffea 100644 --- a/src/fastapi_oauth2/config.py +++ b/src/fastapi_oauth2/config.py @@ -10,7 +10,7 @@ class OAuth2Config: enable_ssr: bool allow_http: bool - samesite: str + same_site: str jwt_secret: str jwt_expires: int jwt_algorithm: str @@ -21,7 +21,7 @@ def __init__( *, enable_ssr: bool = True, allow_http: bool = False, - samesite: str = "lax", + same_site: str = "lax", jwt_secret: str = "", jwt_expires: Union[int, str] = 900, jwt_algorithm: str = "HS256", @@ -31,7 +31,7 @@ def __init__( os.environ["OAUTHLIB_INSECURE_TRANSPORT"] = "1" self.enable_ssr = enable_ssr self.allow_http = allow_http - self.samesite = samesite + self.same_site = same_site self.jwt_secret = jwt_secret self.jwt_expires = int(jwt_expires) self.jwt_algorithm = jwt_algorithm diff --git a/src/fastapi_oauth2/core.py b/src/fastapi_oauth2/core.py index c226e55..9f27ed3 100644 --- a/src/fastapi_oauth2/core.py +++ b/src/fastapi_oauth2/core.py @@ -145,7 +145,7 @@ async def token_redirect(self, request: Request, **kwargs) -> RedirectResponse: expires=request.auth.expires, secure=not request.auth.http, httponly=True, - samesite=request.auth.samesite, + samesite=request.auth.same_site, ) return response diff --git a/src/fastapi_oauth2/middleware.py b/src/fastapi_oauth2/middleware.py index 6ff5eb8..b3166b4 100644 --- a/src/fastapi_oauth2/middleware.py +++ b/src/fastapi_oauth2/middleware.py @@ -37,9 +37,9 @@ class Auth(AuthCredentials): ssr: bool http: bool - samesite: str secret: str expires: int + same_site: str algorithm: str scopes: List[str] provider: OAuth2Core @@ -91,9 +91,9 @@ def __init__( ) -> None: Auth.ssr = config.enable_ssr Auth.http = config.allow_http - Auth.samesite = config.samesite Auth.secret = config.jwt_secret Auth.expires = config.jwt_expires + Auth.same_site = config.same_site Auth.algorithm = config.jwt_algorithm Auth.clients = { client.backend.name: OAuth2Core(client) diff --git a/tests/conftest.py b/tests/conftest.py index 709b882..a71bc0e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -75,7 +75,7 @@ def auth(request: Request): max_age=request.auth.expires, expires=request.auth.expires, httponly=request.auth.http, - samesite=request.auth.samesite, + samesite=request.auth.same_site, ) return response