Maxime Grenu
11 hours ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with
20 additions and
5 deletions
-
fastapi/security/oauth2.py
-
tests/test_security_oauth2.py
-
tests/test_security_oauth2_optional.py
-
tests/test_security_oauth2_optional_description.py
|
|
|
@ -255,7 +255,7 @@ class OAuth2PasswordRequestFormStrict(OAuth2PasswordRequestForm): |
|
|
|
], |
|
|
|
password: Annotated[ |
|
|
|
str, |
|
|
|
Form(), |
|
|
|
Form(json_schema_extra={"format": "password"}), |
|
|
|
Doc( |
|
|
|
""" |
|
|
|
`password` string. The OAuth2 spec requires the exact field name |
|
|
|
@ -306,7 +306,7 @@ class OAuth2PasswordRequestFormStrict(OAuth2PasswordRequestForm): |
|
|
|
] = None, |
|
|
|
client_secret: Annotated[ |
|
|
|
str | None, |
|
|
|
Form(), |
|
|
|
Form(json_schema_extra={"format": "password"}), |
|
|
|
Doc( |
|
|
|
""" |
|
|
|
If there's a `client_secret` (and a `client_id`), they can be sent |
|
|
|
|
|
|
|
@ -213,7 +213,11 @@ def test_openapi_schema(): |
|
|
|
"type": "string", |
|
|
|
}, |
|
|
|
"username": {"title": "Username", "type": "string"}, |
|
|
|
"password": {"title": "Password", "type": "string"}, |
|
|
|
"password": { |
|
|
|
"title": "Password", |
|
|
|
"type": "string", |
|
|
|
"format": "password", |
|
|
|
}, |
|
|
|
"scope": { |
|
|
|
"title": "Scope", |
|
|
|
"type": "string", |
|
|
|
@ -226,6 +230,7 @@ def test_openapi_schema(): |
|
|
|
"client_secret": { |
|
|
|
"title": "Client Secret", |
|
|
|
"anyOf": [{"type": "string"}, {"type": "null"}], |
|
|
|
"format": "password", |
|
|
|
}, |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
@ -214,7 +214,11 @@ def test_openapi_schema(): |
|
|
|
"type": "string", |
|
|
|
}, |
|
|
|
"username": {"title": "Username", "type": "string"}, |
|
|
|
"password": {"title": "Password", "type": "string"}, |
|
|
|
"password": { |
|
|
|
"title": "Password", |
|
|
|
"type": "string", |
|
|
|
"format": "password", |
|
|
|
}, |
|
|
|
"scope": { |
|
|
|
"title": "Scope", |
|
|
|
"type": "string", |
|
|
|
@ -227,6 +231,7 @@ def test_openapi_schema(): |
|
|
|
"client_secret": { |
|
|
|
"title": "Client Secret", |
|
|
|
"anyOf": [{"type": "string"}, {"type": "null"}], |
|
|
|
"format": "password", |
|
|
|
}, |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
@ -215,7 +215,11 @@ def test_openapi_schema(): |
|
|
|
"type": "string", |
|
|
|
}, |
|
|
|
"username": {"title": "Username", "type": "string"}, |
|
|
|
"password": {"title": "Password", "type": "string"}, |
|
|
|
"password": { |
|
|
|
"title": "Password", |
|
|
|
"type": "string", |
|
|
|
"format": "password", |
|
|
|
}, |
|
|
|
"scope": { |
|
|
|
"title": "Scope", |
|
|
|
"type": "string", |
|
|
|
@ -228,6 +232,7 @@ def test_openapi_schema(): |
|
|
|
"client_secret": { |
|
|
|
"title": "Client Secret", |
|
|
|
"anyOf": [{"type": "string"}, {"type": "null"}], |
|
|
|
"format": "password", |
|
|
|
}, |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
