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

pytest_nhsd_apim/apigee_apis.py

@@ -5,7 +5,8 @@ import jwt
 import pyotp
 import requests
 from jwt import ExpiredSignatureError
-from pydantic import BaseSettings, root_validator
+from pydantic import model_validator
+from pydantic_settings import BaseSettings
 
 
 class ApigeeProdCredentials(BaseSettings):
@@ -38,29 +39,27 @@ class ApigeeProdCredentials(BaseSettings):
     apigee_nhsd_prod_password: Optional[str] = None
     apigee_nhsd_prod_passcode: Optional[str] = None
     apigee_access_token: Optional[str] = None
+    auth_method: Optional[str] = None
 
-    @root_validator
+    @model_validator(mode="before")
     def check_credentials_config(cls, values):
         print(values)
         """Checks for the right set of credentials"""
         if all(
             [
-                values.get(key)
-                for key in [
-                    "apigee_nhsd_prod_username",
-                    "apigee_nhsd_prod_password",
-                    "auth_server",
-                ]
+                values.get("apigee_nhsd_prod_username"),
+                values.get("apigee_nhsd_prod_password"),
+                values.get("auth_server"),
             ]
         ):
             values["auth_method"] = "saml"
             return values
         elif all(
-            [values.get(key) for key in ["auth_server", "apigee_nhsd_prod_passcode"]]
+            [values.get("auth_server"), values.get("apigee_nhsd_prod_passcode")]
         ):
             values["auth_method"] = "saml"
             return values
-        elif values["apigee_access_token"]:
+        elif values.get("apigee_access_token"):
             values["auth_method"] = "access_token"
             return values
         else:
@@ -101,39 +100,34 @@ class ApigeeProdCredentials(BaseSettings):
 
 class ApigeeNonProdCredentials(BaseSettings):
     auth_server: str = "login.apigee.com"
-    apigee_nhsd_nonprod_username: Optional[str]
-    apigee_nhsd_nonprod_password: Optional[str]
-    apigee_nhsd_nonprod_otp_key: Optional[str]
-    apigee_access_token: Optional[str]
+    apigee_nhsd_nonprod_username: Optional[str] = None
+    apigee_nhsd_nonprod_password: Optional[str] =  None
+    apigee_nhsd_nonprod_otp_key: Optional[str] = None
+    apigee_access_token: Optional[str] = None
+    auth_method: Optional[str] = None
 
-    @root_validator
+    @model_validator(mode='before')
     def check_credentials_config(cls, values):
         """Checks for the right set of credentials"""
         if all(
             [
-                values.get(key)
-                for key in [
-                    "apigee_nhsd_nonprod_username",
-                    "apigee_nhsd_nonprod_password",
-                    "apigee_nhsd_nonprod_otp_key",
-                ]
+                values.get("apigee_nhsd_nonprod_username"),
+                values.get("apigee_nhsd_nonprod_password"),
+                values.get("apigee_nhsd_nonprod_otp_key"),
             ]
         ):
             values["auth_method"] = "saml"
             return values
         elif all(
             [
-                values.get(key)
-                for key in [
-                    "auth_server",
-                    "apigee_nhsd_nonprod_password",
-                    "apigee_nhsd_nonprod_username",
-                ]
+                values.get("auth_server"),
+                values.get("apigee_nhsd_nonprod_password"),
+                values.get("apigee_nhsd_nonprod_username"),
             ]
         ):
             values["auth_method"] = "saml"
             return values
-        elif values["apigee_access_token"]:
+        elif values.get("apigee_access_token"):
             values["auth_method"] = "access_token"
             return values
         else:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-nhsd-apim
-Version: 3.4.5
+Version: 4.0.0
 Summary: Pytest plugin accessing NHSDigital's APIM proxies
 Home-page: https://github.com/NHSDigital/pytest-nhsd-apim
 Author: Adrian Ciobanita
@@ -16,13 +16,14 @@ Requires-Dist: cryptography (==42.0.0)
 Requires-Dist: lxml (==4.9.1)
 Requires-Dist: pycryptodome (==3.20.0)
 Requires-Dist: PyJWT (==2.8.0)
-Requires-Dist: pyotp (==2.6.0)
+Requires-Dist: pyotp (==2.9.0)
 Requires-Dist: pytest (==8.2.0)
 Requires-Dist: requests (==2.31.0)
 Requires-Dist: toml (==0.10.2)
-Requires-Dist: typing-extensions (==4.3.0)
-Requires-Dist: pydantic (==1.9.1)
+Requires-Dist: typing-extensions (==4.11.0)
+Requires-Dist: pydantic (==2.9.2)
 Requires-Dist: wheel (<0.39.0,===0.37.1)
+Requires-Dist: pydantic-settings (==2.2.1)
 
 # pytest-nhsd-apim
 

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

@@ -1,5 +1,5 @@
 pytest_nhsd_apim/__init__.py,sha256=CRwQfUDrbXIqvJX6OfTR4jGdhlU9kjGmBAptJasRg7E,72
-pytest_nhsd_apim/apigee_apis.py,sha256=tcAo254Mvx__qAX7Focb-6855eTLWL2TUsna1vT6Eow,67284
+pytest_nhsd_apim/apigee_apis.py,sha256=u_sHjISj4XKgidVje1Uzq4LblMGnX4lrrrMWZM-SEF4,67289
 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
@@ -9,8 +9,8 @@ pytest_nhsd_apim/nhsd_apim_authorization.py,sha256=GR8GfbIZyqBC4jsSZMYNifDH52E3V
 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-3.4.5.dist-info/METADATA,sha256=DzWXFhmLlq5i702jks6lUBtmH0w5xfqII-zMkATZ7Uc,4660
-pytest_nhsd_apim-3.4.5.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pytest_nhsd_apim-3.4.5.dist-info/entry_points.txt,sha256=XWicT3meTpqLXnZcXNoAd2IfXspFPlNgMgLBMy4nqwQ,57
-pytest_nhsd_apim-3.4.5.dist-info/top_level.txt,sha256=ZK5GZP-g_K8gNfm4a58T9JCRb0i1X267ngvNelCGgfQ,17
-pytest_nhsd_apim-3.4.5.dist-info/RECORD,,
+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,,