Fix google oauth login.

lib/routes/login.js

@@ -133,7 +133,6 @@ module.exports = function(app) {
   };
 
   actions.register = function(req, res) {
-    var registerForm = req.form.registerForm || {};
     var googleAuth = require('../util/googleAuth')(app);
 
     // ログイン済みならさようなら
@@ -147,6 +146,8 @@ module.exports = function(app) {
     }
 
     if (req.method == 'POST' && req.form.isValid) {
+      var registerForm = req.form.registerForm || {};
+
       var name = registerForm.name;
       var username = registerForm.username;
       var email = registerForm.email;

lib/util/googleAuth.js

@@ -20,7 +20,7 @@ module.exports = function(app) {
   }
 
   lib.createAuthUrl = function(req, callback) {
-    var callbackUrl = req.baseUrl + '/google/callback';
+    var callbackUrl = config.crowi['app:url'] + '/google/callback';
     var google = createOauth2Client(callbackUrl);
 
     var redirectUrl = google.generateAuthUrl({
@@ -32,7 +32,7 @@ module.exports = function(app) {
   };
 
   lib.handleCallback = function(req, callback) {
-    var callbackUrl = req.baseUrl + '/google/callback';
+    var callbackUrl = config.crowi['app:url'] + '/google/callback';
     var google = createOauth2Client(callbackUrl);
     var code = req.session.googleAuthCode || null;