From 1714b014bf9fe5533084a185982e4376e1156d46 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 13 Sep 2016 10:29:14 +0100 Subject: [PATCH 1/2] Force true or false for userHasNoSubscription, not blank --- services/web/app/views/project/list/side-bar.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/views/project/list/side-bar.jade b/services/web/app/views/project/list/side-bar.jade index 96365c813e..3738e9a4ae 100644 --- a/services/web/app/views/project/list/side-bar.jade +++ b/services/web/app/views/project/list/side-bar.jade @@ -155,6 +155,6 @@ | #{translate("or_unlock_features_bonus")} a(href="/user/bonus") #{translate("sharing_sl")} . script. - window.userHasNoSubscription = #{settings.enableSubscriptions && !hasSubscription} + window.userHasNoSubscription = #{!!(settings.enableSubscriptions && !hasSubscription)} From cc9791d3f452904e239e2464f56bfc5e290372cf Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 13 Sep 2016 11:23:47 +0100 Subject: [PATCH 2/2] Redirect to login with a redirect back to the page we want if not logged in --- .../Authorization/AuthorizationMiddlewear.coffee | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee b/services/web/app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee index 4888db0c8a..7f2f67e03c 100644 --- a/services/web/app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee +++ b/services/web/app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee @@ -99,13 +99,17 @@ module.exports = AuthorizationMiddlewear = callback null, user_id redirectToRestricted: (req, res, next) -> - res.redirect "/restricted" + res.redirect "/restricted?from=#{encodeURIComponent(req.url)}" restricted : (req, res, next)-> if req.session.user? res.render 'user/restricted', title:'restricted' else - logger.log "user not logged in and trying to access #{req.url}, being redirected to login" - res.redirect '/register' + from = req.query.from + logger.log {from: from}, "redirecting to login" + redirect_to = "/login" + if from? + redirect_to += "?redir=#{encodeURIComponent(from)}" + res.redirect redirect_to \ No newline at end of file