fixes the request package

Author: sufyankhanrao

apimatic_core/security/hmac_signature_verifier.py

@@ -5,7 +5,7 @@
 from typing import Mapping, Optional, Sequence, Protocol
 
 from apimatic_core_interfaces.security.signature_verifier import SignatureVerifier
-from apimatic_core_interfaces.types.event_request import EventRequest
+from apimatic_core_interfaces.http.request import Request
 
 from apimatic_core.exceptions.signature_verification_error import SignatureVerificationError
 
@@ -67,15 +67,15 @@ def __init__(
             raise ValueError("order must be HmacOrder.PREPEND or HmacOrder.APPEND.")
 
         self._key_bytes = key.encode("utf-8")
-        self._sig_header = signature_header.lower().strip()
-        self._headers = [h.lower().strip() for h in (additional_headers or ())]
+        self._signature_header = signature_header.lower().strip()
+        self._additional_headers = [h.lower().strip() for h in (additional_headers or ())]
         self._order = order
         self._delimiter = delimiter
         self._encoder = encoder
         self._hash_alg = hash_alg
 
-    def verify(self, request: EventRequest) -> bool:
-        if request is None or not isinstance(request, EventRequest):
+    def verify(self, request: Request) -> bool:
+        if request is None or not isinstance(request, Request):
             raise ValueError("request must be an EventRequest.")
 
         if not isinstance(request.body, str):
@@ -85,24 +85,24 @@ def verify(self, request: EventRequest) -> bool:
         normalized: Mapping[str, str] = {
             str(k).lower(): str(v) for k, v in request.headers.items()
         }
-        provided = normalized.get(self._sig_header)
+        provided = normalized.get(self._signature_header)
         if provided is None or not str(provided).strip():
             raise SignatureVerificationError(
-                f"Signature header '{self._sig_header}' is missing from the request."
+                f"Signature header '{self._signature_header}' is missing from the request."
             )
         provided = str(provided).strip()
 
         # Build canonical message
         parts: list[str] = []
         if self._order is HmacOrder.PREPEND:
-            for h in self._headers:
+            for h in self._additional_headers:
                 val = normalized.get(h)
                 if val is not None:
                     parts.append(str(val).strip())
             parts.append(request.body)
         else:
             parts.append(request.body)
-            for h in self._headers:
+            for h in self._additional_headers:
                 val = normalized.get(h)
                 if val is not None:
                     parts.append(str(val).strip())

apimatic_core/security/no_op_signature_verifier.py

@@ -8,7 +8,7 @@
 
 import pytest
 
-from apimatic_core_interfaces.types.event_request import EventRequest
+from apimatic_core_interfaces.http.request import Request
 from apimatic_core.exceptions.signature_verification_error import SignatureVerificationError
 
 # ⬇️ UPDATE THIS IMPORT PATH TO YOUR MODULE
@@ -140,7 +140,7 @@ def test_verify_true_for_valid_signatures_across_encoders_orders_and_delimiters(
             delimiter=delimiter,
             encoder=encoder,
         )
-        req = EventRequest(headers=headers, body=self.BODY)
+        req = Request(headers=headers, body=self.BODY)
         assert verifier.verify(req) is True
 
     def test_verify_true_with_signature_header_whitespace_trimmed(self, base_headers):
@@ -166,7 +166,7 @@ def test_verify_true_with_signature_header_whitespace_trimmed(self, base_headers
             delimiter="|",
             encoder=HexEncoder(),
         )
-        req = EventRequest(headers=headers, body=self.BODY)
+        req = Request(headers=headers, body=self.BODY)
         assert verifier.verify(req) is True
 
     def test_verify_true_when_configured_additional_header_is_missing(self, base_headers):
@@ -193,7 +193,7 @@ def test_verify_true_when_configured_additional_header_is_missing(self, base_hea
             delimiter="|",
             encoder=HexEncoder(),
         )
-        req = EventRequest(headers=headers, body=self.BODY)
+        req = Request(headers=headers, body=self.BODY)
         assert verifier.verify(req) is True
 
     @pytest.mark.parametrize(
@@ -221,7 +221,7 @@ def test_verify_true_with_various_delimiters(self, base_headers, delimiter):
             delimiter=delimiter,
             encoder=HexEncoder(),
         )
-        req = EventRequest(headers=headers, body=self.BODY)
+        req = Request(headers=headers, body=self.BODY)
         assert verifier.verify(req) is True
 
     def test_verify_false_when_signature_mismatch(self, base_headers):
@@ -245,7 +245,7 @@ def test_verify_false_when_signature_mismatch(self, base_headers):
             delimiter="|",
             encoder=HexEncoder(),
         )
-        req = EventRequest(headers=headers, body=self.BODY)
+        req = Request(headers=headers, body=self.BODY)
         assert verifier.verify(req) is False
 
     # ==========================================================================
@@ -264,7 +264,7 @@ def test_verify_raises_signature_verification_error_when_signature_header_missin
             delimiter="|",
             encoder=HexEncoder(),
         )
-        req = EventRequest(headers=headers, body=self.BODY)
+        req = Request(headers=headers, body=self.BODY)
         with pytest.raises(SignatureVerificationError) as exc:
             verifier.verify(req)
         assert "Signature header 'x-signature' is missing from the request." == str(exc.value)
@@ -281,7 +281,7 @@ def test_verify_raises_signature_verification_error_when_none_encoder_missing(se
             delimiter="|",
             encoder=None,
         )
-        req = EventRequest(headers=headers, body=self.BODY)
+        req = Request(headers=headers, body=self.BODY)
         with pytest.raises(SignatureVerificationError) as exc:
             verifier.verify(req)
         assert "HMAC digest computation failed." == str(exc.value)