Version 1.4.1

Revert pinning of httpx
Minor changes to use newer server cert validation mechanics
Fixing broken tests
Updated demo app

Fixes #74

bankid/__version__.py

@@ -3,5 +3,5 @@
 Version info
 """
 
-__version__ = "1.4.0"
+__version__ = "1.4.1"
 version = __version__  # backwards compatibility name

bankid/asyncclient.py

@@ -23,7 +23,7 @@ def __init__(self, certificates: Tuple[str, str], test_server: bool = False, req
         super().__init__(certificates, test_server, request_timeout)
 
         headers = {"Content-Type": "application/json"}
-        self.client = httpx.AsyncClient(cert=self.certs, headers=headers, verify=str(self.verify_cert), timeout=request_timeout)
+        self.client = httpx.AsyncClient(cert=self.certs, headers=headers, verify=self.ctx, timeout=request_timeout)
 
     async def authenticate(
         self,

bankid/baseclient.py

@@ -1,4 +1,5 @@
 import base64
+import ssl
 from datetime import datetime
 from typing import Tuple, Dict, Any, Union, TypeVar, Generic
 from urllib.parse import urljoin
@@ -33,6 +34,7 @@ def __init__(
         else:
             self.api_url = "https://appapi2.bankid.com/rp/v6.0/"
             self.verify_cert = resolve_cert_path("appapi2.bankid.com.pem")
+        self.ctx = ssl.create_default_context(cafile=self.verify_cert)
 
         self._auth_endpoint = urljoin(self.api_url, "auth")
         self._phone_auth_endpoint = urljoin(self.api_url, "phone/auth")

bankid/syncclient.py

@@ -22,8 +22,8 @@ class BankIDClient(BankIDClientBaseclass[httpx.Client]):
     def __init__(self, certificates: Tuple[str, str], test_server: bool = False, request_timeout: int = 5):
         super().__init__(certificates, test_server, request_timeout)
 
-        headers= {"Content-Type": "application/json"}
-        self.client = httpx.Client(cert=self.certs, headers=headers, verify=str(self.verify_cert), timeout=request_timeout)
+        headers = {"Content-Type": "application/json"}
+        self.client = httpx.Client(cert=self.certs, headers=headers, verify=self.ctx, timeout=request_timeout)
 
     def authenticate(
         self,

examples/qrdemo/qrdemo/app.py

@@ -6,7 +6,7 @@
 from flask_caching import Cache
 from bankid import BankIDClient
 from bankid.exceptions import BankIDError
-from bankid.certutils import create_bankid_test_server_cert_and_key
+from bankid.certutils import resolve_cert_path
 
 USE_TEST_SERVER = True
 
@@ -16,7 +16,10 @@
 # The client should be initialized in a better way, e.g. with Flask_BankID so that it is stored in the
 # Flask app. For this demo it is sufficient to let it reside globally in this file.
 if USE_TEST_SERVER:
-    cert_paths = create_bankid_test_server_cert_and_key(str(pathlib.Path(__file__).parent))
+    cert_paths = (
+        str(resolve_cert_path("FPTestcert5_20240610_cert.pem")),
+        str(resolve_cert_path("FPTestcert5_20240610_key.pem"))
+    )
     client = BankIDClient(cert_paths, test_server=True)
 else:
     # Set your own cert paths for you production certificate and key here.

requirements.txt

@@ -1,2 +1,2 @@
-httpx < 0.28
+httpx
 importlib_resources; python_version < "3.9"

tests/test_asyncclient.py

@@ -29,7 +29,7 @@ async def test_authentication_and_collect(cert_and_key: Tuple[str, str], ip_addr
 
     assert isinstance(out, dict)
     # UUID.__init__ performs the UUID compliance assertion.
-    order_ref = uuid.UUID(out["orderRef"], version=4)
+    order_ref = uuid.UUID(out["orderRef"])
     collect_status = await c.collect(str(order_ref))
     assert collect_status.get("status") == "pending"
     assert collect_status.get("hintCode") in ("outstandingTransaction", "noClient")
@@ -47,7 +47,7 @@ async def test_sign_and_collect(cert_and_key: Tuple[str, str], ip_address: str)
     )
     assert isinstance(out, dict)
     # UUID.__init__ performs the UUID compliance assertion.
-    order_ref = uuid.UUID(out["orderRef"], version=4)
+    order_ref = uuid.UUID(out["orderRef"])
     collect_status = await c.collect(str(order_ref))
     assert collect_status.get("status") == "pending"
     assert collect_status.get("hintCode") in ("outstandingTransaction", "noClient")
@@ -61,7 +61,7 @@ async def test_phone_sign_and_collect(cert_and_key: Tuple[str, str], random_pers
     out = await c.phone_sign(random_personal_number, "RP", user_visible_data="The data to be signed")
     assert isinstance(out, dict)
     # UUID.__init__ performs the UUID compliance assertion.
-    order_ref = uuid.UUID(out["orderRef"], version=4)
+    order_ref = uuid.UUID(out["orderRef"])
     collect_status = await c.collect(str(order_ref))
     assert collect_status.get("status") == "pending"
     assert collect_status.get("hintCode") in ("outstandingTransaction", "noClient")
@@ -103,7 +103,7 @@ async def test_authentication_and_cancel(cert_and_key: Tuple[str, str], ip_addre
     out = await c.authenticate(ip_address)
     assert isinstance(out, dict)
     # UUID.__init__ performs the UUID compliance assertion.
-    order_ref = uuid.UUID(out["orderRef"], version=4)
+    order_ref = uuid.UUID(out["orderRef"])
     collect_status = await c.collect(str(order_ref))
     assert collect_status.get("status") == "pending"
     assert collect_status.get("hintCode") in ("outstandingTransaction", "noClient")
@@ -121,7 +121,7 @@ async def test_phone_authentication_and_cancel(cert_and_key: Tuple[str, str], ra
     out = await c.phone_authenticate(random_personal_number, "user")
     assert isinstance(out, dict)
     # UUID.__init__ performs the UUID compliance assertion.
-    order_ref = uuid.UUID(out["orderRef"], version=4)
+    order_ref = uuid.UUID(out["orderRef"])
     collect_status = await c.collect(str(order_ref))
     assert collect_status.get("status") == "pending"
     assert collect_status.get("hintCode") in ("outstandingTransaction", "noClient")

tests/test_syncclient.py

@@ -34,7 +34,7 @@ def test_authentication_and_collect(cert_and_key: Tuple[str, str], ip_address: s
     out = c.authenticate(ip_address, requirement={"personalNumber": random_personal_number})
     assert isinstance(out, dict)
     # UUID.__init__ performs the UUID compliance assertion.
-    order_ref = uuid.UUID(out["orderRef"], version=4)
+    order_ref = uuid.UUID(out["orderRef"])
     collect_status = c.collect(str(order_ref))
     assert collect_status["status"] == "pending"
     assert collect_status["hintCode"] in ("outstandingTransaction", "noClient")
@@ -51,7 +51,7 @@ def test_sign_and_collect(cert_and_key: Tuple[str, str], ip_address: str) -> Non
     )
     assert isinstance(out, dict)
     # UUID.__init__ performs the UUID compliance assertion.
-    order_ref = uuid.UUID(out["orderRef"], version=4)
+    order_ref = uuid.UUID(out["orderRef"])
     collect_status = c.collect(str(order_ref))
     assert collect_status["status"] == "pending"
     assert collect_status["hintCode"] in ("outstandingTransaction", "noClient")
@@ -64,7 +64,7 @@ def test_phone_sign_and_collect(cert_and_key: Tuple[str, str], random_personal_n
     out = c.phone_sign(random_personal_number, "user", user_visible_data="The data to be signed")
     assert isinstance(out, dict)
     # UUID.__init__ performs the UUID compliance assertion.
-    order_ref = uuid.UUID(out["orderRef"], version=4)
+    order_ref = uuid.UUID(out["orderRef"])
     collect_status = c.collect(str(order_ref))
     assert collect_status["status"] == "pending"
     assert collect_status["hintCode"] in ("outstandingTransaction", "noClient")
@@ -99,7 +99,7 @@ def test_authentication_and_cancel(cert_and_key: Tuple[str, str], ip_address: st
     out = c.authenticate(ip_address, requirement={"personalNumber": random_personal_number})
     assert isinstance(out, dict)
     # UUID.__init__ performs the UUID compliance assertion.
-    order_ref = uuid.UUID(out["orderRef"], version=4)
+    order_ref = uuid.UUID(out["orderRef"])
     collect_status = c.collect(str(order_ref))
     assert collect_status["status"] == "pending"
     assert collect_status["hintCode"] in ("outstandingTransaction", "noClient")
@@ -116,7 +116,7 @@ def test_phone_authentication_and_cancel(cert_and_key: Tuple[str, str], random_p
     out = c.phone_authenticate(random_personal_number, "user")
     assert isinstance(out, dict)
     # UUID.__init__ performs the UUID compliance assertion.
-    order_ref = uuid.UUID(out["orderRef"], version=4)
+    order_ref = uuid.UUID(out["orderRef"])
     collect_status = c.collect(str(order_ref))
     assert collect_status["status"] == "pending"
     assert collect_status["hintCode"] in ("outstandingTransaction", "noClient")