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

a fix for issue 6

Browse Source 
main problem appears to be the list of supported auths `ids` was mistakenly being used when building the owner file

also a fix for login button still using Persona after an alternative has been added
This commit is contained in:
Paul Rodwell
2016-11-21 12:36:43 +00:00
parent 25c73d824b
commit ebf725807f
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/security.coffee
View File

@ -105,7 +105,19 @@ update_footer = (ownerName, isAuthenticated) ->
if response.ok if response.ok
console.log 'Alternative Identity added', response console.log 'Alternative Identity added', response
settings.usingPersona = false settings.usingPersona = false
update_footer ownerName, isAuthenticated if settings.wikiHost
dialogHost = settings.wikiHost
else
dialogHost = window.location.hostname
settings.cookieDomain = dialogHost
if settings.useHttps
dialogProtocol = 'https:'
else
dialogProtocol = window.location.protocol
if window.location.port
dialogHost = dialogHost + ':' + window.location.port
settings.dialogURL = dialogProtocol + '//' + dialogHost + '/auth/loginDialog'
update_footer ownerName, isAuthenticated
else else
console.log 'Attempt to claim site failed', response console.log 'Attempt to claim site failed', response
) )

6
server/social.coffee
View File

@ -448,7 +448,7 @@ module.exports = exports = (log, loga, argv) ->
user = req.session.passport.user user = req.session.passport.user
idProviders = _.keys(user) idProviders = _.keys(user)
ids = {} userIds = {}
idProviders.forEach (idProvider) -> idProviders.forEach (idProvider) ->
id = switch idProvider id = switch idProvider
when "twitter" then { when "twitter" then {
@ -486,7 +486,7 @@ module.exports = exports = (log, loga, argv) ->
email: user.persona.email email: user.persona.email
} }
} }
ids = _.merge(ids, id) userIds = _.merge(userIds, id)
wikiDir = path.resolve(argv.data, '..') wikiDir = path.resolve(argv.data, '..')
statusDir = argv.status.split(path.sep).slice(-1)[0] statusDir = argv.status.split(path.sep).slice(-1)[0]
@ -505,7 +505,7 @@ module.exports = exports = (log, loga, argv) ->
if _.intersectionWith(_.entries(siteOwner), _.entries(user), _.isEqual).length > 0 if _.intersectionWith(_.entries(siteOwner), _.entries(user), _.isEqual).length > 0
updateOwner = _.merge(user, siteOwner) updateOwner = _.merge(user, siteOwner)
fs.writeFile(path.join(wikiDir, file), JSON.stringify(ids), (err) -> fs.writeFile(path.join(wikiDir, file), JSON.stringify(userIds), (err) ->
if err if err
console.log 'Error writing ', file, err console.log 'Error writing ', file, err
# if the write works the change will be picked up by fs.watch() in watchForOwnerChange # if the write works the change will be picked up by fs.watch() in watchForOwnerChange