Merge pull request #19 from fedwiki/paul90/not-owner

initial look at indicating if user is not the owner
This commit is contained in:
Ward Cunningham 2018-09-23 10:41:06 -07:00 committed by GitHub
commit cc410eb8c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 4 deletions

View File

@ -51,7 +51,13 @@ update_footer = (ownerName, isAuthenticated) ->
$('footer > #security').empty()
if isAuthenticated
$('footer > #security').append "<a href='#' id='logout' class='footer-item' title='Sign-out'><i class='fa fa-unlock fa-lg fa-fw'></i></a>"
if isOwner
logoutTitle = "Sign-out"
logoutIconClass = 'fa fa-unlock fa-lg fa-fw'
else
logoutTitle = "Not Owner : Sign-out"
logoutIconClass = 'fa fa-lock fa-lg fa-fw notOwner'
$('footer > #security').append "<a href='#' id='logout' class='footer-item' title='#{logoutTitle}'><i class='#{logoutIconClass}'></i></a>"
$('footer > #security > #logout').click (e) ->
e.preventDefault()
myInit = {
@ -167,7 +173,16 @@ setup = (user) ->
switch document.cookie.match('(?:^|;)\\s?state=(.*?)(?:;|$)')[1]
when 'loggedIn' then window.isAuthenticated = true
when 'loggedOut' then window.isAuthenticated = false
update_footer ownerName, isAuthenticated
myInit = {
method: 'GET'
cache: 'no-cache'
mode: 'same-origin'
}
fetch '/auth/client-settings.json', myInit
.then (response) ->
response.json().then (json) ->
window.isOwner = json.isOwner
update_footer ownerName, isAuthenticated
lastCookie = currentCookie
, 100

View File

@ -8,6 +8,6 @@
color: floralwhite;
}
#isOwner {
color: green;
.notOwner {
transform: rotate(20deg);
}

View File

@ -133,6 +133,7 @@ module.exports = exports = (log, loga, argv) ->
else
try
idProvider = _.head(_.keys(req.session.passport.user))
console.log 'idProvider: ', idProvider
switch idProvider
when 'github', 'google', 'twitter'
if _.isEqual(owner[idProvider].id, req.session.passport.user[idProvider].id)
@ -305,6 +306,10 @@ module.exports = exports = (log, loga, argv) ->
}
if wikiHost
settings.wikiHost = wikiHost
if isAuthorized(req) and owner isnt ''
settings.isOwner = true
else
settings.isOwner = false
res.json settings
app.get '/auth/loginDialog', (req, res) ->