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

Added displayUsername and username update functionality (#35699)

Browse Source 
* Added displayUsername and username update functionality

* fix: move username assignment to safe place

moved the username assignment down a statement so that it doesn't cause exception 

* fix: handle missing username or displayUsername

* refactor: remove redundant code
This commit is contained in:
Catalina
2019-12-11 06:43:06 -05:00
committed by Oliver Eyton-Williams
parent 0f5b9f8764
commit e154f38118
13 changed files with 87 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
api-server/server/boot/settings.js
View File

@ -194,7 +194,7 @@ function createUpdateMyUsername(app) {
user,
body: { username }
} = req;
if (username === user.username) {
if (username.toLowerCase() === user.username) {
return res.json({
type: 'info',
message: 'Username is already associated with this account'
@ -209,7 +209,7 @@ function createUpdateMyUsername(app) {
});
}
const exists = await User.doesExist(username);
const exists = await User.doesExist(username.toLowerCase());
if (exists) {
return res.json({
@ -218,16 +218,19 @@ function createUpdateMyUsername(app) {
});
}
return user.updateAttribute('username', username, err => {
if (err) {
res.status(500).json(standardErrorMessage);
return next(err);
return user.updateAttributes(
{ username: username.toLowerCase(), displayUsername: username },
err => {
if (err) {
res.status(500).json(standardErrorMessage);
return next(err);
}
return res.status(200).json({
type: 'success',
message: `We have updated your username to ${username}`
});
}
return res.status(200).json({
type: 'success',
message: `We have updated your username to ${username}`
});
});
);
};
}