@google/earthengine 0.1.418 → 0.1.419

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/earthengine",
-  "version": "0.1.418",
+  "version": "0.1.419",
   "description": "JavaScript client for Google Earth Engine API.",
   "author": "Google LLC",
   "license": "Apache-2.0",

package/src/apiclient.js

@@ -24,7 +24,7 @@ const {trustedResourceUrl} = goog.require('safevalues');
 /** @namespace */
 const apiclient = {};
 
-const API_CLIENT_VERSION = '0.1.418';
+const API_CLIENT_VERSION = '0.1.419';
 
 exports.VERSION = apiVersion.VERSION;
 exports.API_CLIENT_VERSION = API_CLIENT_VERSION;

package/src/eeapiclient/request_params.ts

@@ -119,6 +119,12 @@ const simpleCorsAllowedHeaders: string[] = [
 
 const simpleCorsAllowedMethods: string[] = ['GET', 'HEAD', 'POST'];
 
+const simpleCorsAllowedContentTypes: readonly string[] = [
+  'application/x-www-form-urlencoded',
+  'multipart/form-data',
+  'text/plain',
+];
+
 /**
  * Note: This function only works for One Platform APIs.
  * Manipulates the request options such that it will not trigger a CORS
@@ -149,12 +155,19 @@ export function bypassCorsPreflight(params: MakeRequestParams) {
   const unsafeHeaders: {[key: string]: string} = {};
   let hasUnsafeHeaders = false;
   let hasContentType = false;
+  let hasSafeContentType = false;
 
   if (params.headers) {
     hasContentType = params.headers['Content-Type'] != null;
     for (const [key, value] of Object.entries(params.headers)) {
       if (simpleCorsAllowedHeaders.includes(key)) {
         safeHeaders[key] = value;
+      } else if (
+        key === 'Content-Type' &&
+        simpleCorsAllowedContentTypes.includes(value)
+      ) {
+        safeHeaders[key] = value;
+        hasSafeContentType = true;
       } else {
         unsafeHeaders[key] = value;
         hasUnsafeHeaders = true;
@@ -177,7 +190,9 @@ export function bypassCorsPreflight(params: MakeRequestParams) {
       unsafeHeaders['Content-Type'] = 'application/json';
       hasUnsafeHeaders = true;
     }
-    safeHeaders['Content-Type'] = 'text/plain';
+    if (!hasSafeContentType) {
+      safeHeaders['Content-Type'] = 'text/plain';
+    }
   }
 
   if (hasUnsafeHeaders) {

package/src/eeapiclient/request_params_test.ts

@@ -172,6 +172,22 @@ describe('bypassCorsPreflight', () => {
     expect(params.queryParams).toEqual({});
   });
 
+  it('handles simple cors headers', () => {
+    const params: MakeRequestParams = {
+      path: 'v1/whatever',
+      httpMethod: 'GET',
+      methodId: 'someservice.whatever.get',
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+    };
+    bypassCorsPreflight(params);
+    expect(params.headers).toEqual({
+      'Content-Type': 'application/x-www-form-urlencoded',
+    });
+    expect(params.httpMethod).toEqual('GET');
+  });
+
   it('handles would-trigger-preflight cors headers', () => {
     const params: MakeRequestParams = {
       path: 'v1/whatever',