From c254a34c33646261bfaff6fb4822f8881c904f31 Mon Sep 17 00:00:00 2001
From: chrisladden <cladden@om1.com>
Date: Mon, 31 Jul 2023 11:59:26 -0400
Subject: [PATCH 1/2] support pydantic v2

---
 fastapi_security/entities.py | 35 +++++++++++++++--------------------
 pyproject.toml               |  2 +-
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/fastapi_security/entities.py b/fastapi_security/entities.py
index a253df1..1cad85d 100644
--- a/fastapi_security/entities.py
+++ b/fastapi_security/entities.py
@@ -1,16 +1,26 @@
 from datetime import datetime
 from enum import Enum
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Annotated
+
+from pydantic import BaseModel, Field, field_validator
+from pydantic.functional_validators import BeforeValidator
 
-from pydantic import BaseModel, Field, validator
 
 __all__ = ("User",)
 
+def filtered_str_to_list(v: str) -> List[str]:
+    return [s for s in v.split(' ') if s] if isinstance(v, str) else v
+
+def str_to_list(v: str) -> List[str]:
+    return v.split(' ') if isinstance(v, str) else v
+
+FilteredStringList = Annotated[List[str], BeforeValidator(filtered_str_to_list)]
+StringList = Annotated[List[str], BeforeValidator(str_to_list)]
 
 class JwtAccessToken(BaseModel):
     iss: str = Field(..., description="Issuer")
     sub: str = Field(..., description="Subject")
-    aud: List[str] = Field(..., description="Audience")
+    aud: StringList = Field(..., description="Audience")
     iat: datetime = Field(..., description="Issued At")
     exp: datetime = Field(..., description="Expiration Time")
     azp: str = Field(
@@ -21,28 +31,13 @@ class JwtAccessToken(BaseModel):
         "",
         description="Grant type (auth0 specific, see https://auth0.com/docs/applications/concepts/application-grant-types)",
     )
-    scope: List[str] = Field("", description="Scope Values")
-    permissions: List[str] = Field(
+    scope: FilteredStringList = Field([], description="Scope Values")
+    permissions: StringList = Field(
         [],
         description="Permissions (auth0 specific, intended for first-party app authorization)",
     )
     raw: str = Field(..., description="The raw access token")
 
-    @validator("aud", pre=True, always=True)
-    def aud_to_list(cls, v):
-        return v.split(" ") if isinstance(v, str) else v
-
-    @validator("scope", pre=True, always=True)
-    def scope_to_list(cls, v):
-        if isinstance(v, str):
-            return [s for s in v.split(" ") if s]
-        else:
-            return v
-
-    @validator("permissions", pre=True, always=True)
-    def permissions_to_list(cls, v):
-        return v.split(" ") if isinstance(v, str) else v
-
     def is_client_credentials(self):
         return self.gty == "client-credentials"
 
diff --git a/pyproject.toml b/pyproject.toml
index 821324a..6ab35a2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,7 +36,7 @@ classifiers = [
 python = ">=3.7,<4.0"
 aiohttp = { version = "^3", optional = true }
 fastapi = "^0"
-pydantic = "^1"
+pydantic = "^2"
 PyJWT = { version = "^2", extras = ["crypto"], optional = true }
 
 [tool.poetry.extras]

From 53108277652eed08704fee8f2997d58efdc2458d Mon Sep 17 00:00:00 2001
From: chrisladden <cladden@om1.com>
Date: Wed, 2 Aug 2023 09:22:34 -0400
Subject: [PATCH 2/2] remove unused import

---
 fastapi_security/entities.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastapi_security/entities.py b/fastapi_security/entities.py
index 1cad85d..133b165 100644
--- a/fastapi_security/entities.py
+++ b/fastapi_security/entities.py
@@ -2,7 +2,7 @@
 from enum import Enum
 from typing import Any, Dict, List, Optional, Annotated
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, Field
 from pydantic.functional_validators import BeforeValidator