fix(install): roles invalid during install #208

polonel · May 29, 2019 · cc3a880 · cc3a880
1 parent e68607c
commit cc3a880
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/controllers/install.js b/src/controllers/install.js
@@ -258,7 +258,7 @@ installController.install = function (req, res) {
                 {
                   name: 'Admin',
                   description: 'Default role for admins',
-                  grants: defaults.adminGrants
+                  grants: defaults.roleDefaults.adminGrants
                 },
                 function (err, role) {
                   if (err) return done(err)
@@ -272,7 +272,7 @@ installController.install = function (req, res) {
                 {
                   name: 'Support',
                   description: 'Default role for agents',
-                  grants: defaults.supportGrants
+                  grants: defaults.roleDefaults.supportGrants
                 },
                 function (err, role) {
                   if (err) return done(err)
@@ -286,7 +286,7 @@ installController.install = function (req, res) {
                 {
                   name: 'User',
                   description: 'Default role for users',
-                  grants: defaults.userGrants
+                  grants: defaults.roleDefaults.userGrants
                 },
                 function (err, role) {
                   if (err) return done(err)

diff --git a/src/models/role.js b/src/models/role.js
@@ -23,7 +23,7 @@ var roleSchema = mongoose.Schema(
     name: { type: String, required: true, unique: true },
     normalized: String,
     description: String,
-    grants: [{ type: String, required: true, default: '' }],
+    grants: [{ type: String, required: true }],
     hierarchy: { type: Boolean, required: true, default: true }
   },
   {

diff --git a/src/settings/defaults.js b/src/settings/defaults.js
@@ -51,6 +51,8 @@ roleDefaults.adminGrants = [
   'api:*'
 ]
 
+settingsDefaults.roleDefaults = roleDefaults
+
 function rolesDefault (callback) {
   var roleSchema = require('../models/role')