From a3dd2f497e6ad6d1a60c967c781d9df9d0c81f7f Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 5 Apr 2017 22:19:49 +0200 Subject: [PATCH 1/4] fix setup process for new android users --- website/server/models/user/hooks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index 551eb189fe..473970fae4 100644 --- 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) => { From 8d168a03182ee175d801580ef06bb574d2cb5c63 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 5 Apr 2017 22:20:08 +0200 Subject: [PATCH 2/4] return newUser as true for new local accounts --- website/server/controllers/api-v3/auth.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/server/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js index 478f0502b2..7440e4ca7d 100644 --- 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 From 38edc5b416d7e27fb885e89f14b5bf54250c9828 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 6 Apr 2017 22:03:33 +0200 Subject: [PATCH 3/4] fix linter error --- website/server/controllers/api-v3/auth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/server/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js index 7440e4ca7d..53a3548884 100644 --- a/website/server/controllers/api-v3/auth.js +++ b/website/server/controllers/api-v3/auth.js @@ -159,7 +159,7 @@ api.registerLocal = { if (existingUser) { res.respond(200, savedUser.toJSON().auth.local); // We convert to toJSON to hide private fields } else { - let userJSON = savedUser.toJSON() + let userJSON = savedUser.toJSON(); userJSON.newUser = true; res.respond(201, userJSON); } From 78a99bf314f929b6abf38a3a70993139a9fa3d01 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 6 Apr 2017 22:03:50 +0200 Subject: [PATCH 4/4] add assertion for newUser field on registration --- test/api/v3/integration/user/auth/POST-register_local.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/api/v3/integration/user/auth/POST-register_local.test.js b/test/api/v3/integration/user/auth/POST-register_local.test.js index b74a4ae12a..722e429d10 100644 --- a/test/api/v3/integration/user/auth/POST-register_local.test.js +++ b/test/api/v3/integration/user/auth/POST-register_local.test.js @@ -34,6 +34,7 @@ describe('POST /user/auth/local/register', () => { expect(user.apiToken).to.exist; expect(user.auth.local.username).to.eql(username); expect(user.profile.name).to.eql(username); + expect(user.newUser).to.eql(true); }); it('provides default tags and tasks', async () => {