Merge branch 'master' into develop

Author: keillera

src/handlers/me/articles/images/create/me_articles_images_create.py

@@ -25,17 +25,31 @@ def get_schema(self):
     def get_headers_schema(self):
         return {
             'type': 'object',
-            'properties': {
-                'content-type': {
-                    'type': 'string',
-                    'enum': [
-                        'image/gif',
-                        'image/jpeg',
-                        'image/png'
-                    ]
-                }
-            },
-            'required': ['content-type']
+            "oneOf": [{
+                'properties': {
+                    'content-type': {
+                        'type': 'string',
+                        'enum': [
+                            'image/gif',
+                            'image/jpeg',
+                            'image/png'
+                        ]
+                    }
+                },
+                'required': ['content-type']
+            }, {
+                'properties': {
+                    'Content-Type': {
+                        'type': 'string',
+                        'enum': [
+                            'image/gif',
+                            'image/jpeg',
+                            'image/png'
+                        ]
+                    }
+                },
+                'required': ['Content-Type']
+            }]
         }
 
     def validate_image_data(self, image_data):
@@ -60,7 +74,9 @@ def validate_params(self):
         )
 
     def exec_main_proc(self):
-        ext = self.headers['content-type'].split('/')[1]
+        content_type = self.headers.get('content-type') \
+            if self.headers.get('content-type') is not None else self.headers.get('Content-Type')
+        ext = content_type.split('/')[1]
         user_id = self.event['requestContext']['authorizer']['claims']['cognito:username']
         key = settings.S3_ARTICLES_IMAGES_PATH + \
             user_id + '/' + self.params['article_id'] + '/' + str(uuid.uuid4()) + '.' + ext
@@ -69,7 +85,7 @@ def exec_main_proc(self):
         self.s3.Bucket(os.environ['DIST_S3_BUCKET_NAME']).put_object(
             Body=image_data,
             Key=key,
-            ContentType=self.headers['content-type']
+            ContentType=content_type
         )
 
         return {

src/handlers/me/info/icon/create/me_info_icon_create.py

@@ -23,17 +23,31 @@ def get_schema(self):
     def get_headers_schema(self):
         return {
             'type': 'object',
-            'properties': {
-                'content-type': {
-                    'type': 'string',
-                    'enum': [
-                        'image/gif',
-                        'image/jpeg',
-                        'image/png'
-                    ]
-                }
-            },
-            'required': ['content-type']
+            "oneOf": [{
+                'properties': {
+                    'content-type': {
+                        'type': 'string',
+                        'enum': [
+                            'image/gif',
+                            'image/jpeg',
+                            'image/png'
+                        ]
+                    }
+                },
+                'required': ['content-type']
+            }, {
+                'properties': {
+                    'Content-Type': {
+                        'type': 'string',
+                        'enum': [
+                            'image/gif',
+                            'image/jpeg',
+                            'image/png'
+                        ]
+                    }
+                },
+                'required': ['Content-Type']
+            }]
         }
 
     def validate_image_data(self, image_data):
@@ -51,7 +65,9 @@ def validate_params(self):
         validate(self.event.get('headers'), self.get_headers_schema())
 
     def exec_main_proc(self):
-        ext = self.headers['content-type'].split('/')[1]
+        content_type = self.headers.get('content-type') \
+            if self.headers.get('content-type') is not None else self.headers.get('Content-Type')
+        ext = content_type.split('/')[1]
         user_id = self.event['requestContext']['authorizer']['claims']['cognito:username']
         key = settings.S3_INFO_ICON_PATH + \
             user_id + '/icon/' + str(uuid.uuid4()) + '.' + ext
@@ -60,7 +76,7 @@ def exec_main_proc(self):
         self.s3.Bucket(os.environ['DIST_S3_BUCKET_NAME']).put_object(
             Body=image_data,
             Key=key,
-            ContentType=self.headers['content-type']
+            ContentType=content_type
         )
 
         icon_image_url = 'https://' + os.environ['DOMAIN'] + '/' + key

tests/handlers/me/articles/images/create/test_me_articles_images_create.py

@@ -103,7 +103,7 @@ def test_main_ok_status_public(self):
         self.assertTrue(self.equal_size_to_s3_image(key, image_data.size))
 
     @patch('uuid.uuid4', MagicMock(return_value='uuid'))
-    def test_main_ok_status_draft(self):
+    def test_main_ok_status_draft_and_content_type_is_upper_case(self):
         image_data = Image.new('RGB', (1, 1))
         buf = BytesIO()
         image_format = 'png'
@@ -112,7 +112,7 @@ def test_main_ok_status_draft(self):
         target_article_info = self.article_info_table_items[1]
         params = {
             'headers': {
-                    'content-type': 'image/' + image_format
+                    'Content-Type': 'image/' + image_format
             },
             'pathParameters': {
                 'article_id': target_article_info['article_id']

tests/handlers/me/info/icon/create/test_me_info_icon_create.py

@@ -107,7 +107,7 @@ def test_main_ok(self):
         self.assertTrue(self.equal_size_to_s3_image(key, image_data.size))
 
     @patch('uuid.uuid4', MagicMock(return_value='uuid'))
-    def test_main_ok_exists_icon_image_url_png(self):
+    def test_main_ok_exists_icon_image_url_png_and_content_type_is_upper_case(self):
         image_data = Image.new('RGB', (150, 120))
         buf = BytesIO()
         image_format = 'png'
@@ -116,7 +116,7 @@ def test_main_ok_exists_icon_image_url_png(self):
         target_user = self.users_table_items[1]
         params = {
             'headers': {
-                'content-type': 'image/' + image_format
+                'Content-Type': 'image/' + image_format
             },
             'body': json.dumps({'icon_image': base64.b64encode(buf.getvalue()).decode('ascii')}),
             'requestContext': {