[Marketplace] Feature - Permissions should be settable by placing a user into a predefined group

client/modules/core/helpers/layout.js

@@ -19,6 +19,7 @@ Template.registerHelper("reactionTemplate", function (options) {
   const shopId = options.hash.shopId || Reaction.getShopId();
   // get shop info, defaults to current
   const Shop = Collections.Shops.findOne(shopId);
+  const defaultRoles = Collections.Groups.findOne({ slug: "customer", shopId }).permissions;
   const reactionTemplates = [];
   // fetch collection from shop.layout configuration
   let layout = _.find(Shop.layout, {
@@ -72,7 +73,7 @@ Template.registerHelper("reactionTemplate", function (options) {
     for (layout of layoutWorkflows) {
       // audience is layout permissions
       if (layout.audience === undefined) {
-        layout.audience = Shop.defaultRoles || "owner";
+        layout.audience = defaultRoles || "owner";
       }
 
       // check permissions so you don't have to on template.

client/modules/core/subscriptions.js

@@ -38,6 +38,8 @@ Subscriptions.SellerShops = Subscriptions.Manager.subscribe("SellerShops");
 
 Subscriptions.Tags = Subscriptions.Manager.subscribe("Tags");
 
+Subscriptions.Groups = Subscriptions.Manager.subscribe("Groups");
+
 Subscriptions.Media = Subscriptions.Manager.subscribe("Media");
 
 /**

imports/plugins/core/accounts/server/init.js

@@ -1,9 +1,9 @@
 import { Reaction, Hooks } from "/server/api";
 
 Hooks.Events.add("afterCoreInit", () => {
-  Reaction.addRolesToDefaultRoleSet({
+  Reaction.addRolesToGroups({
     allShops: true,
-    roleSets: ["defaultRoles", "defaultVisitorRole"],
+    groups: ["guest", "customer"],
     roles: ["account/verify"]
   });
 });

imports/plugins/core/checkout/server/methods/workflow.js

@@ -1,7 +1,7 @@
 import _ from "lodash";
 import { Meteor } from "meteor/meteor";
 import { check, Match } from "meteor/check";
-import { Cart, Orders, Packages, Shops } from "/lib/collections";
+import { Cart, Orders, Packages, Groups } from "/lib/collections";
 import { Logger, Reaction } from "/server/api";
 
 /* eslint no-shadow: 0 */
@@ -64,12 +64,10 @@ Meteor.methods({
         _.each(layouts, function (layout) {
           // audience is the layout permissions
           if (typeof layout.audience !== "object") {
-            const defaultRoles = Shops.findOne(
-              Reaction.getShopId(), {
-                sort: {
-                  priority: 1
-                }
-              }).defaultRoles;
+            const defaultRoles = Groups.findOne({
+              slug: "customer",
+              shopId: Reaction.getShopId()
+            }).permissions;
             layout.audience = defaultRoles;
           }
           // check permissions so you don't have to on template. For a case, when

imports/plugins/included/notifications/server/init.js

@@ -1,15 +1,9 @@
-import { Reaction, Hooks, Logger } from "/server/api";
-import { Shops } from "/lib/collections";
-
-function addRolesToVisitors() {
-    // Add the about permission to all default roles since it's available to all
-  Logger.debug("Adding notification route permissions to default roles");
-  const shop = Shops.findOne(Reaction.getShopId());
-  Shops.update(shop._id, {
-    $addToSet: { defaultRoles: "notifications" }
-  });
-}
+import { Reaction, Hooks } from "/server/api";
 
 Hooks.Events.add("afterCoreInit", () => {
-  addRolesToVisitors();
+  Reaction.addRolesToGroups({
+    allShops: true,
+    groups: ["guest", "customer"],
+    roles: ["notifications"]
+  });
 });

imports/plugins/included/payments-paypal/server/startup/startup.js

@@ -1,9 +1,9 @@
 import { Reaction, Hooks } from "/server/api";
 
 Hooks.Events.add("afterCoreInit", () => {
-  Reaction.addRolesToDefaultRoleSet({
+  Reaction.addRolesToGroups({
     allShops: true,
-    roleSets: ["defaultRoles", "defaultVisitorRole"],
+    groups: ["customer", "guest"],
     roles: ["reaction-paypal/paypalDone", "reaction-paypal/paypalCancel"]
   });
 });

lib/collections/collections.js

@@ -119,6 +119,13 @@ export const Shops = new Mongo.Collection("Shops");
 
 Shops.attachSchema(Schemas.Shop);
 
+/**
+* Groups Collection
+*/
+export const Groups = new Mongo.Collection("Groups");
+
+Groups.attachSchema(Schemas.Groups);
+
 /**
  * SellerShops Collection (client-only)
  */

lib/collections/schemas/accounts.js

@@ -107,6 +107,11 @@ export const Accounts = new SimpleSchema({
     type: Profile,
     optional: true
   },
+  groups: {
+    type: [String], // groupIds that user belongs to
+    optional: true,
+    defaultValue: []
+  },
   metafields: {
     type: [Metafield],
     optional: true

lib/collections/schemas/groups.js

@@ -0,0 +1,49 @@
+import { SimpleSchema } from "meteor/aldeed:simple-schema";
+
+export const Groups = new SimpleSchema({
+  name: {
+    type: String
+  },
+  description: {
+    type: String,
+    optional: true
+  },
+  slug: {
+    type: String
+  },
+  permissions: {
+    type: [String]
+  },
+  shopId: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id
+  },
+  createdBy: {
+    type: String,
+    optional: true,
+    regEx: SimpleSchema.RegEx.Id,
+    autoValue: function () {
+      return this.userId || this.value;
+    }
+  },
+  createdAt: {
+    type: Date,
+    autoValue: function () {
+      if (this.isInsert) {
+        return new Date;
+      } else if (this.isUpsert) {
+        return {
+          $setOnInsert: new Date
+        };
+      }
+    }
+  },
+  updatedAt: {
+    type: Date,
+    autoValue: function () {
+      return new Date;
+    }
+  }
+});
+
+

lib/collections/schemas/index.js

@@ -16,6 +16,7 @@ export * from "./registry";
 export * from "./revisions";
 export * from "./shipping";
 export * from "./shops";
+export * from "./groups";
 export * from "./sms";
 export * from "./social";
 export * from "./tags";

lib/collections/schemas/shops.js

@@ -219,14 +219,6 @@ export const Shop = new SimpleSchema({
     type: [Metafield],
     optional: true
   },
-  "defaultVisitorRole": {
-    type: [String],
-    defaultValue: ["anonymous", "guest", "product", "tag", "index", "cart/checkout", "cart/completed"]
-  },
-  "defaultRoles": {
-    type: [String],
-    defaultValue: ["guest", "account/profile", "product", "tag", "index", "cart/checkout", "cart/completed"]
-  },
   "defaultSellerRoles": {
     type: [String],
     defaultValue: [

private/data/Shops.json

@@ -3189,25 +3189,7 @@
     "isCommercial": true,
     "isShippingDefault": true,
     "isBillingDefault": true
-  }],
-  "defaultVisitorRole": [
-    "anonymous",
-    "guest",
-    "product",
-    "tag",
-    "index",
-    "cart/checkout",
-    "cart/completed"
-  ],
-  "defaultRoles": [
-    "account/profile",
-    "guest",
-    "product",
-    "tag",
-    "index",
-    "cart/checkout",
-    "cart/completed"
-  ]
+  }]
 }, {
   "_id": "ddzuN2YPvgvx7rJS5",
   "currencies": {
@@ -6395,25 +6377,5 @@
     "isCommercial": true,
     "isShippingDefault": true,
     "isBillingDefault": true
-  }],
-  "defaultVisitorRole": [
-    "anonymous",
-    "guest",
-    "account/verify",
-    "product",
-    "tag",
-    "index",
-    "cart/checkout",
-    "cart/completed"
-  ],
-  "defaultRoles": [
-    "account/profile",
-    "guest",
-    "product",
-    "account/verify",
-    "tag",
-    "index",
-    "cart/checkout",
-    "cart/completed"
-  ]
+  }]
 }]