[#2105] fix: use proper kvk lookup in eHerkenning SAML backend (#2106)

Author: pi-sigma

src/eherkenning/backends.py

@@ -29,7 +29,7 @@ def get_company_branch_number(self, attributes):
         return company_branch_number
 
     def get_or_create_user(self, request, saml_response, saml_attributes):
-        kvk = self.get_kvk_number(saml_attributes)
+        kvk = self.get_legal_subject_kvk(saml_attributes)
         if kvk == "":
             raise eHerkenningError(
                 "Login failed due to no KvK being returned by eHerkenning."

src/open_inwoner/accounts/tests/test_backends.py

@@ -127,7 +127,14 @@ def test_kvk_claim_without_vestigingen_claim_returns_kvk_user(self):
             request,
             None,
             saml_attributes={
-                "urn:etoegang:1.11:attribute-represented:KvKnr": [self.user.kvk]
+                "urn:etoegang:core:LegalSubjectID": [
+                    {
+                        "NameID": {
+                            "NameQualifier": "urn:etoegang:1.9:EntityConcernedID:KvKnr",
+                            "value": self.user.kvk,
+                        }
+                    },
+                ]
             },
         )
 
@@ -144,8 +151,13 @@ def test_kvk_claim_with_vestigingen_claim_returns_vestiging_user(self):
             request,
             None,
             saml_attributes={
-                "urn:etoegang:1.11:attribute-represented:KvKnr": [
-                    self.vestiging_user.kvk
+                "urn:etoegang:core:LegalSubjectID": [
+                    {
+                        "NameID": {
+                            "NameQualifier": "urn:etoegang:1.9:EntityConcernedID:KvKnr",
+                            "value": self.vestiging_user.kvk,
+                        },
+                    },
                 ],
                 "urn:etoegang:1.9:ServiceRestriction:Vestigingsnr": self.vestiging_user.vestiging,
             },
@@ -165,7 +177,14 @@ def test_kvk_claim_without_vestigingen_claim_creates_kvk_user(self):
             request,
             None,
             saml_attributes={
-                "urn:etoegang:1.11:attribute-represented:KvKnr": ["12345678"]
+                "urn:etoegang:core:LegalSubjectID": [
+                    {
+                        "NameID": {
+                            "NameQualifier": "urn:etoegang:1.9:EntityConcernedID:KvKnr",
+                            "value": "12345678",
+                        }
+                    },
+                ]
             },
         )
 
@@ -185,7 +204,14 @@ def test_kvk_claim_with_vestigingen_claim_creates_vestiging_user(self):
             request,
             None,
             saml_attributes={
-                "urn:etoegang:1.11:attribute-represented:KvKnr": ["12345678"],
+                "urn:etoegang:core:LegalSubjectID": [
+                    {
+                        "NameID": {
+                            "NameQualifier": "urn:etoegang:1.9:EntityConcernedID:KvKnr",
+                            "value": "12345678",
+                        },
+                    },
+                ],
                 "urn:etoegang:1.9:ServiceRestriction:Vestigingsnr": "123456789012",
             },
         )