Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging

common/models/User-Identity.js

@@ -3,6 +3,11 @@ var debug = require('debug')('freecc:models:userIdent');
 var defaultProfileImage =
   require('../utils/constantStrings.json').defaultProfileImage;
 
+function getFirstImageFromProfile(profile) {
+  return profile && profile.photos && profile.photos[0] ?
+    profile.photos[0].value :
+    null;
+}
 module.exports = function(UserIdent) {
  UserIdent.observe('before save', function(ctx, next) {
   var userIdent = ctx.currentInstance || ctx.instance;
@@ -17,23 +22,27 @@ module.exports = function(UserIdent) {
       return next();
     }
 
-    var picture = userIdent.profile && userIdent.profile[0] ?
+    var picture = getFirstImageFromProfile(userIdent.profile);
-      userIdent.profile[0].value :
-      null;
 
-    // check if user has picture
+    debug('picture', picture, user.picture);
-    //  set user.picture from twitter
+    // check if picture was found
-    if (picture && !user.picture || user.picture === defaultProfileImage) {
+    // check if user has no picture
-      debug('use has no pic');
+    // check if user has default picture
+    // set user.picture from oauth provider
+    if (
+      picture &&
+      (!user.picture || user.picture === defaultProfileImage)
+    ) {
+      debug('setting user picture');
       user.picture = userIdent.profile.photos[0].value;
-      user.save(function(err) {
+      return user.save(function(err) {
         if (err) { return next(err); }
         next();
       });
-    } else {
-      debug('exiting after user ident');
-      next();
     }
+
+    debug('exiting after user ident');
+    next();
   });
  });
 };

common/models/user.js

@@ -8,6 +8,8 @@ module.exports = function(User) {
   // see:
   // https://github.com/strongloop/loopback/issues/1137#issuecomment-109200135
   delete User.validations.email;
+  // set salt factor for passwords
+  User.settings.saltWorkFactor = 5;
   debug('setting up user hooks');
   // send verification email to new camper
   User.afterRemote('create', function(ctx, user, next) {

common/models/user.json

@@ -242,5 +242,5 @@
       "property": "doesExist"
     }
   ],
-  "methods": ["login"]
+  "methods": []
 }

server/boot/a-extendUser.js

@@ -1,32 +1,36 @@
 var Rx = require('rx');
 var debug = require('debug')('freecc:user:remote');
 
-function destroyById(id, Model) {
+function destroyAllRelated(id, Model) {
-  return Rx.Observable.create(function(observer) {
+  return Rx.Observable.fromNodeCallback(
-    Model.destroyById(id, function(err) {
+    Model.destroyAll,
-      if (err) { return observer.onError(err); }
+    Model
-      observer.onCompleted();
+  )({ userId: id });
-    });
-    return Rx.Disposable(Rx.helpers.noop);
-  });
 }
 
 module.exports = function(app) {
   var User = app.models.User;
   var UserIdentity = app.models.UserIdentity;
   var UserCredential = app.models.UserCredential;
-  User.observe('after delete', function(ctx, next) {
+  User.observe('before delete', function(ctx, next) {
     debug('removing user', ctx.where);
     var id = ctx.where && ctx.where.id ? ctx.where.id : null;
     if (!id) {
       return next();
     }
     Rx.Observable.combineLatest(
-      destroyById(id, UserIdentity),
+      destroyAllRelated(id, UserIdentity),
-      destroyById(id, UserCredential),
+      destroyAllRelated(id, UserCredential),
-      Rx.helpers.noop
+      function(identData, credData) {
+        return {
+          identData: identData,
+          credData: credData
+        };
+      }
     ).subscribe(
-      Rx.helpers.noop,
+      function(data) {
+        debug('deleted', data);
+      },
       function(err) {
         debug('error deleting user %s stuff', id, err);
         next(err);