sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-01 11:40:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'viirus/androidFixes' into release

Browse source
This commit is contained in:
SabreCat 2017-04-06 22:15:14 +00:00
commit 8bfafa6df0
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/api/v3/integration/user/auth/POST-register_local.test.js
View file

@ -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 () => {

4
website/server/controllers/api-v3/auth.js
View file

@ -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

2
website/server/models/user/hooks.js
View file

@ -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) => {