From f8f7490a6459f6e4befb2fa99b15335e9ccfdf8f Mon Sep 17 00:00:00 2001 From: Lewis Patterson Date: Thu, 3 Apr 2014 14:44:54 -0500 Subject: [PATCH 1/2] Added 'successRoute' to 'oauth' options. --- lib/middleware/oauth.js | 2 +- lib/middleware/oauth2.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/middleware/oauth.js b/lib/middleware/oauth.js index 2ea3ac2..aa3d080 100644 --- a/lib/middleware/oauth.js +++ b/lib/middleware/oauth.js @@ -94,7 +94,7 @@ module.exports = function oauthMiddleware(config, nextApp) { var profile = q(options.parse(body, req)).then(function (profile) { req.session('profile', profile); req.session('access_token', accessToken); - return bogart.redirect(req.params.returnUrl || '/'); + return bogart.redirect(options.successRoute || req.params.returnUrl || '/'); }).fail(function (error) { var parsedUrl = url.parse(options.errorRoute, true); parsedUrl.query.message = error.message; diff --git a/lib/middleware/oauth2.js b/lib/middleware/oauth2.js index 1caf2d0..91ada22 100644 --- a/lib/middleware/oauth2.js +++ b/lib/middleware/oauth2.js @@ -90,7 +90,7 @@ module.exports = function oauth2Middleware(config, nextApp) { req.session('profile', profile); req.session('access_token', accessToken); - return bogart.redirect(req.params.returnUrl || '/'); + return bogart.redirect(options.successRoute || req.params.returnUrl || '/'); }).fail(function (error) { var parsedUrl = url.parse(options.errorRoute, true); parsedUrl.query.message = error.message; From 1a96159c35f4706728314a29b17c9bae1091cc24 Mon Sep 17 00:00:00 2001 From: Lewis Patterson Date: Thu, 3 Apr 2014 15:14:12 -0500 Subject: [PATCH 2/2] Changed 'successRoute' to 'successUrl'; changed 'errorRoute' to 'errorUrl'. --- lib/middleware/oauth.js | 6 +++--- lib/middleware/oauth2.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/middleware/oauth.js b/lib/middleware/oauth.js index aa3d080..4698f93 100644 --- a/lib/middleware/oauth.js +++ b/lib/middleware/oauth.js @@ -15,7 +15,7 @@ module.exports = function oauthMiddleware(config, nextApp) { loginRoute: '/auth/login', logoutRoute: '/auth/logout', callbackRoute: '/auth/callback', - errorRoute: '/' + errorUrl: '/' }; options = _.extend(options, config); @@ -94,9 +94,9 @@ module.exports = function oauthMiddleware(config, nextApp) { var profile = q(options.parse(body, req)).then(function (profile) { req.session('profile', profile); req.session('access_token', accessToken); - return bogart.redirect(options.successRoute || req.params.returnUrl || '/'); + return bogart.redirect(options.successUrl || req.params.returnUrl || '/'); }).fail(function (error) { - var parsedUrl = url.parse(options.errorRoute, true); + var parsedUrl = url.parse(options.errorUrl, true); parsedUrl.query.message = error.message; var redirectUrl = url.format(parsedUrl); return bogart.redirect(redirectUrl); diff --git a/lib/middleware/oauth2.js b/lib/middleware/oauth2.js index 91ada22..be5fce2 100644 --- a/lib/middleware/oauth2.js +++ b/lib/middleware/oauth2.js @@ -16,7 +16,7 @@ module.exports = function oauth2Middleware(config, nextApp) { logoutRoute: '/auth/logout', callbackRoute: '/auth/callback', modalAuthRoute: '/auth/modalauth', - errorRoute: '/' + errorUrl: '/' }; options = _.extend(options, config); @@ -90,9 +90,9 @@ module.exports = function oauth2Middleware(config, nextApp) { req.session('profile', profile); req.session('access_token', accessToken); - return bogart.redirect(options.successRoute || req.params.returnUrl || '/'); + return bogart.redirect(options.successUrl || req.params.returnUrl || '/'); }).fail(function (error) { - var parsedUrl = url.parse(options.errorRoute, true); + var parsedUrl = url.parse(options.errorUrl, true); parsedUrl.query.message = error.message; var redirectUrl = url.format(parsedUrl); return bogart.redirect(redirectUrl);