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

fix(update$): Remove User.update$, refactor to use native loopback interfaces

Browse Source
This commit is contained in:
Bouncey
2018-11-12 16:58:34 +00:00
committed by mrugesh mohapatra
parent 97f7d53bee
commit 0f73fdbd9c
7 changed files with 554 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
api-server/common/models/User-Credential.js
View File

@ -45,10 +45,22 @@ module.exports = function(UserCredential) {
return findCred(query)
.flatMap(_credentials => {
const modified = new Date();
const updateUser = User.update$(
{ id: userId },
createUserUpdatesFromProfile(provider, profile)
);
const updateUser = new Promise((resolve, reject) => {
User.find({ id: userId }, (err, user) => {
if (err) {
return reject(err);
}
return user.updateAttributes(
createUserUpdatesFromProfile(provider, profile),
updateErr => {
if (updateErr) {
return reject(updateErr);
}
return resolve();
}
);
});
});
let updateCredentials;
if (!_credentials) {
updateCredentials = createCred({
@ -65,25 +77,18 @@ module.exports = function(UserCredential) {
});
} else {
_credentials.credentials = credentials;
updateCredentials = observeQuery(
_credentials,
'updateAttributes',
{
profile: null,
credentials,
modified
}
);
updateCredentials = observeQuery(_credentials, 'updateAttributes', {
profile: null,
credentials,
modified
});
}
return Observable.combineLatest(
updateUser,
Observable.fromPromise(updateUser),
updateCredentials,
(_, credentials) => credentials
);
})
.subscribe(
credentials => cb(null, credentials),
cb
);
.subscribe(credentials => cb(null, credentials), cb);
};
};

24
api-server/common/models/User-Identity.js
View File

@ -126,16 +126,26 @@ export default function(UserIdent) {
created: new Date(),
ttl: user.constructor.settings.ttl
});
const updateUser = user.update$({
email: email,
emailVerified: true,
emailAuthLinkTTL: null,
emailVerifyTTL: null
});
const updateUser = new Promise((resolve, reject) =>
user.updateAttributes(
{
email: email,
emailVerified: true,
emailAuthLinkTTL: null,
emailVerifyTTL: null
},
err => {
if (err) {
return reject(err);
}
return resolve();
}
)
);
return Observable.combineLatest(
Observable.of(user),
createToken,
updateUser,
Observable.fromPromise(updateUser),
(user, token) => ({ user, token })
);
})

911
api-server/common/models/user.js
View File

File diff suppressed because it is too large Load Diff

10
api-server/server/boot/certificate.js
View File

@ -272,9 +272,17 @@ function createVerifyCert(certTypeIds, app) {
// set here so sendCertifiedEmail works properly
// not used otherwise
user[certType] = true;
const updatePromise = new Promise((resolve, reject) =>
user.updateAttributes(updateData, err => {
if (err) {
return reject(err);
}
return resolve();
})
);
return Observable.combineLatest(
// update user data
user.update$(updateData),
Observable.fromPromise(updatePromise),
// If user has committed to nonprofit,
// this will complete their pledge
completeCommitment$(user),

131
api-server/server/boot/challenge.js
View File

@ -4,7 +4,7 @@
* a db migration to fix all completedChallenges
*
*/
import { Observable } from 'rx';
import _ from 'lodash';
import debug from 'debug';
import accepts from 'accepts';
@ -87,9 +87,6 @@ function buildUserUpdate(user, challengeId, _completedChallenge, timezone) {
timezone: userTimezone
};
}
log('user update data', updateData);
return {
alreadyCompleted,
updateData,
@ -215,21 +212,24 @@ export default async function bootChallenge(app, done) {
});
const points = alreadyCompleted ? user.points : user.points + 1;
return user
.update$(updateData)
.doOnNext(() => user.manualReload())
.doOnNext(({ count }) => log('%s documents updated', count))
.map(() => {
if (type === 'json') {
return res.json({
points,
alreadyCompleted,
completedDate
});
const updatePromise = new Promise((resolve, reject) =>
user.updateAttributes(updateData, err => {
if (err) {
return reject(err);
}
return res.sendStatus(200);
});
return resolve();
})
);
return Observable.fromPromise(updatePromise).map(() => {
if (type === 'json') {
return res.json({
points,
alreadyCompleted,
completedDate
});
}
return res.sendStatus(200);
});
})
.subscribe(() => {}, next);
}
@ -239,6 +239,8 @@ export default async function bootChallenge(app, done) {
const type = accepts(req).type('html', 'json', 'text');
const errors = req.validationErrors(true);
const { user } = req;
if (errors) {
if (type === 'json') {
return res.status(403).send({ errors });
@ -248,35 +250,39 @@ export default async function bootChallenge(app, done) {
return res.sendStatus(403);
}
return req.user
return user
.getCompletedChallenges$()
.flatMap(() => {
const completedDate = Date.now();
const { id, solution, timezone, files } = req.body;
const { alreadyCompleted, updateData } = buildUserUpdate(
req.user,
user,
id,
{ id, solution, completedDate, files },
timezone
);
const user = req.user;
const points = alreadyCompleted ? user.points : user.points + 1;
return user
.update$(updateData)
.doOnNext(({ count }) => log('%s documents updated', count))
.map(() => {
if (type === 'json') {
return res.json({
points,
alreadyCompleted,
completedDate
});
const updatePromise = new Promise((resolve, reject) =>
user.updateAttributes(updateData, err => {
if (err) {
return reject(err);
}
return res.sendStatus(200);
});
return resolve();
})
);
return Observable.fromPromise(updatePromise).map(() => {
if (type === 'json') {
return res.json({
points,
alreadyCompleted,
completedDate
});
}
return res.sendStatus(200);
});
})
.subscribe(() => {}, next);
}
@ -329,20 +335,24 @@ export default async function bootChallenge(app, done) {
completedChallenge
);
return user
.update$(updateData)
.doOnNext(() => user.manualReload())
.doOnNext(({ count }) => log('%s documents updated', count))
.doOnNext(() => {
if (type === 'json') {
return res.send({
alreadyCompleted,
points: alreadyCompleted ? user.points : user.points + 1,
completedDate: completedChallenge.completedDate
});
const updatePromise = new Promise((resolve, reject) =>
user.updateAttributes(updateData, err => {
if (err) {
return reject(err);
}
return res.status(200).send(true);
});
return resolve();
})
);
return Observable.fromPromise(updatePromise).doOnNext(() => {
if (type === 'json') {
return res.send({
alreadyCompleted,
points: alreadyCompleted ? user.points : user.points + 1,
completedDate: completedChallenge.completedDate
});
}
return res.status(200).send(true);
});
})
.subscribe(() => {}, next);
}
@ -376,19 +386,24 @@ export default async function bootChallenge(app, done) {
completedChallenge
);
return user
.update$(updateData)
.doOnNext(({ count }) => log('%s documents updated', count))
.doOnNext(() => {
if (type === 'json') {
return res.send({
alreadyCompleted,
points: alreadyCompleted ? user.points : user.points + 1,
completedDate: completedChallenge.completedDate
});
const updatePromise = new Promise((resolve, reject) =>
user.updateAttributes(updateData, err => {
if (err) {
return reject(err);
}
return res.status(200).send(true);
});
return resolve();
})
);
return Observable.fromPromise(updatePromise).doOnNext(() => {
if (type === 'json') {
return res.send({
alreadyCompleted,
points: alreadyCompleted ? user.points : user.points + 1,
completedDate: completedChallenge.completedDate
});
}
return res.status(200).send(true);
});
})
.subscribe(() => {}, next);
}

9
api-server/server/boot/user.js
View File

@ -120,12 +120,15 @@ function getUnlinkSocial(req, res, next) {
const updateData = { [social]: null };
return user.update$(updateData).subscribe(() => {
return user.updateAttributes(updateData, err => {
if (err) {
return next(err);
}
log(`${social} has been unlinked successfully`);
req.flash('info', `You've successfully unlinked your ${social}.`);
return res.redirect('/' + username);
}, next);
return res.redirectWithFlash(`${homeLocation}/${username}`);
});
});
});
}

3
api-server/server/datasources.json
View File

@ -1,7 +1,8 @@
{
"db": {
"name": "db",
"connector": "mongodb"
"connector": "mongodb",
"allowExtendedOperators": true
},
"mail": {
"name": "mail",