github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Only define Collection.prototype.allow/deny on the server."

Browse Source 
This reverts commit 2294da1297.
This commit is contained in:
Naomi Seyfer
2013-04-16 13:34:22 -07:00
parent 0b51590f3d
commit eb90df2f8d
1 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
packages/mongo-livedata/collection.js
View File

@@ -421,51 +421,50 @@ Meteor.Collection.ObjectID = LocalCollection._ObjectID;
// call all of them if it is able to make a decision without calling them all
// (so don't include side effects).
if (Meteor.isServer) { // ACLs only run on the server.
(function () {
var addValidator = function(allowOrDeny, options) {
// validate keys
var VALID_KEYS = ['insert', 'update', 'remove', 'fetch', 'transform'];
_.each(_.keys(options), function (key) {
if (!_.contains(VALID_KEYS, key))
throw new Error(allowOrDeny + ": Invalid key: " + key);
});
(function () {
var addValidator = function(allowOrDeny, options) {
// validate keys
var VALID_KEYS = ['insert', 'update', 'remove', 'fetch', 'transform'];
_.each(_.keys(options), function (key) {
if (!_.contains(VALID_KEYS, key))
throw new Error(allowOrDeny + ": Invalid key: " + key);
});
var self = this;
self._restricted = true;
var self = this;
self._restricted = true;
_.each(['insert', 'update', 'remove'], function (name) {
if (options[name]) {
if (!(options[name] instanceof Function)) {
throw new Error(allowOrDeny + ": Value for `" + name + "` must be a function");
}
if (self._transform)
options[name].transform = self._transform;
if (options.transform)
options[name].transform = Deps._makeNonreactive(options.transform);
self._validators[name][allowOrDeny].push(options[name]);
_.each(['insert', 'update', 'remove'], function (name) {
if (options[name]) {
if (!(options[name] instanceof Function)) {
throw new Error(allowOrDeny + ": Value for `" + name + "` must be a function");
}
});
// Only update the fetch fields if we're passed things that affect
// fetching. This way allow({}) and allow({insert: f}) don't result in
// setting fetchAllFields
if (options.update || options.remove || options.fetch) {
if (options.fetch && !(options.fetch instanceof Array)) {
throw new Error(allowOrDeny + ": Value for `fetch` must be an array");
}
self._updateFetch(options.fetch);
if (self._transform)
options[name].transform = self._transform;
if (options.transform)
options[name].transform = Deps._makeNonreactive(options.transform);
self._validators[name][allowOrDeny].push(options[name]);
}
};
});
// Only update the fetch fields if we're passed things that affect
// fetching. This way allow({}) and allow({insert: f}) don't result in
// setting fetchAllFields
if (options.update || options.remove || options.fetch) {
if (options.fetch && !(options.fetch instanceof Array)) {
throw new Error(allowOrDeny + ": Value for `fetch` must be an array");
}
self._updateFetch(options.fetch);
}
};
Meteor.Collection.prototype.allow = function(options) {
addValidator.call(this, 'allow', options);
};
Meteor.Collection.prototype.deny = function(options) {
addValidator.call(this, 'deny', options);
};
})();
Meteor.Collection.prototype.allow = function(options) {
addValidator.call(this, 'allow', options);
};
Meteor.Collection.prototype.deny = function(options) {
addValidator.call(this, 'deny', options);
};
})();
}
Meteor.Collection.prototype._defineMutationMethods = function() {
var self = this;