@modular-rest/server 1.8.0 → 1.10.0

package/src/helper/data_insertion.js

@@ -1,87 +1,24 @@
 const DataProvider = require("../services/data_provider/service");
-
-function createPermissions() {
-  let model = DataProvider.getCollection("cms", "permission");
-
-  return new Promise(async (done, reject) => {
-    // create customer permission
-    let isAnonymousExisted = await model
-      .countDocuments({ title: "anonymous" })
-      .exec()
-      .catch(reject);
-    let isCoustomerExisted = await model
-      .countDocuments({ title: "customer" })
-      .exec()
-      .catch(reject);
-    let isAdministratorExisted = await model
-      .countDocuments({ title: "administrator" })
-      .exec()
-      .catch(reject);
-
-    if (!isAnonymousExisted) {
-      await new model({
-        anonymous_access: true,
-        isAnonymous: true,
-        title: "anonymous",
-      })
-        .save()
-        .catch(reject);
-    }
-
-    if (!isCoustomerExisted) {
-      await new model({
-        customer_access: true,
-        anonymous_access: true,
-        upload_file_access: true,
-        remove_file_access: true,
-        isDefault: true,
-        title: "customer",
-      })
-        .save()
-        .catch(reject);
-    }
-
-    if (!isAdministratorExisted) {
-      await new model({
-        god_access: true,
-        customer_access: true,
-        anonymous_access: true,
-        upload_file_access: true,
-        remove_file_access: true,
-        title: "administrator",
-      })
-        .save()
-        .catch(reject);
-    }
-
-    done();
-  });
-}
+const {
+  getDefaultAnonymousPermissionGroup,
+  getDefaultAdministratorPermissionGroup,
+} = require("../services/user_manager/permissionManager");
 
 async function createAdminUser({ email, password }) {
-  let permissionModel = DataProvider.getCollection("cms", "permission");
   let authModel = DataProvider.getCollection("cms", "auth");
 
   try {
-    let isAnonymousExisted = await authModel
+    const isAnonymousExisted = await authModel
       .countDocuments({ type: "anonymous" })
       .exec();
 
-    let isAdministratorExisted = await authModel
+    const isAdministratorExisted = await authModel
       .countDocuments({ type: "user", email: email })
       .exec();
 
-    let anonymousPermission = await permissionModel
-      .findOne({ title: "anonymous" })
-      .exec();
-
-    let administratorPermission = await permissionModel
-      .findOne({ title: "administrator" })
-      .exec();
-
     if (isAnonymousExisted == 0) {
       await new authModel({
-        permission: anonymousPermission._id,
+        permission: getDefaultAnonymousPermissionGroup().title,
         email: "",
         phone: "",
         password: "",
@@ -90,8 +27,12 @@ async function createAdminUser({ email, password }) {
     }
 
     if (isAdministratorExisted == 0) {
+      if (!email || !password) {
+        return Promise.reject("Invalid email or password for admin user.");
+      }
+
       await new authModel({
-        permission: administratorPermission._id,
+        permission: getDefaultAdministratorPermissionGroup().title,
         email: email,
         password: password,
         type: "user",
@@ -103,6 +44,5 @@ async function createAdminUser({ email, password }) {
 }
 
 module.exports = {
-  createPermissions,
   createAdminUser,
 };

package/src/helper/presetup_services.js

@@ -19,22 +19,10 @@ module.exports.setup = async ({ keypair, adminUser, uploadDirectory }) => {
   /**
    * Data Insertion
    *
-   * Insert permissions and admin user
+   * Insert admin user
    * for the first time
    */
-  await DataInsertion.createPermissions().catch((err) => {
-    console.log(
-      "Error while creating permissions, it seems data is already inserted.",
-      err
-    );
-  });
-
-  await DataInsertion.createAdminUser(adminUser).catch((err) => {
-    console.log(
-      "Error while creating admin user, it seems data is already inserted.",
-      err
-    );
-  });
+  await DataInsertion.createAdminUser(adminUser);
 
   /**
    * File Service