@steedos/standard-permission 3.0.0-beta.24 → 3.0.0-beta.26

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-permission",
-    "version": "3.0.0-beta.24",
+    "version": "3.0.0-beta.26",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,7 +12,7 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "3df12ff072b51e68b21089386fc9689e1ff8dd88",
+    "gitHead": "b0b298b226854ea95190e4723fd508d9e096901e",
     "dependencies": {
         "clone": "^2.1.2"
     }

package/main/default/objects/permission_shares.object.js

@@ -1,57 +0,0 @@
-const objectql = require('@steedos/objectql');
-
-Creator.Objects['permission_shares'].triggers = Object.assign({}, Creator.Objects['permission_shares'].triggers, {
-  "before.insert.server.sharing": {
-    on: "server",
-    when: "before.insert",
-    todo: function (userId, doc) {
-      if (_.isEmpty(doc.organizations) && _.isEmpty(doc.users)) {
-        throw new Meteor.Error(500, "请在授权组织或授权用户中至少填写一个值");
-      }
-    }
-  },
-  "before.update.server.sharing": {
-    on: "server",
-    when: "before.update",
-    todo: function (userId, doc, fieldNames, modifier, options) {
-      var errMsg;
-      errMsg = t("creator_permission_share_miss");
-      if (fieldNames.length === 1) {
-        if (fieldNames.indexOf("organizations") > -1) {
-          if (_.isEmpty(modifier.$set.organizations) && _.isEmpty(doc.users)) {
-            throw new Meteor.Error(500, errMsg);
-          }
-        } else if (fieldNames.indexOf("users") > -1) {
-          if (_.isEmpty(doc.organizations) && _.isEmpty(modifier.$set.users)) {
-            throw new Meteor.Error(500, errMsg);
-          }
-        }
-      } else if (_.isEmpty(modifier.$set.organizations) && _.isEmpty(modifier.$set.users)) {
-        throw new Meteor.Error(500, errMsg);
-      }
-    }
-  }
-})
-
-if(Meteor.isServer){
-  Meteor.startup(function() {
-    let objectName = 'permission_shares';
-    Creator.getCollection(objectName).find({}, {
-      fields: {
-        _id: 1,
-        object_name: 1,
-        filters: 1
-      }
-    }).observe({
-      added: function(doc){
-        objectql.addConfig(objectName, doc)
-      },
-      changed: function(doc){
-        objectql.addConfig(objectName, doc)
-      },
-      removed: function(doc){
-        objectql.removeConfig(objectName, doc)
-      }
-    })
-  });
-}

package/main/default/server/permission_set.object.js

@@ -1,130 +0,0 @@
-var _ = require("underscore");
-function checkType(name, type){
-    if(_.include(['admin','user','supplier','customer'], name) && type != 'profile'){
-        throw new Meteor.Error(500, "API名称为admin,user,supplier,customer时，类别必须为简档");
-    }
-}
-
-Creator.Objects['permission_set'].triggers = Object.assign({}, Creator.Objects['permission_set'].triggers,{
-    "before.insert.server.check": {
-        on: "server",
-        when: "before.insert",
-        todo: function (userId, doc) {
-            var newName;
-            // console.log "before.insert.server.check,doc:", doc
-            newName = doc != null ? doc.name : void 0;
-            if (newName && Creator.getCollection("permission_set").findOne({
-                space: doc.space,
-                name: newName
-            }, {
-                    fields: {
-                        name: 1
-                    }
-                })) {
-                throw new Meteor.Error(500, "API名称不能重复");
-            }
-            checkType(doc.name, doc.type);
-            if(doc.type === 'profile'){
-                if(!doc.license){
-                    // throw new Meteor.Error(500, "请指定许可证");
-                }else{
-                    // if(_.indexOf(_.pluck(Steedos.getLicenseOptionsSync(doc.space), 'value'), doc.license) < 0){
-                    //     throw new Meteor.Error(500, "无效的许可证");
-                    // }
-                }
-            }
-
-            // if(doc.license){
-            //     if(_.indexOf(_.pluck(Steedos.getLicenseOptionsSync(doc.space), 'value'), doc.license) < 0){
-            //         throw new Meteor.Error(500, "无效的许可证");
-            //     }
-            // }
-
-            if(doc.type === 'profile'){
-                delete doc.users
-            }
-        }
-    },
-    "before.update.server.check": {
-        on: "server",
-        when: "before.update",
-        todo: function (userId, doc, fieldNames, modifier, options) {
-            var newName, ref;
-            newName = (ref = modifier.$set) != null ? ref.name : void 0;
-            if (newName && Creator.getCollection("permission_set").findOne({
-                space: doc.space,
-                name: newName,
-                _id: {
-                    $ne: doc._id
-                }
-            }, {
-                    fields: {
-                        name: 1
-                    }
-                })) {
-                throw new Meteor.Error(500, "API名称不能重复");
-            }
-
-            var set = modifier.$set || {}
-            if(_.has(set, 'name') || _.has(set, 'type')){
-                checkType(set.name || doc.name, set.type || doc.type);
-            }
-
-            if(_.has(set, 'type') || _.has(set, 'users')){
-                var type = set.type || doc.type;
-                var users = set.users || doc.users
-                if(type === 'profile'){
-                    if(_.has(set, 'users')){
-                        modifier.$set.users = []
-                    }else{
-                        if(!modifier.$unset){
-                            modifier.$unset = {}  
-                        }
-                        modifier.$unset.users = 1
-                    }
-                }
-            }
-            var unset = modifier.$unset || {}
-            if((_.has(set, 'license') && set.license != doc.license)){
-                throw new Meteor.Error(500, '禁止修改许可证');
-                // let _type = set.type || doc.type;
-                // if(_type === 'profile'){
-                //     if(!set.license){
-                //         throw new Meteor.Error(500, "请指定许可证");
-                //     }else{
-                        
-                //         if(_.indexOf(_.pluck(Steedos.getLicenseOptionsSync(doc.space), 'value'), set.license) < 0){
-                //             throw new Meteor.Error(500, "无效的许可证");
-                //         }
-                //     }
-                // }
-            }
-        }
-    },
-    "after.update.server.syncSpaceUserProfile": {
-        on: "server",
-        when: "after.update",
-        todo: function(userId, doc, fieldNames, modifier, options){
-            modifier.$set = modifier.$set || {}
-            if(doc.type === 'profile' && _.has(modifier.$set, 'name') && modifier.$set.name != this.previous.name){
-                if(doc.space){
-                    db.space_users.update({space: doc.space, profile: this.previous.name}, {$set: {profile: doc.name}}, {
-                        multi: true
-                    });
-                }
-            }
-        }
-    },
-    "before.remove.server.check": {
-        on: "server",
-        when: "before.remove",
-        todo: function (userId, doc) {
-            var documents, object_collections;
-            console.log('permission_objects', {permission_set_id: doc._id, space: doc.space});
-            var pero= Creator.getCollection("permission_objects").find({permission_set_id: doc._id, space: doc.space}, {fields:{_id:1}});
-            if (pero.count() > 0) {
-                throw new Meteor.Error(500, `此记录已在对象权限中引用`);
-            }
-        }
-    }
-})