gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update eslint, fix lint issues

Browse Source
This commit is contained in:
Berkeley Martinez
2016-03-02 20:54:14 -08:00
parent c50510db71
commit 74592e72b4
30 changed files with 141 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/models/User-Identity.js
View File

@ -73,7 +73,7 @@ export default function(UserIdent) {
}
);
}
cb(err, user, identity);
return cb(err, user, identity);
});
});
}
@ -99,12 +99,12 @@ export default function(UserIdent) {
} else {
query = { username: userObj.username };
}
userModel.findOrCreate({ where: query }, userObj, function(err, user) {
return userModel.findOrCreate({ where: query }, userObj, (err, user) => {
if (err) {
return cb(err);
}
var date = new Date();
userIdentityModel.create({
return userIdentityModel.create({
provider: getSocialProvider(provider),
externalId: profile.id,
authScheme: authScheme,
@ -122,7 +122,7 @@ export default function(UserIdent) {
}
);
}
cb(err, user, identity);
return cb(err, user, identity);
});
});
});
@ -134,7 +134,7 @@ export default function(UserIdent) {
debug('no user identity instance found');
return next();
}
userIdent.user(function(err, user) {
return userIdent.user(function(err, user) {
let userChanged = false;
if (err) { return next(err); }
if (!user) {
@ -175,11 +175,11 @@ export default function(UserIdent) {
if (userChanged) {
return user.save(function(err) {
if (err) { return next(err); }
next();
return next();
});
}
debug('exiting after user identity before save');
next();
return next();
});
});
}