Fix nits

GoogleCloudPlatform · Aug 30, 2018 · f09d23f · f09d23f
1 parent c7d9ba9
commit f09d23f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/functions/http/index.js b/functions/http/index.js
@@ -241,22 +241,22 @@ exports.getSignedUrl = (req, res) => {
  */
 exports.corsEnabledFunction = (req, res) => {
   // Set CORS headers for preflight requests
-  // e.g. allow GETs from any origin with the Content-Type header
-  // and cache preflight response for an 3600s
+  // Allows GETs from any origin with the Content-Type header
+  // and caches preflight response for 3600s
+
+  res.set('Access-Control-Allow-Origin', '*');
 
-  // Send response to OPTIONS requests and terminate the function execution
   if (req.method === 'OPTIONS') {
-    res.set('Access-Control-Allow-Origin', '*');
+    // Send response to OPTIONS requests
     res.set('Access-Control-Allow-Methods', 'GET');
     res.set('Access-Control-Allow-Headers', 'Content-Type');
     res.set('Access-Control-Max-Age', '3600');
     res.status(204).send('');
+  } else {
+    // Set CORS headers for the main request
+    res.set('Access-Control-Allow-Origin', '*');
+    res.send('Hello World!');
   }
-
-  // Set CORS headers for the main request
-  res.set('Access-Control-Allow-Origin', '*');
-
-  res.send('Hello World!');
 };
 // [END functions_http_cors]
 
@@ -269,21 +269,19 @@ exports.corsEnabledFunction = (req, res) => {
  */
 exports.corsEnabledFunctionAuth = (req, res) => {
   // Set CORS headers for preflight requests
-  // allows GETS from origin https://mydomain.com with Authorization header
+  // Allows GETs from origin https://mydomain.com with Authorization header
+
+  res.set('Access-Control-Allow-Origin', 'https://mydomain.com');
+  res.set('Access-Control-Allow-Credentials', 'true');
 
-  // Send response to OPTIONS requests and terminate the function execution
   if (req.method === 'OPTIONS') {
-    res.set('Access-Control-Allow-Origin', 'https://mydomain.com');
+    // Send response to OPTIONS requests
     res.set('Access-Control-Allow-Methods', 'GET');
     res.set('Access-Control-Allow-Headers', 'Authorization');
-    res.set('Access-Control-Allow-Credentials', 'true');
     res.set('Access-Control-Max-Age', '3600');
     res.status(204).send('');
+  } else {
+    res.send('Hello World!');
   }
-
-  res.set('Access-Control-Allow-Origin', 'https://mydomain.com');
-  res.set('Access-Control-Allow-Credentials', 'true');
-
-  res.send('Hello World!');
 };
 // [END functions_http_cors_auth]
diff --git a/functions/http/test/index.test.js b/functions/http/test/index.test.js
@@ -193,7 +193,7 @@ test.serial(`http:cors: should respond to preflight request (auth)`, (t) => {
   httpSample.sample.corsEnabledFunctionAuth(mocks.corsPreflightReq, mocks.res);
 
   t.true(mocks.res.status.calledOnceWith(204));
-  t.true(mocks.res.send.calledTwice);
+  t.true(mocks.res.send.calledOnce);
 });
 
 test.serial(`http:cors: should respond to main request (auth)`, (t) => {