Merge 8d168a0 into 8e6f4a1

HabitRPG · Apr 5, 2017 · 61204bd · 61204bd
2 parents 8e6f4a1 + 8d168a0
commit 61204bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/website/server/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js
@@ -159,7 +159,9 @@ api.registerLocal = {
     if (existingUser) {
       res.respond(200, savedUser.toJSON().auth.local); // We convert to toJSON to hide private fields
     } else {
-      res.respond(201, savedUser);
+      let userJSON = savedUser.toJSON()
+      userJSON.newUser = true;
+      res.respond(201, userJSON);
     }
 
     // Clean previous email preferences and send welcome email

diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js
@@ -99,7 +99,7 @@ function _setUpNewUser (user) {
   user.purchased.background.violet = true;
   user.preferences.background = 'violet';
 
-  if (user.registeredThrough === 'habitica-web' || user.registeredThrough === 'habitica-android') {
+  if (user.registeredThrough === 'habitica-web') {
     taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag'];
 
     _.each(iterableFlags.tutorial.common, (val, section) => {