Merge remote-tracking branch 'origin/master' into SAN-973-php-getting-started

* origin/master:
  0.5.3
  0.5.2
  fixing gravatar url retrieval and storage
  lowercase CodeNow..........
  remove log
  proper gravatar url generation fix
  0.5.1
  remove escaping
  fixed missed tests
  change up regex to only get instance names
  wip - fixing dependency graph
  debugging
  take supplied refresh token
  whitespace
  non-overwrite update user props

Author: cflynn07

lib/middlewares/passport.js

@@ -1,22 +1,23 @@
 'use strict';
 
-var passport = require('passport');
+var Boom = require('dat-middleware').Boom;
 var GitHubStrategy = require('passport-github').Strategy;
 var GitHubTokenStrategy = require('models/passport-github-token');
+var Github = require('models/apis/github');
+var User = require('models/mongo/user');
 var async = require('async');
-var Boom = require('dat-middleware').Boom;
+var debug = require('debug')('runnable-api|passport');
 var find = require('101/find');
 var hasProps = require('101/has-properties');
-var User = require('models/mongo/user');
-var Github = require('models/apis/github');
 var keypather = require('keypather')();
+var passport = require('passport');
 
 // Example:
 // https://github.com/jaredhanson/passport-github/blob/master/examples/login/app.js
 
+var GITHUB_CALLBACK_URL = process.env.GITHUB_CALLBACK_URL;
 var GITHUB_CLIENT_ID = process.env.GITHUB_CLIENT_ID;
 var GITHUB_CLIENT_SECRET = process.env.GITHUB_CLIENT_SECRET;
-var GITHUB_CALLBACK_URL = process.env.GITHUB_CALLBACK_URL;
 var GITHUB_SCOPE = process.env.GITHUB_SCOPE;
 
 // Passport session setup.
@@ -34,7 +35,7 @@ passport.deserializeUser(function(userId, done) {
   User.findById(userId, done);
 });
 
-passport.use(new GitHubTokenStrategy({}, fetchOrCreateUser));
+passport.use(new GitHubTokenStrategy({}, manageUser));
 
 // Use the GitHubStrategy within Passport.
 //   Strategies in Passport require a `verify` function, which accept
@@ -46,10 +47,10 @@ passport.use(new GitHubStrategy({
     callbackURL: GITHUB_CALLBACK_URL,
     scope: GITHUB_SCOPE
   },
-  fetchOrCreateUser
+  manageUser
 ));
 
-function fetchOrCreateUser (accessToken, refreshToken, profile, done) {
+function manageUser (accessToken, refreshToken, profile, done) {
   async.waterfall([
     User.findByGithubId.bind(User, profile.id),
     getUserPrimaryEmail,
@@ -76,29 +77,45 @@ function fetchOrCreateUser (accessToken, refreshToken, profile, done) {
     });
   }
 
+  /*jshint maxcomplexity:20*/
   function updateOrCreateUser (user, primaryEmail, cb) {
-    user = user || {};
+
     profile.accessToken = accessToken;
-    profile.refreshToken = refreshToken || user.refreshToken;
+    profile.refreshToken = refreshToken;
     profile.username = profile.username || profile.login;
-    var update = {
-      $set: {
-        'email': user.email || primaryEmail,
+
+    if (user && user._id) {
+      debug('existing user, updating...');
+      // found existing user, updating
+      user.email = primaryEmail;
+      user.accounts = {
+        github: profile
+      };
+      user.gravatar = getGravatarUrl(profile);
+      user.save(function (err) {
+        if (err) {
+          return cb(err);
+        }
+        User.findByGithubId(profile.id, cb);
+      });
+    }
+    else {
+      debug('new user, inserting...');
+      // fresh user, inserting
+      var data = {
+        'email': primaryEmail,
         'accounts': { 'github': profile },
+        'gravatar': getGravatarUrl(profile),
         'permissionLevel': 1,
-        'gravatar': getGravatarUrl(profile)
-      }
-    };
-    var opts = {
-      upsert: true
-    };
-    async.waterfall([
-      User.updateByGithubId.bind(User, profile.id, update, opts),
-      function (docsUpdated, model, cb) {
+        'created': new Date()
+      };
+      User.create(data, function (err) {
+        if (err) {
+          return cb(err);
+        }
         User.findByGithubId(profile.id, cb);
-      }
-    ], cb);
-
+      });
+    }
     function getGravatarUrl (profile) {
       var gravatar = 'https://gravatar.com/avatar/' + keypather.get(profile, '_json.gravatar_id');
       var avatar = keypather.get(profile, '_json.avatar_url');

lib/models/apis/graph.js

@@ -189,7 +189,11 @@ Graph.prototype.graphInstanceDeps = function (instance, oldName, cb) {
 
   function getAllInstanceNamesRegex (data, cb) {
     var instance = data.instance;
-    data.nameRegex = new RegExp('([a-z0-9-_]+)\\.[^\\.]+\\.' + process.env.DOMAIN);
+    data.nameRegex = new RegExp(
+      '([a-z0-9-_]+)-' +
+       instance.owner.username.toLowerCase() +
+       '\\.' +
+       process.env.USER_CONTENT_DOMAIN);
     Instance.find(
       {
         owner: {

lib/models/mongo/user.js

@@ -135,6 +135,7 @@ UserSchema.statics.publicFind = function () {
   proxyCallbackToProtectEmail(args);
   this.find.apply(this, args);
 };
+
 UserSchema.statics.publicFindOne = function () {
   var args = Array.prototype.slice.call(arguments);
   if (typeof args[1] === 'function') {
@@ -144,6 +145,7 @@ UserSchema.statics.publicFindOne = function () {
   proxyCallbackToProtectEmail(args);
   this.findOne.apply(this, args);
 };
+
 UserSchema.statics.publicFindById = function () {
   var args = Array.prototype.slice.call(arguments);
   if (typeof args[1] === 'function') {
@@ -153,11 +155,13 @@ UserSchema.statics.publicFindById = function () {
   proxyCallbackToProtectEmail(args);
   this.findById.apply(this, args);
 };
+
 UserSchema.statics.findByGithubId = function (id) {
   var args = Array.prototype.slice.call(arguments, 1);
   args.unshift({ 'accounts.github.id': id });
   this.findOne.apply(this, args);
 };
+
 UserSchema.statics.updateByGithubId = function (id) {
   var args = Array.prototype.slice.call(arguments, 1);
   args.unshift({ 'accounts.github.id': id });

lib/routes/instances/index.js

@@ -695,6 +695,7 @@ app.post('/instances/:id/actions/deploy',
     // create container
     createSaveAndNetworkContainer,
     graph.create(),
+    instances.model.getGithubUsername('sessionUser'),
     graph.model.graphInstanceDeps('instance'))
   .catch(
     mw.req().setToErr('err'),
@@ -754,6 +755,7 @@ app.post('/instances/:id/actions/redeploy',
     // create container
     createSaveAndNetworkContainer,
     graph.create(),
+    instances.model.getGithubUsername('sessionUser'),
     graph.model.graphInstanceDeps('instance'))
   .catch(
     mw.req().setToErr('err'),
@@ -935,6 +937,7 @@ app.post('/instances/:id/actions/regraph',
   checkFound('user', 'Owner not found'),
   mw.req().set('ownerUsername', 'user.login'),
   graph.create(),
+  instances.model.getGithubUsername('sessionUser'),
   graph.model.graphInstanceDeps('instance'),
   instances.model.populateModels(),
   mw.req().set('instance.owner.username', 'ownerUsername'),

package.json

@@ -1,7 +1,7 @@
 {
   "name": "api",
   "description": "Runnable API Server",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "repository": {
     "type": "git",
     "url": "http://github.com/CodeNow/api.git"