reword port and oauth flow

samccone · Apr 3, 2013 · a173969 · a173969
1 parent 2153de0
commit a173969
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffframe",
-  "version": "0.0.0-1",
+  "version": "0.0.0-2",
   "description": "social pj",
   "main": "server.js",
   "scripts": {

diff --git a/server.js b/server.js
@@ -1,4 +1,4 @@
-global.port           = process.env['port'] || 3000;
+var port              = process.env['port'] || 3000;
 var colors            = require('colors');
 var express           = require('express');
 var expressValidator  = require('express-validator');
@@ -8,7 +8,6 @@ var db                = require('./util/db/interface').connect();
 var passport          = require('passport');
 var passportConfig    = require('./util/auth/config')(passport);
 
-
 server.configure(function() {
   server.use(express.cookieParser());
   server.use(express.bodyParser());
@@ -22,7 +21,6 @@ server.configure(function() {
   server.use(express.static(__dirname + "/public"));
 });
 
-
 router(server, passport);
 
 server.listen(port);

diff --git a/util/auth/config.js b/util/auth/config.js
@@ -1,16 +1,17 @@
+var port            = process.env['port'] || 3000;
 var GoogleStrategy  = require('passport-google').Strategy;
 var controllers     = require('../../controllers/controllers')
+var root            = process.env['NODE_ENV'] ? "http://ffframe.jit.su"  : "http://localhost:"+port
 
 module.exports = function(passport) {
   passport.use(new GoogleStrategy({
-    returnURL: "http://localhost:"+global.port+"/auth/google/return",
-    realm: "http://localhost:"+global.port+"/"
+    returnURL: root+"/auth/google/return",
+    realm: root+"/"
     }, function(id, p, done) {
       return done(null, p);
     }
   ));
 
-
   passport.serializeUser(function(user, done) {
     done(null, user);
   });