pytest-nhsd-apim 3.4.4__tar.gz → 3.4.5__tar.gz

{pytest_nhsd_apim-3.4.4 → pytest_nhsd_apim-3.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-nhsd-apim
-Version: 3.4.4
+Version: 3.4.5
 Summary: Pytest plugin accessing NHSDigital's APIM proxies
 Home-page: https://github.com/NHSDigital/pytest-nhsd-apim
 Author: Adrian Ciobanita
@@ -16,14 +16,13 @@ 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.9.0
+Requires-Dist: pyotp==2.6.0
 Requires-Dist: pytest==8.2.0
 Requires-Dist: requests==2.31.0
 Requires-Dist: toml==0.10.2
-Requires-Dist: typing-extensions==4.11.0
-Requires-Dist: pydantic==2.9.2
+Requires-Dist: typing-extensions==4.3.0
+Requires-Dist: pydantic==1.9.1
 Requires-Dist: wheel<0.39.0,===0.37.1
-Requires-Dist: pydantic-settings==2.2.1
 
 # pytest-nhsd-apim
 

{pytest_nhsd_apim-3.4.4 → pytest_nhsd_apim-3.4.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest-nhsd-apim"
-version = "3.4.4"
+version = "3.4.5"
 description = "Pytest plugin accessing NHSDigital's APIM proxies"
 authors = ["Adrian Ciobanita <adrian.ciobanita1@nhs.net>", "Alex Carrie <alexander.carrie1@nhs.net>", "Lucas Fantini <lucas.fantini@nhs.net>"]
 maintainers = ["Alex Carrie <alexander.carrie1@nhs.net>", "Alex Hawdon <alex.hawdon1@nhs.net"]
@@ -16,14 +16,14 @@ lxml = "^4.9.1"
 python = "^3.8"
 pycryptodome = "^3.20.0"
 PyJWT = "^2.8.0"
-pyotp = "^2.9.0"
+pyotp = "^2.6.0"
 pytest = "^8.2.0"
 requests = "^2.31.0"
 toml = "^0.10.2"
-typing-extensions = "^4.11.0"
-pydantic = "^2.9.2"
+typing-extensions = "^4.3.0"
+pydantic = "^1.9.1"
 wheel = ">=0.37.1,<0.39.0"
-pydantic-settings = "^2.2.1"
+
 
 [tool.poetry.dev-dependencies]
 

{pytest_nhsd_apim-3.4.4 → pytest_nhsd_apim-3.4.5}/src/pytest_nhsd_apim/apigee_apis.py

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

{pytest_nhsd_apim-3.4.4 → pytest_nhsd_apim-3.4.5}/src/pytest_nhsd_apim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-nhsd-apim
-Version: 3.4.4
+Version: 3.4.5
 Summary: Pytest plugin accessing NHSDigital's APIM proxies
 Home-page: https://github.com/NHSDigital/pytest-nhsd-apim
 Author: Adrian Ciobanita
@@ -16,14 +16,13 @@ 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.9.0
+Requires-Dist: pyotp==2.6.0
 Requires-Dist: pytest==8.2.0
 Requires-Dist: requests==2.31.0
 Requires-Dist: toml==0.10.2
-Requires-Dist: typing-extensions==4.11.0
-Requires-Dist: pydantic==2.9.2
+Requires-Dist: typing-extensions==4.3.0
+Requires-Dist: pydantic==1.9.1
 Requires-Dist: wheel<0.39.0,===0.37.1
-Requires-Dist: pydantic-settings==2.2.1
 
 # pytest-nhsd-apim
 

{pytest_nhsd_apim-3.4.4 → pytest_nhsd_apim-3.4.5}/src/pytest_nhsd_apim.egg-info/requires.txt

@@ -3,11 +3,10 @@ cryptography==42.0.0
 lxml==4.9.1
 pycryptodome==3.20.0
 PyJWT==2.8.0
-pyotp==2.9.0
+pyotp==2.6.0
 pytest==8.2.0
 requests==2.31.0
 toml==0.10.2
-typing-extensions==4.11.0
-pydantic==2.9.2
+typing-extensions==4.3.0
+pydantic==1.9.1
 wheel<0.39.0,===0.37.1
-pydantic-settings==2.2.1