Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00
Code Issues Activity

Update users api canThis context

Browse source 
- Update api.users methods to pass the whole context to canThis instead
of just this.user
This commit is contained in:
Jacob Gable 2014-05-06 20:11:15 -05:00
parent 7de8025bed
commit 9c9cfe763a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/server/api/users.js
View file

@ -20,7 +20,7 @@ users = {
// **takes:** options object // **takes:** options object
browse: function browse(options) { browse: function browse(options) {
// **returns:** a promise for a collection of users in a json object // **returns:** a promise for a collection of users in a json object
return canThis(this.user).browse.user().then(function () { return canThis(this).browse.user().then(function () {
return dataProvider.User.findAll(options).then(function (result) { return dataProvider.User.findAll(options).then(function (result) {
return { users: result.toJSON() }; return { users: result.toJSON() };
}); });
@ -51,7 +51,7 @@ users = {
edit: function edit(userData) { edit: function edit(userData) {
// **returns:** a promise for the resulting user in a json object // **returns:** a promise for the resulting user in a json object
var self = this; var self = this;
return canThis(this.user).edit.user(userData.users[0].id).then(function () { return canThis(this).edit.user(userData.users[0].id).then(function () {
return checkUserData(userData).then(function (checkedUserData) { return checkUserData(userData).then(function (checkedUserData) {
return dataProvider.User.edit(checkedUserData.users[0], {user: self.user}); return dataProvider.User.edit(checkedUserData.users[0], {user: self.user});
}).then(function (result) { }).then(function (result) {
@ -70,11 +70,11 @@ users = {
add: function add(userData) { add: function add(userData) {
// **returns:** a promise for the resulting user in a json object // **returns:** a promise for the resulting user in a json object
var self = this; var self = this;
return canThis(this.user).add.user().then(function () { return canThis(this).add.user().then(function () {
return checkUserData(userData).then(function (checkedUserData) { return checkUserData(userData).then(function (checkedUserData) {
// if the user is created by users.register(), use id: 1 // if the user is created by users.register(), use id: 1
// as the creator for now // as the creator for now
if (self.user === 'internal') { if (self.internal) {
self.user = 1; self.user = 1;
} }
return dataProvider.User.add(checkedUserData.users[0], {user: self.user}); return dataProvider.User.add(checkedUserData.users[0], {user: self.user});
@ -93,7 +93,7 @@ users = {
register: function register(userData) { register: function register(userData) {
// TODO: if we want to prevent users from being created with the signup form // TODO: if we want to prevent users from being created with the signup form
// this is the right place to do it // this is the right place to do it
return users.add.call({user: 'internal'}, userData); return users.add.call({internal: true}, userData);
}, },
// #### Check // #### Check