wiki-cafe/wiki-security-passportjs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set the port correctly

Browse Source
This commit is contained in:
Paul Rodwell
2016-05-28 09:51:15 +01:00
parent 1fed7ecee1
commit a428f92dfc
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/security.coffee
View File

@ -110,14 +110,16 @@ setup = (user) ->
if response.ok if response.ok
response.json().then (json) -> response.json().then (json) ->
settings = json settings = json
if settings.wikiHost
dialogHost = settings.wikiHost
else
dialogHost = window.location.hostname
if settings.useHttps if settings.useHttps
dialogProtocol = 'https:' dialogProtocol = 'https:'
else else
dialogProtocol = window.location.protocol dialogProtocol = window.location.protocol
if settings.wikiHost if window.location.port
dialogHost = settings.wikiHost dialogHost = dialogHost + ':' + window.location.port
else
dialogHost = window.location.host
if settings.usingPersona if settings.usingPersona
settings.dialogURL = dialogProtocol + '//' + dialogHost + '/auth/personaLogin' settings.dialogURL = dialogProtocol + '//' + dialogHost + '/auth/personaLogin'
else else

17
server/social.coffee
View File

@ -53,6 +53,8 @@ module.exports = exports = (log, loga, argv) ->
if wikiHost if wikiHost
callbackHost = wikiHost callbackHost = wikiHost
if url.parse(argv.url).port
callbackHost = callbackHost + ":" + url.parse(argv.url).port
else else
callbackHost = url.parse(argv.url).host callbackHost = url.parse(argv.url).host
@ -285,7 +287,10 @@ module.exports = exports = (log, loga, argv) ->
when "google" then schemeButtons.push({button: "<a href='/auth/google' class='scheme-button google-button'><span>Google</span></a>"}) when "google" then schemeButtons.push({button: "<a href='/auth/google' class='scheme-button google-button'><span>Google</span></a>"})
info = { info = {
wikiName: url.parse(referer).hostname wikiName: if useHttps
url.parse(referer).hostname
else
url.parse(referer).host
wikiHostName: if wikiHost wikiHostName: if wikiHost
"part of " + req.hostname + " wiki farm" "part of " + req.hostname + " wiki farm"
else else
@ -317,7 +322,10 @@ module.exports = exports = (log, loga, argv) ->
}); });
</script>"}) </script>"})
info = { info = {
wikiName: url.parse(referer).hostname wikiName: if useHttps
url.parse(referer).hostname
else
url.parse(referer).host
wikiHostName: if wikiHost wikiHostName: if wikiHost
"part of " + req.hostname + " wiki farm" "part of " + req.hostname + " wiki farm"
else else
@ -329,7 +337,10 @@ module.exports = exports = (log, loga, argv) ->
} }
else else
info = { info = {
wikiName: url.parse(referer).hostname wikiName: if useHttps
url.parse(referer).hostname
else
url.parse(referer).host
wikiHostName: if wikiHost wikiHostName: if wikiHost
"part of " + req.hostname + " wiki farm" "part of " + req.hostname + " wiki farm"
else else