Add MONEI Connect support with account ID and custom user agent

- Enhance MoneiClient to support setting account ID for partners
- Add validation for user agent when using account ID
- Implement methods to set and remove account ID dynamically
- Update README with MONEI Connect integration examples
- Add test cases for account ID and user agent functionality

Author: jimmyn

Monei/__init__.py

@@ -1,12 +1,12 @@
 # flake8: noqa
 
 """
-    MONEI API v1
+MONEI API v1
 
-    <p>The MONEI API is organized around <a href=\"https://en.wikipedia.org/wiki/Representational_State_Transfer\">REST</a> principles. Our API is designed to be intuitive and developer-friendly.</p> <h3>Base URL</h3> <p>All API requests should be made to:</p> <pre><code>https://api.monei.com/v1 </code></pre> <h3>Environment</h3> <p>MONEI provides two environments:</p> <ul> <li><strong>Test Environment</strong>: For development and testing without processing real payments</li> <li><strong>Live Environment</strong>: For processing real transactions in production</li> </ul> <h3>Client Libraries</h3> <p>We provide official SDKs to simplify integration:</p> <ul> <li><a href=\"https://github.com/MONEI/monei-php-sdk\">PHP SDK</a></li> <li><a href=\"https://github.com/MONEI/monei-python-sdk\">Python SDK</a></li> <li><a href=\"https://github.com/MONEI/monei-node-sdk\">Node.js SDK</a></li> <li><a href=\"https://postman.monei.com/\">Postman Collection</a></li> </ul> <p>Our SDKs handle authentication, error handling, and request formatting automatically.</p> <h3>Important Requirements</h3> <ul> <li>All API requests must be made over HTTPS</li> <li>If you are not using our official SDKs, you <strong>must provide a valid <code>User-Agent</code> header</strong> with each request</li> <li>Requests without proper authentication will return a <code>401 Unauthorized</code> error</li> </ul> <h3>Error Handling</h3> <p>The API returns consistent error codes and messages to help you troubleshoot issues. Each response includes a <code>statusCode</code> attribute indicating the outcome of your request.</p> <p><a href=\"https://docs.monei.com/api/errors\">View complete list of status codes →</a></p> <h3>Rate Limits</h3> <p>The API implements rate limiting to ensure stability. If you exceed the limits, requests will return a <code>429 Too Many Requests</code> status code.</p>   # noqa: E501
+<p>The MONEI API is organized around <a href=\"https://en.wikipedia.org/wiki/Representational_State_Transfer\">REST</a> principles. Our API is designed to be intuitive and developer-friendly.</p> <h3>Base URL</h3> <p>All API requests should be made to:</p> <pre><code>https://api.monei.com/v1 </code></pre> <h3>Environment</h3> <p>MONEI provides two environments:</p> <ul> <li><strong>Test Environment</strong>: For development and testing without processing real payments</li> <li><strong>Live Environment</strong>: For processing real transactions in production</li> </ul> <h3>Client Libraries</h3> <p>We provide official SDKs to simplify integration:</p> <ul> <li><a href=\"https://github.com/MONEI/monei-php-sdk\">PHP SDK</a></li> <li><a href=\"https://github.com/MONEI/monei-python-sdk\">Python SDK</a></li> <li><a href=\"https://github.com/MONEI/monei-node-sdk\">Node.js SDK</a></li> <li><a href=\"https://postman.monei.com/\">Postman Collection</a></li> </ul> <p>Our SDKs handle authentication, error handling, and request formatting automatically.</p> <h3>Important Requirements</h3> <ul> <li>All API requests must be made over HTTPS</li> <li>If you are not using our official SDKs, you <strong>must provide a valid <code>User-Agent</code> header</strong> with each request</li> <li>Requests without proper authentication will return a <code>401 Unauthorized</code> error</li> </ul> <h3>Error Handling</h3> <p>The API returns consistent error codes and messages to help you troubleshoot issues. Each response includes a <code>statusCode</code> attribute indicating the outcome of your request.</p> <p><a href=\"https://docs.monei.com/api/errors\">View complete list of status codes →</a></p> <h3>Rate Limits</h3> <p>The API implements rate limiting to ensure stability. If you exceed the limits, requests will return a <code>429 Too Many Requests</code> status code.</p>   # noqa: E501
 
-    The version of the OpenAPI document: 1.5.0
-    Generated by: https://openapi-generator.tech
+The version of the OpenAPI document: 1.5.0
+Generated by: https://openapi-generator.tech
 """
 
 
@@ -25,5 +25,6 @@
 from Monei.exceptions import ApiValueError
 from Monei.exceptions import ApiKeyError
 from Monei.exceptions import ApiException
-# import custom MoneiClient
+
+# Import MoneiClient at the end to avoid circular imports
 from Monei.monei_client import MoneiClient

Monei/monei_client.py

@@ -2,32 +2,96 @@
 import hmac
 import hashlib
 
-from Monei import Configuration, ApiClient, PaymentsApi, ApiException, SubscriptionsApi, ApplePayDomainApi, __version__
+# Import specific modules instead of importing from Monei
+from Monei.configuration import Configuration
+from Monei.api_client import ApiClient
+from Monei.exceptions import ApiException
+from Monei.api.payments_api import PaymentsApi
+from Monei.api.subscriptions_api import SubscriptionsApi
+from Monei.api.apple_pay_domain_api import ApplePayDomainApi
+import Monei
+
+
+DEFAULT_USER_AGENT = f"MONEI/Python/{Monei.__version__}"
 
 
 class MoneiClient(object):
     _default = None
 
-    def __init__(self, api_key=None, config=None):
+    def __init__(self, api_key=None, config=None, account_id=None, user_agent=None):
+        """Initialize the MONEI client
 
+        Args:
+            api_key (str): Your MONEI API key
+            config (Configuration, optional): Custom configuration
+            account_id (str, optional): The merchant's account ID to act on behalf of
+            user_agent (str, optional): Custom User-Agent string
+        """
         self.api_key = api_key
+        self.account_id = account_id
+        self.user_agent = user_agent or DEFAULT_USER_AGENT
 
         self.config = config if config else Configuration()
 
-        self.config.api_key = {
-            'Authorization': api_key
-        }
+        self.config.api_key = {"Authorization": api_key}
 
         # Enter a context with an instance of the API client
         with ApiClient(self.config) as api_client:
-            api_client.user_agent = "MONEI/Python/" + __version__
+            # Set user agent
+            api_client.user_agent = self.user_agent
+
+            # Set account ID if provided
+            if self.account_id:
+                # Validate that a custom user agent is set when using account ID
+                if self.user_agent == DEFAULT_USER_AGENT:
+                    raise ApiException(
+                        status=400, reason="User-Agent must be provided when using Account ID"
+                    )
+                api_client.set_default_header("MONEI-Account-ID", self.account_id)
+
+            # Initialize API instances
             self.Payments = PaymentsApi(api_client)
             self.Subscriptions = SubscriptionsApi(api_client)
             self.ApplePayDomain = ApplePayDomainApi(api_client)
 
+            # Store the api_client for later use
+            self._api_client = api_client
+
             # aliases
             self.payments = self.Payments
 
+    def set_account_id(self, account_id):
+        """Set the account ID to act on behalf of a merchant
+
+        Args:
+            account_id (str): The merchant's account ID
+
+        Raises:
+            ApiException: If trying to set account_id with default User-Agent
+        """
+        # If setting accountId and using default User-Agent
+        if account_id and self.user_agent == DEFAULT_USER_AGENT:
+            raise ApiException(status=400, reason="User-Agent must be set before using Account ID")
+
+        self.account_id = account_id
+
+        # Update headers in api_client
+        if account_id:
+            self._api_client.set_default_header("MONEI-Account-ID", account_id)
+        else:
+            # Remove the header if account_id is None
+            if "MONEI-Account-ID" in self._api_client.default_headers:
+                del self._api_client.default_headers["MONEI-Account-ID"]
+
+    def set_user_agent(self, user_agent):
+        """Set a custom User-Agent header
+
+        Args:
+            user_agent (str): Custom User-Agent string
+        """
+        self.user_agent = user_agent
+        self._api_client.user_agent = user_agent
+
     def verify_signature(self, body, signature):
         """Verifies response signature
         :param body: string JSON content to be verified
@@ -36,21 +100,18 @@ def verify_signature(self, body, signature):
         """
 
         parts_dict = {}
-        signature_parts = signature.split(',')
+        signature_parts = signature.split(",")
         for part in signature_parts:
-            parts = part.split('=')
+            parts = part.split("=")
             parts_dict[parts[0]] = parts[1]
 
         calculated_hmac = hmac.new(
-            bytes(self.api_key, 'utf-8'),
-            msg=bytes('{}.{}'.format(parts_dict['t'], body), 'utf-8'),
-            digestmod=hashlib.sha256
+            bytes(self.api_key, "utf-8"),
+            msg=bytes("{}.{}".format(parts_dict["t"], body), "utf-8"),
+            digestmod=hashlib.sha256,
         ).hexdigest()
 
-        if calculated_hmac != parts_dict['v1']:
-            raise ApiException(
-                status=401,
-                reason='[401] Signature verification failed'
-            )
+        if calculated_hmac != parts_dict["v1"]:
+            raise ApiException(status=401, reason="[401] Signature verification failed")
 
         return json.loads(body)