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

improved list of particpating emails

Browse Source
This commit is contained in:
Ward Cunningham
2018-09-08 16:56:30 -07:00
parent a39e571189
commit 0119bee105
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/social.coffee
View File

@ -393,18 +393,18 @@ module.exports = exports = (log, loga, argv) ->
loginToView = (req) -> loginToView = (req) ->
# things = [ { value: 'ward.cunningham@gmail.com', type: 'account' } ] # things = [ { value: 'ward.cunningham@gmail.com', type: 'account' } ]
allowed = [ allowed = [
"dayton.k12.or.us", "stu.dayton.k12.or.us",
"newberg.k12.or.us", "stu.newberg.k12.or.us",
"innovateoregon.org", "innovateoregon.org",
"newberg.k12.or.us",
"newrelic.com", "newrelic.com",
"c2.com",
"andysylvester.com" "andysylvester.com"
] ]
things = req.session?.passport?.user?.google?.emails things = req.session?.passport?.user?.google?.emails
return false unless things return false unless things
for entry in things for entry in things
have = entry.value.split('@')[1] have = entry.value.split('@')[1]
console.log 'entry', entry, have
for want in allowed for want in allowed
console.log 'want', want
return true if want == have return true if want == have
false false
@ -417,7 +417,7 @@ module.exports = exports = (log, loga, argv) ->
console.log 'owner',owner console.log 'owner',owner
console.log 'owner email',owner.google?.emails console.log 'owner email',owner.google?.emails
console.log 'user',req.session?.passport?.user console.log 'user',req.session?.passport?.user
console.log 'user',req.session?.passport?.user?.google?.emails console.log 'user emails',req.session?.passport?.user?.google?.emails
console.log 'wikiDomains',argv.wikiDomains console.log 'wikiDomains',argv.wikiDomains
console.log 'wikiHost', wikiHost console.log 'wikiHost', wikiHost
console.log 'argv.wiki_domain', argv.wiki_domain console.log 'argv.wiki_domain', argv.wiki_domain
@ -598,7 +598,7 @@ module.exports = exports = (log, loga, argv) ->
} }
} }
when "google" then { when "google" then {
name: user.google.displayName name: user.google.displayName || (user.google.emails[0].value.split('@')[0]) || 'unknown'
google: { google: {
id: user.google.id id: user.google.id
emails: user.google.emails emails: user.google.emails