Skip to content
Snippets Groups Projects
Commit 4c77d2d4 authored by Henrique Varella Ehrenfried's avatar Henrique Varella Ehrenfried
Browse files

Make API to always return as a JSONObject

parent 874d2cc9
No related branches found
No related tags found
No related merge requests found
......@@ -21,7 +21,6 @@ module.exports = function(app) {
});
}
switch (context.modelName){
case 'end_user':
break;
......@@ -33,35 +32,14 @@ module.exports = function(app) {
return reject();
}
// // if the target model is not project
// if (context.modelName !== 'project') {
// return reject();
// }
// do not allow anonymous users
var userId = context.accessToken.userId;
if (!userId) {
return reject();
}
else{
console.log("USER ID ::",userId)
}
console.log("ROLE ::", role)
console.log("CONTEXT MODEL ::", context.model)
console.log("CONTEXT ID ::", context.id)
// check if userId is in team table for the given project id
context.model.findById(userId, function(err, model) {
app.models.EndUser.findById(userId, function(err2, user){
console.log("ERR ::", err)
console.log("ERR 2::", err2)
console.log("MODEL ::", model)
console.log("ENDUSER MODEL", user)
if (err || err2 || !user || !model)
return reject();
if(user.permission !== role)
......@@ -91,34 +69,21 @@ module.exports = function(app) {
return reject();
}
// // if the target model is not project
// if (context.modelName !== 'project') {
// return reject();
// }
// do not allow anonymous users
var userId = context.accessToken.userId;
if (!userId) {
return reject();
}
// check if userId is in team table for the given project id
context.model.findById(context.modelId, function(err, model) {
if (err || !model)
return reject();
var EndUser = app.models.EndUser;
EndUser.count({
ownerId: model.ownerId,
memberId: userId
}, function(err, count) {
if (err) {
console.log(err);
return cb(null, false);
}
context.model.findById(userId, function(err, model) {
cb(null, count > 0); // true = is a team member
});
app.models.EndUser.findById(userId, function(err2, user){
if (err || err2 || !user || !model)
return reject();
if(user.permission !== role)
return reject();
else
return cb(null,true)
})
});
});
};
\ No newline at end of file
module.exports = function(server) {
var remotes = server.remotes();
// modify all returned values
remotes.after('**', function (ctx, next) {
ctx.result = {
result: ctx.result
};
next();
});
};
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment