From f0dc846ea2c0d10aee2427fb3303b28cc221a07f Mon Sep 17 00:00:00 2001
From: Salar Nosrati-Ershad <s3r@tutamail.com>
Date: Thu, 18 Apr 2024 18:23:28 +0330
Subject: [PATCH 1/3] add refreshurl to OAuth2PasswordBearer

---
 fastapi/openapi/models.py  |  1 +
 fastapi/security/oauth2.py | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/fastapi/openapi/models.py b/fastapi/openapi/models.py
index 5f3bdbb20..eb192f750 100644
--- a/fastapi/openapi/models.py
+++ b/fastapi/openapi/models.py
@@ -507,6 +507,7 @@ class OAuthFlowImplicit(OAuthFlow):
 
 class OAuthFlowPassword(OAuthFlow):
     tokenUrl: str
+    refreshUrl: Optional[str]
 
 
 class OAuthFlowClientCredentials(OAuthFlow):
diff --git a/fastapi/security/oauth2.py b/fastapi/security/oauth2.py
index 9720cace0..7ffb121da 100644
--- a/fastapi/security/oauth2.py
+++ b/fastapi/security/oauth2.py
@@ -408,6 +408,14 @@ class OAuth2PasswordBearer(OAuth2):
                 """
             ),
         ],
+        refreshUrl: Annotated[
+            Optional[str],
+            Doc(
+                """
+                The URL to refresh the token and obtain a new one.
+                """
+            ),
+        ],
         scheme_name: Annotated[
             Optional[str],
             Doc(
@@ -461,7 +469,9 @@ class OAuth2PasswordBearer(OAuth2):
         if not scopes:
             scopes = {}
         flows = OAuthFlowsModel(
-            password=cast(Any, {"tokenUrl": tokenUrl, "scopes": scopes})
+            password=cast(
+                Any, {"tokenUrl": tokenUrl, "refreshUrl": refreshUrl, "scopes": scopes}
+            )
         )
         super().__init__(
             flows=flows,

From c8c04115a17c100bb401e81c1e0b1f02859ab62d Mon Sep 17 00:00:00 2001
From: Salar Nosrati-Ershad <s3r@tutamail.com>
Date: Thu, 18 Apr 2024 20:14:21 +0330
Subject: [PATCH 2/3] some fixes

---
 fastapi/openapi/models.py  |  1 -
 fastapi/security/oauth2.py | 20 +++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/fastapi/openapi/models.py b/fastapi/openapi/models.py
index eb192f750..5f3bdbb20 100644
--- a/fastapi/openapi/models.py
+++ b/fastapi/openapi/models.py
@@ -507,7 +507,6 @@ class OAuthFlowImplicit(OAuthFlow):
 
 class OAuthFlowPassword(OAuthFlow):
     tokenUrl: str
-    refreshUrl: Optional[str]
 
 
 class OAuthFlowClientCredentials(OAuthFlow):
diff --git a/fastapi/security/oauth2.py b/fastapi/security/oauth2.py
index 7ffb121da..43bfd4354 100644
--- a/fastapi/security/oauth2.py
+++ b/fastapi/security/oauth2.py
@@ -408,14 +408,6 @@ class OAuth2PasswordBearer(OAuth2):
                 """
             ),
         ],
-        refreshUrl: Annotated[
-            Optional[str],
-            Doc(
-                """
-                The URL to refresh the token and obtain a new one.
-                """
-            ),
-        ],
         scheme_name: Annotated[
             Optional[str],
             Doc(
@@ -465,12 +457,22 @@ class OAuth2PasswordBearer(OAuth2):
                 """
             ),
         ] = True,
+        refreshUrl: Annotated[
+            Optional[str],
+            Doc(
+                """
+                The URL to refresh the token and obtain a new one.
+                """
+            ),
+        ] = None,
     ):
         if not scopes:
             scopes = {}
         flows = OAuthFlowsModel(
             password=cast(
-                Any, {"tokenUrl": tokenUrl, "refreshUrl": refreshUrl, "scopes": scopes}
+                Any,
+                {"tokenUrl": tokenUrl, "refreshUrl": refreshUrl, "scopes": scopes} if refreshUrl else
+                {"tokenUrl": tokenUrl, "scopes": scopes}
             )
         )
         super().__init__(

From 3122c3ad34922efdd15dfa8ea85b4e9de7edc526 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 18 Apr 2024 16:46:02 +0000
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=8E=A8=20[pre-commit.ci]=20Auto=20for?=
 =?UTF-8?q?mat=20from=20pre-commit.com=20hooks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fastapi/security/oauth2.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fastapi/security/oauth2.py b/fastapi/security/oauth2.py
index 43bfd4354..010019901 100644
--- a/fastapi/security/oauth2.py
+++ b/fastapi/security/oauth2.py
@@ -471,8 +471,9 @@ class OAuth2PasswordBearer(OAuth2):
         flows = OAuthFlowsModel(
             password=cast(
                 Any,
-                {"tokenUrl": tokenUrl, "refreshUrl": refreshUrl, "scopes": scopes} if refreshUrl else
-                {"tokenUrl": tokenUrl, "scopes": scopes}
+                {"tokenUrl": tokenUrl, "refreshUrl": refreshUrl, "scopes": scopes}
+                if refreshUrl
+                else {"tokenUrl": tokenUrl, "scopes": scopes},
             )
         )
         super().__init__(