From 3f045e06048d862f21136e676796d09c91fc4194 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sat, 15 Sep 2012 20:27:50 -0400 Subject: [PATCH] add facebook login image, logout link, settings modal with user id --- public/img/facebook-login-register.jpeg | Bin 0 -> 9585 bytes src/app/index.coffee | 5 ---- src/server/auth.coffee | 13 +++++++--- views/app/index.html | 30 +++++++++++++++++++++--- 4 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 public/img/facebook-login-register.jpeg diff --git a/public/img/facebook-login-register.jpeg b/public/img/facebook-login-register.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..32f16d49789247ceeac9ac2dd53cce19a63659b5 GIT binary patch literal 9585 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 HaOVF2qojWA literal 0 HcmV?d00001 diff --git a/src/app/index.coffee b/src/app/index.coffee index e4da0fedce..9ac885bac5 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -50,11 +50,6 @@ get '/:uidParam?', (page, model, {uidParam}, next) -> ready (model) -> - # protocol+host+port = window.location.origin, only webkit. stupid. - # also, {_purl} in template won't register, have to use $().val something is messed up - pathParts = window.location.toString().split('/') - $('#purl').val "#{pathParts[0]}//#{pathParts[2]}/#{model.get('_userId')}" - $('[rel=tooltip]').tooltip() $('[rel=popover]').popover() # FIXME: this isn't very efficient, do model.on set for specific attrs for popover diff --git a/src/server/auth.coffee b/src/server/auth.coffee index 9255b40372..9e2fd49b8f 100644 --- a/src/server/auth.coffee +++ b/src/server/auth.coffee @@ -32,8 +32,8 @@ module.exports.newUserAndPurl = () -> ## -------- (2) PURL -------- # eg, http://localhost/{guid}), legacy - will be removed eventually # tests if UUID was used (bookmarked private url), and restores that session - acceptableUid = require('guid').isGuid(uidParam) or (uidParam in ['3','9']) - if acceptableUid && sess.userId!=uidParam + acceptableUid = require('guid').isGuid(uidParam) or (uidParam == '3') + if acceptableUid && sess.userId!=uidParam && !(sess.habitRpgAuth && sess.habitRpgAuth.facebook) # TODO check if in database - issue with accessControl which is on current uid? sess.userId = uidParam @@ -73,7 +73,14 @@ module.exports.setupEveryauth = (everyauth) -> fbUserMetadata ).redirectPath "/" - + + everyauth.everymodule.handleLogout (req, res) -> + if req.session.habitRpgAuth && req.session.habitRpgAuth.facebook + req.session.habitRpgAuth.facebook = undefined + req.session.userId = undefined + req.logout() # The logout method is added for you by everyauth, too + @redirect res, @logoutRedirectPath() + module.exports.setupQueries = (store) -> ## Setup Queries store.query.expose 'users', 'withId', (id) -> diff --git a/views/app/index.html b/views/app/index.html index 75dde0fc4c..760416b674 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -12,10 +12,34 @@