pytest-nhsd-apim 4.0.0__py3-none-any.whl → 4.0.1__py3-none-any.whl

pytest_nhsd_apim/identity_service.py

@@ -7,18 +7,18 @@ maybe move this file to its own library.
 """
 
 import uuid
-from time import time
-from typing import Literal
-
-import jwt
-from pydantic import BaseModel, HttpUrl, validator
 from abc import ABC, abstractmethod
+from time import time
 from typing import Literal
 from urllib.parse import parse_qs, urlparse
 
+import jwt
 import requests
 from lxml import html
+from pydantic import BaseModel, HttpUrl, validator, AfterValidator
+from typing_extensions import Annotated
 
+HttpUrlString = Annotated[HttpUrl, AfterValidator(lambda v: str(v))]
 
 #### Config models
 class KeycloakConfig(BaseModel):
@@ -55,7 +55,7 @@ class KeycloakConfig(BaseModel):
 class KeycloakUserConfig(KeycloakConfig):
     client_id: str
     client_secret: str
-    redirect_uri: HttpUrl = "https://example.org"
+    redirect_uri: HttpUrlString = "https://example.org"
     login_form: dict
 
 
@@ -82,8 +82,8 @@ class AuthorizationCodeConfig(BaseModel):
         "prod",
     ] = "internal-dev"
     org: Literal["nhsd-nonprod", "nhsd-prod"] = "nhsd-nonprod"
-    callback_url: HttpUrl
-    identity_service_base_url: HttpUrl = _identity_service_base_url(environment)
+    callback_url: HttpUrlString
+    identity_service_base_url: HttpUrlString = _identity_service_base_url(environment)
     client_id: str
     client_secret: str
     scope: Literal["nhs-login", "nhs-cis2"]
@@ -124,7 +124,7 @@ class ClientCredentialsConfig(BaseModel):
     client_id: str
     jwt_private_key: str
     jwt_kid: str
-    identity_service_base_url: HttpUrl = _identity_service_base_url(environment)
+    identity_service_base_url: HttpUrlString = _identity_service_base_url(environment)
 
     def encode_jwt(self):
         url = f"{self.identity_service_base_url}/token"
@@ -165,8 +165,8 @@ class NHSLoginConfig(BaseModel):
 
         super().__init__(**kwargs)
 
-    callback_url: HttpUrl = "https://nhsd-apim-testing-int-ns.herokuapp.com/nhslogin/callback"
-    nhs_login_base_url: HttpUrl
+    callback_url: HttpUrlString = "https://nhsd-apim-testing-int-ns.herokuapp.com/nhslogin/callback"
+    nhs_login_base_url: HttpUrlString
     client_id: str = "APIM-1"
     jwt_private_key: str
     jwt_kid: str

{pytest_nhsd_apim-4.0.0.dist-info → pytest_nhsd_apim-4.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-nhsd-apim
-Version: 4.0.0
+Version: 4.0.1
 Summary: Pytest plugin accessing NHSDigital's APIM proxies
 Home-page: https://github.com/NHSDigital/pytest-nhsd-apim
 Author: Adrian Ciobanita
@@ -18,7 +18,7 @@ Requires-Dist: pycryptodome (==3.20.0)
 Requires-Dist: PyJWT (==2.8.0)
 Requires-Dist: pyotp (==2.9.0)
 Requires-Dist: pytest (==8.2.0)
-Requires-Dist: requests (==2.31.0)
+Requires-Dist: requests (==2.32.0)
 Requires-Dist: toml (==0.10.2)
 Requires-Dist: typing-extensions (==4.11.0)
 Requires-Dist: pydantic (==2.9.2)

{pytest_nhsd_apim-4.0.0.dist-info → pytest_nhsd_apim-4.0.1.dist-info}/RECORD

@@ -3,14 +3,14 @@ pytest_nhsd_apim/apigee_apis.py,sha256=u_sHjISj4XKgidVje1Uzq4LblMGnX4lrrrMWZM-SE
 pytest_nhsd_apim/apigee_edge.py,sha256=NQrW8PeA_-X4zt2torTmBOaFIzRKjh6pT1ksolNjpmA,19065
 pytest_nhsd_apim/auth_journey.py,sha256=UovbLXhokUnikrMOaXIhjV8t5aRrcxinAbS96nfZWcY,5154
 pytest_nhsd_apim/config.py,sha256=ScKfV8iURqDXX2ajgGsRDcVn9RZy2DxLoEU2QQt9lmA,4246
-pytest_nhsd_apim/identity_service.py,sha256=HrXfSm0dIFg51LBng_nf2iIGlOcwzV_J1vA4agm_Ne4,19766
+pytest_nhsd_apim/identity_service.py,sha256=0ymDSEsTuBYcMU15zFNuqEV6PMvC7Z0Vde0PkN8NQ2E,19899
 pytest_nhsd_apim/log.py,sha256=8gYHqzlQM546FB2XvFmLTk1YfZRNeNhIwLmOy0GScr8,2685
 pytest_nhsd_apim/nhsd_apim_authorization.py,sha256=GR8GfbIZyqBC4jsSZMYNifDH52E3VWoIa7lrpuvIbaM,3513
 pytest_nhsd_apim/pytest_nhsd_apim.py,sha256=ZCItUqcM23CCmcRyGU8bEwI3vJnNcGdoOlbSfvYILR8,5242
 pytest_nhsd_apim/secrets.py,sha256=yIYwOZwpliIomtqSJGIYRbAE2HYvLvQU4W2kOa9TnXo,2354
 pytest_nhsd_apim/token_cache.py,sha256=6L08taTlSyRsx2NCb0LSGsHdWx_wmqwlFtcF7pZMhUg,3540
-pytest_nhsd_apim-4.0.0.dist-info/METADATA,sha256=Qr5aO2T1v73p92PMAk0NXrrL9Mgy3tI_mucb7PX0HMY,4704
-pytest_nhsd_apim-4.0.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pytest_nhsd_apim-4.0.0.dist-info/entry_points.txt,sha256=XWicT3meTpqLXnZcXNoAd2IfXspFPlNgMgLBMy4nqwQ,57
-pytest_nhsd_apim-4.0.0.dist-info/top_level.txt,sha256=ZK5GZP-g_K8gNfm4a58T9JCRb0i1X267ngvNelCGgfQ,17
-pytest_nhsd_apim-4.0.0.dist-info/RECORD,,
+pytest_nhsd_apim-4.0.1.dist-info/METADATA,sha256=MLPfh4yptnSrL2gQmgT8lmMgCMze8nLbEnKhmatWHLI,4704
+pytest_nhsd_apim-4.0.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pytest_nhsd_apim-4.0.1.dist-info/entry_points.txt,sha256=XWicT3meTpqLXnZcXNoAd2IfXspFPlNgMgLBMy4nqwQ,57
+pytest_nhsd_apim-4.0.1.dist-info/top_level.txt,sha256=ZK5GZP-g_K8gNfm4a58T9JCRb0i1X267ngvNelCGgfQ,17
+pytest_nhsd_apim-4.0.1.dist-info/RECORD,,