Merge pull request #1 from rickbergfalk/pr/95

willwest · willwest · commit 41f2d356929e · 2016-04-10T19:09:46.000-04:00
enable OAuth to work with --base-url
diff --git a/routes/oauth.js b/routes/oauth.js
@@ -2,7 +2,8 @@ var passportGoogleStrategy = require('passport-google-oauth2').Strategy;
 
 module.exports = function (app, passport, router) {
     var db = app.get('db');
-
+    var baseUrl = app.get('baseUrl');
+    
     if (!process.env.GOOGLE_CLIENT_ID || !process.env.GOOGLE_CLIENT_SECRET) {
         console.log("Disabling Google authentication streategy, since there's no GOOGLE_CLIENT_ID or no GOOGLE_CLIENT_SECRET in ENV.");
         return;
@@ -13,7 +14,7 @@ module.exports = function (app, passport, router) {
     passport.use(new passportGoogleStrategy({
         clientID          : process.env.GOOGLE_CLIENT_ID,
         clientSecret      : process.env.GOOGLE_CLIENT_SECRET,
-        callbackURL       : process.env.PUBLIC_URL + "/auth/google/callback",
+        callbackURL       : process.env.PUBLIC_URL + baseUrl + "/auth/google/callback",
         passReqToCallback : true
     },
         function(request, accessToken, refreshToken, profile, done) {
@@ -67,7 +68,7 @@ module.exports = function (app, passport, router) {
 
     router.get('/auth/google/callback', 
         passport.authenticate('google', { 
-            successRedirect: '/',
-            failureRedirect: '/signin'
+            successRedirect: baseUrl + '/',
+            failureRedirect: baseUrl + '/signin'
     }));
 };
diff --git a/server.js b/server.js
@@ -121,7 +121,7 @@ app.use(function (req, res, next) {
     // if not signed in redirect to sign in page
     if (req.isAuthenticated()) {
         next();
-    } else if (req._parsedUrl.pathname === config.baseUrl + '/signin' || req._parsedUrl.pathname === config.baseUrl + '/signup' || req._parsedUrl.pathname.indexOf('/auth/') == 0) {
+    } else if (req._parsedUrl.pathname === config.baseUrl + '/signin' || req._parsedUrl.pathname === config.baseUrl + '/signup' || req._parsedUrl.pathname.indexOf(config.baseUrl + '/auth/') == 0) {
         next();
     } else if (app.get('openRegistration')) {
         // if there are no users whitelisted, direct to signup
