Fix Issues #136 - Access-Control-Allow-Origin #137

alicoding · 2014-07-22T21:54:13Z

Closes #136

alicoding · 2014-07-22T21:54:33Z

@humphd if you want to r? :)

mjschranz · 2014-07-22T21:56:58Z

R+ from me

mjschranz · 2014-07-22T22:03:56Z

Other than your failing test which is probably due to the new types for allowed somaina

humphd · 2014-07-22T22:18:12Z

env.dist

@@ -8,8 +8,8 @@ export NODE_ENV="development"
 export PORT=9090

 # Allowed CORS domains
-# Use comma for more domains e.g. http://localhost:5001,http://localhost:7777
-export ALLOWED_CORS_DOMAINS="http://localhost:5001"
+# Add domain that we allowed in the array


"Add domains that we allow (e.g., for /api/sync route)"

humphd · 2014-07-22T22:18:58Z

One nit, plus deal with Travis as Matt suggests. Awesome work!

alicoding · 2014-07-22T23:00:30Z

@humphd that test either need to be skip or remove until I know how to fake req.headers.origin since we are using that.

sedge · 2014-07-23T13:59:55Z

tests/unit/http-routes-tests.js

@@ -3,11 +3,19 @@ var request = require('request');
 var util = require('../lib/util');
 var env = require('../../server/lib/environment');
 var ALLOW_DOMAINS = process.env.ALLOWED_CORS_DOMAINS || env.get("ALLOWED_CORS_DOMAINS");
+var firstDomain;


Is this variable used in any other tests? If not, move it down inside the it() block.

sedge · 2014-07-23T17:10:24Z

Rebase then r+

humphd reviewed Jul 22, 2014
View changes

sedge reviewed Jul 23, 2014
View changes

Fix Issues #136 - Access-Control-Allow-Origin

73d9999

alicoding merged commit 73d9999 into mozilla:master Jul 23, 2014
1 check was pending

1 check was pending

continuous-integration/travis-ci The Travis CI build is in progress
Details

alicoding deleted the alicoding:issues136 branch Jul 23, 2014

mozilla / makedrive Archived

Fix Issues #136 - Access-Control-Allow-Origin #137

Fix Issues #136 - Access-Control-Allow-Origin #137

alicoding commented Jul 22, 2014

alicoding commented Jul 22, 2014

mjschranz commented Jul 22, 2014

mjschranz commented Jul 22, 2014

This comment has been minimized.

humphd commented Jul 22, 2014

alicoding commented Jul 22, 2014

This comment has been minimized.

sedge commented Jul 23, 2014

mozilla / makedrive Archived

Fix Issues #136 - Access-Control-Allow-Origin #137

Fix Issues #136 - Access-Control-Allow-Origin #137

Conversation

alicoding commented Jul 22, 2014

alicoding commented Jul 22, 2014

mjschranz commented Jul 22, 2014

mjschranz commented Jul 22, 2014

This comment has been minimized.

humphd Jul 22, 2014 Member

humphd commented Jul 22, 2014

alicoding commented Jul 22, 2014

This comment has been minimized.

sedge Jul 23, 2014 Contributor

sedge commented Jul 23, 2014

humphd Jul 22, 2014
Member

sedge Jul 23, 2014
Contributor