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

refactor: Update methods to sensible names

Browse Source
This commit is contained in:
Mrugesh Mohapatra
2017-10-21 04:58:53 +05:30
parent 2a3703b95a
commit 9ccfe4f72c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/models/user.js
View File

@ -472,7 +472,7 @@ module.exports = function(User) {
} }
); );
User.requestAuthLink = function requestAuthLink(email) { User.requestAuthEmail = function requestAuthEmail(email) {
if (!isEmail(email)) { if (!isEmail(email)) {
return Promise.reject( return Promise.reject(
new Error('The submitted email not valid.') new Error('The submitted email not valid.')
@ -545,7 +545,7 @@ module.exports = function(User) {
}; };
User.remoteMethod( User.remoteMethod(
'requestAuthLink', 'requestAuthEmail',
{ {
description: 'request a link on email with temporary token to sign in', description: 'request a link on email with temporary token to sign in',
accepts: [{ accepts: [{
@ -560,7 +560,7 @@ module.exports = function(User) {
} }
); );
User.prototype.updateEmail = function updateEmail(email) { User.prototype.requestUpdateEmail = function requestUpdateEmail(email) {
const ownEmail = email === this.email; const ownEmail = email === this.email;
if (!isEmail('' + email)) { if (!isEmail('' + email)) {
return Observable.throw(createEmailError()); return Observable.throw(createEmailError());

4
common/models/user.json
View File

@ -277,7 +277,7 @@
"principalType": "ROLE", "principalType": "ROLE",
"principalId": "$owner", "principalId": "$owner",
"permission": "ALLOW", "permission": "ALLOW",
"property": "updateEmail" "property": "requestUpdateEmail"
}, },
{ {
"accessType": "EXECUTE", "accessType": "EXECUTE",
@ -298,7 +298,7 @@
"principalType": "ROLE", "principalType": "ROLE",
"principalId": "$everyone", "principalId": "$everyone",
"permission": "ALLOW", "permission": "ALLOW",
"property": "requestAuthLink" "property": "requestAuthEmail"
} }
], ],
"methods": {} "methods": {}

2
server/boot/settings.js
View File

@ -21,7 +21,7 @@ export default function settingsController(app) {
function updateMyEmail(req, res, next) { function updateMyEmail(req, res, next) {
const { user, body: { email } } = req; const { user, body: { email } } = req;
return user.updateEmail(email) return user.requestUpdateEmail(email)
.subscribe( .subscribe(
(message) => res.json({ message }), (message) => res.json({ message }),
next next

2
server/boot/user.js
View File

@ -248,7 +248,7 @@ module.exports = function(app) {
return res.redirect('/'); return res.redirect('/');
} }
return User.requestAuthLink(req.body.email) return User.requestAuthEmail(req.body.email)
.then(msg => { .then(msg => {
return res.status(200).send({ message: msg }); return res.status(200).send({ message: msg });
}) })