MAPI-81 Fix for incorrect content-md5 header

+ Basic auth manager test
+ updated dependencies

Author: shravan-g

.gitignore

@@ -1,2 +1,6 @@
 *.pyc
-index.py
+index.py
+build
+dist
+.idea
+*egg-info

message_media_messages/configuration.py

@@ -6,9 +6,6 @@
     This file was automatically generated for MessageMedia by APIMATIC v2.0 ( https://apimatic.io ).
 """
 
-from message_media_messages.api_helper import APIHelper
-import os
-
 
 class Configuration(object):
     """A class used for configuring the SDK by a user.
@@ -35,10 +32,9 @@ class Configuration(object):
 
     # The username to use with HMAC authentication
     # TODO: Set an appropriate value
-    hmac_auth_user_name = 'FxJMSlsivOoHAjDbWcO7'
-        #os.environ.get('AUTH_USERNAME')
+    hmac_auth_user_name = 'TODO: Replace'
 
     # The password to use with HMAC authentication
     # TODO: Set an appropriate value
-    hmac_auth_password = 'HbR3jfA1b0J3AHVmPajTWuGGaDIsk4'
-        #os.environ.get('PASSWORD')
+    hmac_auth_password = 'TODO: Replace'
+

requirements.txt

@@ -1,7 +1,7 @@
-requests==2.20.0
-jsonpickle==0.7.1
-cachecontrol==0.11.7
-python-dateutil==2.5.3
+requests==2.28.2
+jsonpickle==3.0.1
+cachecontrol==0.12.11
+python-dateutil==2.8.2
 responses~=0.22.0
-urllib3~=1.24.3
-setuptools~=65.5.1
+urllib3~=1.26.14
+setuptools==67.2.0

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='messagemedia-messages-sdk',
-    version='2.1.0',
+    version='2.1.1',
     description='The MessageMedia Messages API provides a number of endpoints for building powerful two-way messaging applications.',
     long_description_content_type="text/markdown",
     long_description=long_description,
@@ -17,9 +17,12 @@
     url='https://developers.messagemedia.com',
     packages=find_packages(),
     install_requires=[
-        'requests>=2.9.1, <3.0',
-        'jsonpickle>=0.7.1, <1.0',
-        'cachecontrol>=0.11.7, <1.0',
-        'python-dateutil>=2.5.3, <3.0'
+        'requests>=2.28.2, <3.0',
+        'jsonpickle>=3.0.1, <4.0',
+        'cachecontrol>=0.12.11, <1.0',
+        'python-dateutil>=2.8.2, <3.0',
+        'responses>=0.22.0, <1.0',
+        'urllib3>=1.26.14, <2.0',
+        'setuptools>=67.2.0, <68'
     ]
 )

test-requirements.txt

@@ -1 +1,2 @@
-nose==1.3.7
+nose==1.3.7
+freezegun==1.2.2

tests/__init__.py

@@ -0,0 +1,4 @@
+__all__ = [
+    'auth_manager_test',
+    'test_util'
+]

tests/auth_manager_test.py

@@ -1,127 +1,103 @@
 # -*- coding: utf-8 -*-
 
-"""
-    message_media_messages
-
-    This file was automatically generated for MessageMedia by APIMATIC v2.0 ( https://apimatic.io ).
-"""
-
 import hashlib
 import unittest
-from datetime import datetime
-from time import mktime
-from wsgiref.handlers import format_date_time
 
-from tests.test_configuration import TestConfiguration
-from tests.test_util import TestUtility
-from message_media_messages.http.auth.auth_manager import AuthManager
-from message_media_messages.configuration import Configuration
+from freezegun import freeze_time
+
 from message_media_messages.api_helper import APIHelper
-from message_media_messages.models.send_messages_request import SendMessagesRequest
-from message_media_messages.models.message import Message
+from message_media_messages.configuration import Configuration
+from message_media_messages.http.auth.auth_manager import AuthManager
+from message_media_messages.http.requests_client import RequestsClient
 from message_media_messages.models.format_enum import FormatEnum
-import urllib3
-
-
-class AuthManagerTests(unittest.TestCase):
-
-    body = SendMessagesRequest()
-    body.messages = []
-    body.messages.append(Message())
-    body.messages[0].content = 'My tests message'
-    body.messages[0].destination_number = '{}'.format(TestConfiguration.request_dest_number)
-    body.messages[0].format = FormatEnum.SMS
-
-    _url_path = '/v1/messages'
-    _query_builder = Configuration.base_uri
-    _query_builder += _url_path
-    _query_url = APIHelper.clean_url(_query_builder)
+from message_media_messages.models.message import Message
+from message_media_messages.models.send_messages_request import SendMessagesRequest
+from tests.test_util import TestUtil
 
-    _headers = {
-        'accept': 'application/json',
-        'Content-Type': 'application/json; charset=utf-8',
-    }
 
-    m = hashlib.md5()
-    m.update(bytes(APIHelper.json_serialize(body), 'utf-8'))
-    content_hash = m.hexdigest()
+class AuthManagerTest(unittest.TestCase):
 
-    now = datetime.now()
-    stamp = mktime(now.timetuple())
-    date_header = format_date_time(stamp)
+    def __init__(self, method_name: str = ...):
+        super().__init__(method_name)
+        self.content_hash = None
+        self.query_url = None
+        self.send_message_request = None
 
-    content_signature = "x-Content-MD5: {}\n".format(content_hash)
-    get_content_signature = ""
+    def setUp(self):
+        self.send_message_request = self.get_send_message_request()
+        self.query_url = APIHelper.clean_url(Configuration.base_uri + '/v1/messages')
+        self.content_hash = self.get_content_hash(self.send_message_request)
+        self.content_md5_header = "x-Content-MD5: {}\n".format(self.content_hash)
+        self.date_header = 'Wed, 08 Feb 2023 03:00:00 GMT'
+        self.expected_algorithm = ' algorithm="hmac-sha1"'
+        Configuration.hmac_auth_user_name = "some_user_name"
+        self.expected_username = "hmac username=\"" + Configuration.hmac_auth_user_name + "\""
 
+    @freeze_time("2023-02-08 14:00:00")
     def test_post_request_hmac_authorization_header_values_are_appropriate(self):
-        date_header, expected_algorithm, expected_username, http, query_url, request_header = self.header_setup()
-        body = APIHelper.json_serialize(self.body)
-        content_signature = self.content_signature
-        expected_header = ' headers="date x-Content-MD5 request-line"'
-        expected_signature = TestUtility.create_signature(date_header, content_signature, query_url, 'POST', True)
-
-        _request = http.request(
-            'POST',
-            query_url,
-            body=body,
-            headers=request_header
+        body = APIHelper.json_serialize(self.send_message_request)
+
+        request = RequestsClient().post(
+            query_url=self.query_url,
+            parameters=body,
+            headers={}
         )
 
-        AuthManager.apply_hmac_auth(_request, query_url, body)
-        username, algorithm, header, signature = _request.getheader('Authorization').split(',')
+        AuthManager.apply_hmac_auth(request, self.query_url, body)
 
-        self.assert_cases(algorithm, expected_algorithm, expected_header, expected_signature, expected_username,
-                          header, signature, username)
+        expected_headers_property = ' headers="date x-Content-MD5 request-line"'
+        expected_signature = TestUtil.create_signature(self.date_header, self.content_md5_header,
+                                                       self.query_url, 'POST', True)
+        self.assert_auth_header(request, expected_headers_property, expected_signature)
 
-    def test_post_request_content_md5_is_equivalent_to_md5_hash_of_request_body(self):
-        http = urllib3.PoolManager()
-        body = APIHelper.json_serialize(self.body)
-        md5 = self.content_hash
-        query_url = self._query_url
-        request_header = self._headers
+    def test_post_request_content_md5_is_md5_of_request_body(self):
+        body = APIHelper.json_serialize(self.send_message_request)
 
-        _request = http.request(
-            'POST',
-            query_url,
-            body=body,
-            headers=request_header
+        request = RequestsClient().post(
+            query_url=self.query_url,
+            parameters=body,
+            headers={}
         )
 
-        AuthManager.apply_hmac_auth(_request, query_url, body)
-        requestMD5 = _request.getheader('x-Content-MD5')
-        assert md5 == requestMD5
+        AuthManager.apply_hmac_auth(request, self.query_url, body)
+        request_md5 = request.headers['x-Content-MD5']
+        assert self.content_hash == request_md5
 
+    @freeze_time("2023-02-08 14:00:00")
     def test_get_request_hmac_authorization_header_values_are_appropriate(self):
-        date_header, expected_algorithm, expected_username, http, query_url, request_header = self.header_setup()
-        content_signature = ""
-        expected_header = ' headers="date request-line"'
-        expected_signature = TestUtility.create_signature(date_header, content_signature, query_url, 'GET', True)
-
-        _request = http.request(
-            'GET',
-            query_url,
-            headers=request_header
+        request = RequestsClient().get(
+            query_url=self.query_url,
+            headers={}
         )
 
-        AuthManager.apply_hmac_auth(_request, query_url)
-        username, algorithm, header, signature = _request.getheader('Authorization').split(',')
+        AuthManager.apply_hmac_auth(request, self.query_url)
 
-        self.assert_cases(algorithm, expected_algorithm, expected_header, expected_signature, expected_username,
-                          header, signature, username)
+        expected_headers_property = ' headers="date request-line"'
+        expected_signature = TestUtil.create_signature(self.date_header, "",
+                                                       self.query_url, 'GET', True)
+        self.assert_auth_header(request, expected_headers_property, expected_signature)
 
-    def header_setup(self):
-        http = urllib3.PoolManager()
-        date_header = self.date_header
-        request_header = self._headers
-        query_url = self._query_url
-        expected_username = 'hmac username="{}"'.format(Configuration.hmac_auth_user_name)
-        expected_algorithm = ' algorithm="hmac-sha1"'
-        return date_header, expected_algorithm, expected_username, http, query_url, request_header
-
-    def assert_cases(self, algorithm, expected_algorithm, expected_header, expected_signature, expected_username,
-                     header, signature, username):
+    def assert_auth_header(self, request, expected_headers_property, expected_signature):
+        username, algorithm, headers, signature = request.headers['Authorization'].split(',')
         with self.subTest():
-            self.assertEqual(expected_username, username)
-            self.assertEqual(expected_header, header)
-            self.assertEqual(expected_algorithm, algorithm)
+            self.assertEqual(self.expected_username, username)
+            self.assertEqual(expected_headers_property, headers)
+            self.assertEqual(self.expected_algorithm, algorithm)
             self.assertEqual(expected_signature, signature)
+
+    @staticmethod
+    def get_send_message_request():
+        send_message_request = SendMessagesRequest()
+        send_message_request.messages = []
+        send_message_request.messages.append(Message())
+        send_message_request.messages[0].content = 'My tests message'
+        send_message_request.messages[0].destination_number = '+61491570006'
+        send_message_request.messages[0].format = FormatEnum.SMS
+        return send_message_request
+
+    @staticmethod
+    def get_content_hash(request):
+        m = hashlib.md5()
+        m.update(bytes(APIHelper.json_serialize(request), 'utf-8'))
+        content_hash = m.hexdigest()
+        return content_hash