Refactor: remove dependency on Benefits models, rename modules, improve Client parameters

eligibility_api/api.py → eligibility_api/client.py

@@ -29,7 +29,7 @@ class RequestToken:
     def __init__(
         self,
         types: Iterable[str],
-        agency_id: str,
+        agency_identifier: str,
         jws_signing_alg: str,
         client_private_jwk: jwk.JWK,
         jwe_encryption_alg: str,
@@ -50,7 +50,7 @@ def __init__(
                 .replace(tzinfo=datetime.timezone.utc)
                 .timestamp()
             ),
-            agency=agency_id,
+            agency=agency_identifier,
             eligibility=types,
             sub=sub,
             name=name,
@@ -139,28 +139,36 @@ def __init__(
 class Client:
     """Eligibility Verification API HTTP client."""
 
-    def __init__(self, agency, verifier, issuer):
-        logger.debug(f"Initialize client for agency: {agency.short_name}")
-        self.issuer = issuer
-
-        # get the eligibility type names
-        self.types = list(map(lambda t: t.name, agency.types_to_verify()))
-        self.agency_id = agency.agency_id
-        self.jws_signing_alg = agency.jws_signing_alg
-        self.client_private_jwk = agency.private_jwk
-        self.jwe_encryption_alg = verifier.jwe_encryption_alg
-        self.jwe_cek_enc = verifier.jwe_cek_enc
-        self.server_public_jwk = verifier.public_jwk
-
-        self.api_url = verifier.api_url
-        self.api_auth_header = verifier.api_auth_header
-        self.api_auth_key = verifier.api_auth_key
+    def __init__(
+        self,
+        api_url,
+        api_auth_header,
+        api_auth_key,
+        issuer,
+        agency_identifier,
+        jws_signing_alg,
+        client_private_jwk,
+        jwe_encryption_alg,
+        jwe_cek_enc,
+        server_public_jwk,
+    ):
+        self.api_url = api_url
+        self.api_auth_header = api_auth_header
+        self.api_auth_key = api_auth_key
 
-    def _tokenize_request(self, sub, name):
+        self.issuer = issuer
+        self.agency_identifier = agency_identifier
+        self.jws_signing_alg = jws_signing_alg
+        self.client_private_jwk = client_private_jwk
+        self.jwe_encryption_alg = jwe_encryption_alg
+        self.jwe_cek_enc = jwe_cek_enc
+        self.server_public_jwk = server_public_jwk
+
+    def _tokenize_request(self, sub, name, types):
         """Create a request token."""
         return RequestToken(
-            self.types,
-            self.agency_id,
+            types,
+            self.agency_identifier,
             self.jws_signing_alg,
             self.client_private_jwk,
             self.jwe_encryption_alg,
@@ -188,12 +196,12 @@ def _auth_headers(self, token):
         headers[self.api_auth_header] = self.api_auth_key
         return headers
 
-    def _request(self, sub, name):
+    def _request(self, sub, name, types):
         """Make an API request for eligibility verification."""
         logger.debug("Start new eligibility verification request")
 
         try:
-            token = self._tokenize_request(sub, name)
+            token = self._tokenize_request(sub, name, types)
         except jwcrypto.JWException:
             raise TokenError("Failed to tokenize form values")
 
@@ -219,6 +227,6 @@ def _request(self, sub, name):
             )
             raise ApiError("Unexpected eligibility verification response")
 
-    def verify(self, sub, name):
+    def verify(self, sub, name, types):
         """Check eligibility for the subject and name."""
-        return self._request(sub, name)
+        return self._request(sub, name, types)