From bc68c21f24ca68bd935a9ccf49f1f09cd02ce267 Mon Sep 17 00:00:00 2001
From: Sanath Kumar Ramesh <sanathkr@amazon.com>
Date: Mon, 16 Dec 2019 14:13:48 -0500
Subject: [PATCH] Revert "feat(CORS): Set the CORS
 "Access-Control-Allow-Credentials" for local running (#1648)" (#1664)

This reverts commit cd3ec845a71c885e8ab84d4ac9acf063097b2e0d.
---
 samcli/commands/local/lib/provider.py                |  4 +---
 samcli/commands/local/lib/sam_api_provider.py        | 12 +++---------
 .../unit/commands/local/lib/test_sam_api_provider.py |  2 --
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/samcli/commands/local/lib/provider.py b/samcli/commands/local/lib/provider.py
index 685485263b..b2b2eab1b3 100644
--- a/samcli/commands/local/lib/provider.py
+++ b/samcli/commands/local/lib/provider.py
@@ -220,14 +220,13 @@ def binary_media_types(self):
         return list(self.binary_media_types_set)
 
 
-_CorsTuple = namedtuple("Cors", ["allow_origin", "allow_methods", "allow_headers", "allow_credentials", "max_age"])
+_CorsTuple = namedtuple("Cors", ["allow_origin", "allow_methods", "allow_headers", "max_age"])
 
 
 _CorsTuple.__new__.__defaults__ = (
     None,  # Allow Origin defaults to None
     None,  # Allow Methods is optional and defaults to empty
     None,  # Allow Headers is optional and defaults to empty
-    None,  # Allow Credentials is optional and defaults to empty
     None,  # MaxAge is optional and defaults to empty
 )
 
@@ -251,7 +250,6 @@ def cors_to_headers(cors):
             "Access-Control-Allow-Origin": cors.allow_origin,
             "Access-Control-Allow-Methods": cors.allow_methods,
             "Access-Control-Allow-Headers": cors.allow_headers,
-            "Access-Control-Allow-Credentials": cors.allow_credentials,
             "Access-Control-Max-Age": cors.max_age,
         }
         # Filters out items in the headers dictionary that isn't empty.
diff --git a/samcli/commands/local/lib/sam_api_provider.py b/samcli/commands/local/lib/sam_api_provider.py
index c57ce1c6df..01554e8828 100644
--- a/samcli/commands/local/lib/sam_api_provider.py
+++ b/samcli/commands/local/lib/sam_api_provider.py
@@ -111,15 +111,10 @@ def extract_cors(self, cors_prop):
 
             allow_origin = self._get_cors_prop(cors_prop, "AllowOrigin")
             allow_headers = self._get_cors_prop(cors_prop, "AllowHeaders")
-            allow_credentials = self._get_cors_prop(cors_prop, "AllowCredentials", is_string=False)
             max_age = self._get_cors_prop(cors_prop, "MaxAge")
 
             cors = Cors(
-                allow_origin=allow_origin,
-                allow_methods=allow_methods,
-                allow_headers=allow_headers,
-                allow_credentials=allow_credentials,
-                max_age=max_age,
+                allow_origin=allow_origin, allow_methods=allow_methods, allow_headers=allow_headers, max_age=max_age
             )
         elif cors_prop and isinstance(cors_prop, string_types):
             allow_origin = cors_prop
@@ -133,13 +128,12 @@ def extract_cors(self, cors_prop):
                 allow_origin=allow_origin,
                 allow_methods=",".join(sorted(Route.ANY_HTTP_METHODS)),
                 allow_headers=None,
-                allow_credentials=None,
                 max_age=None,
             )
         return cors
 
     @staticmethod
-    def _get_cors_prop(cors_dict, prop_name, is_string=True):
+    def _get_cors_prop(cors_dict, prop_name):
         """
         Extract cors properties from dictionary and remove extra quotes.
 
@@ -153,7 +147,7 @@ def _get_cors_prop(cors_dict, prop_name, is_string=True):
         A string with the extra quotes removed
         """
         prop = cors_dict.get(prop_name)
-        if prop and is_string:
+        if prop:
             if (not isinstance(prop, string_types)) or (not (prop.startswith("'") and prop.endswith("'"))):
                 raise InvalidSamDocumentException(
                     "{} must be a quoted string " '(i.e. "\'value\'" is correct, but "value" is not).'.format(prop_name)
diff --git a/tests/unit/commands/local/lib/test_sam_api_provider.py b/tests/unit/commands/local/lib/test_sam_api_provider.py
index 30efb40b28..612724d637 100644
--- a/tests/unit/commands/local/lib/test_sam_api_provider.py
+++ b/tests/unit/commands/local/lib/test_sam_api_provider.py
@@ -875,7 +875,6 @@ def test_provider_parse_cors_dict(self):
                             "AllowMethods": "'POST, GET'",
                             "AllowOrigin": "'*'",
                             "AllowHeaders": "'Upgrade-Insecure-Requests'",
-                            "AllowCredentials": True,
                             "MaxAge": "'600'",
                         },
                         "DefinitionBody": {
@@ -918,7 +917,6 @@ def test_provider_parse_cors_dict(self):
             allow_origin="*",
             allow_methods=",".join(sorted(["POST", "GET", "OPTIONS"])),
             allow_headers="Upgrade-Insecure-Requests",
-            allow_credentials=True,
             max_age="600",
         )
         route1 = Route(path="/path2", methods=["POST", "OPTIONS"], function_name="NoApiEventFunction")