github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/sso' into sso

Browse Source
This commit is contained in:
Geoff Schmidt
2013-12-13 18:18:38 -08:00
parent e63837d0aa 685431fb20
commit ad5f3fff45
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/webapp/webapp_server.js
View File

@@ -661,7 +661,7 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
throw err;
outstanding--;
checkComplete();
}
};
};
// for now, have our (temporary) requiresAuth flag apply to all
@@ -701,7 +701,7 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
parsedUrl.pathname = "";
if (! parsedUrl.pathname.indexOf("/") !== 0) {
// Relative path
parsedUrl.pathname = bindPathPrefix + "/" + parsedUrl.pathname;
parsedUrl.pathname = bindPathPrefix + parsedUrl.pathname;
}
}
@@ -721,8 +721,8 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
proxyToPort = ourPort;
proxyToPathPrefix = parsedUrl.pathname;
} else {
var parsedFwdUrl = url.parse(route.forwardTo);
if (! parsedUrl.hostname || parsedUrl.protocol)
var parsedFwdUrl = url.parse(route.forwardTo, false, true);
if (! parsedFwdUrl.hostname || parsedFwdUrl.protocol)
throw new Error("Bad forward url");
proxyToHost = parsedFwdUrl.hostname;
proxyToPort = parseInt(parsedFwdUrl.port || "80");

4
tools/auth.js
View File

@@ -355,11 +355,11 @@ var logInToGalaxy = function (galaxyName) {
if (response.statusCode !== 200 ||
! body ||
! _.has(response.setCookie, 'GALAXY_AUTH'))
! _.has(galaxyResult.setCookie, 'GALAXY_AUTH'))
return { error: 'access-denied' };
return {
token: response.setCookie.GALAXY_AUTH,
token: galaxyResult.setCookie.GALAXY_AUTH,
tokenId: body.tokenId
};
};