egg-born-module-a-base-sync - npm Package Compare versions

Comparing version 4.8.11 to 4.8.12

backend/src/bean/atom.role.js

@@ -87,3 +87,9 @@ module.exports = app => {
     async write({ atomClass, target, key, item, options, user }) {
-      delete item.roleIdParent; // roleIdParent maybe string, so cause validate error
+      // check demo
+      const ctxCaller = this.ctx.ctxCaller;
+      if (ctxCaller && ctxCaller.path === '/api/a/base/atom/write') {
+        this.ctx.bean.util.checkDemo();
+      }
+      // roleIdParent maybe string, so cause validate error
+      delete item.roleIdParent;
       // super
@@ -90,0 +96,0 @@ await super.write({ atomClass, target, key, item, options, user });

backend/src/bean/atom.user.js

@@ -62,2 +62,7 @@ module.exports = app => {
     async write({ atomClass, target, key, item, options, user }) {
+      // check demo
+      const ctxCaller = this.ctx.ctxCaller;
+      if (ctxCaller && ctxCaller.path === '/api/a/base/atom/write') {
+        this.ctx.bean.util.checkDemo();
+      }
       // super
@@ -85,2 +90,7 @@ await super.write({ atomClass, target, key, item, options, user });
     async enable({ atomClass, key, user }) {
+      // check demo
+      const ctxCaller = this.ctx.ctxCaller;
+      if (ctxCaller && ctxCaller.path === '/api/a/base/atom/enable') {
+        this.ctx.bean.util.checkDemo();
+      }
       // super
@@ -96,2 +106,7 @@ await super.enable({ atomClass, key, user });
     async disable({ atomClass, key, user }) {
+      // check demo
+      const ctxCaller = this.ctx.ctxCaller;
+      if (ctxCaller && ctxCaller.path === '/api/a/base/atom/disable') {
+        this.ctx.bean.util.checkDemo();
+      }
       // super
@@ -98,0 +113,0 @@ await super.disable({ atomClass, key, user });

backend/src/bean/bean.util.js

@@ -195,4 +195,3 @@ const require3 = require('require3');
       let _sep, _parts;
-      for (let index = 0; index < sep.length; index++) {
-        _sep = sep[index];
+      for (_sep of sep) {
         _parts = key.split(_sep);
@@ -199,0 +198,0 @@ if (_parts.length > 1) break;

backend/src/bean/version/init2.js

@@ -36,16 +36,27 @@ const require3 = require('require3');
     async _initUsers(roleIds, options) {
-      // root user
+      // users
+      const users = [];
+      // user: root
       const userRoot = extend(true, {}, initData.users.root);
       userRoot.item.email = options.email;
       userRoot.item.mobile = options.mobile;
-      const userId = await ctx.bean.user.add(userRoot.item);
-      // activated
-      await ctx.bean.user.save({
-        user: { id: userId, activated: 1 },
-      });
-      // user->role
-      await ctx.bean.role.addUserRole({
-        userId,
-        roleId: roleIds[userRoot.roleId],
-      });
+      users.push(userRoot);
+      // user: admin
+      const demo = ctx.config.module(moduleInfo.relativeName).configFront.demo;
+      if (demo.enable) {
+        const userAdmin = extend(true, {}, initData.users.admin);
+        users.push(userAdmin);
+      }
+      for (const user of users) {
+        const userId = await ctx.bean.user.add(user.item);
+        // activated
+        await ctx.bean.user.save({
+          user: { id: userId, activated: 1 },
+        });
+        // user->role
+        await ctx.bean.role.addUserRole({
+          userId,
+          roleId: roleIds[user.roleId],
+        });
+      }
     }
@@ -52,0 +63,0 @@ }

backend/src/bean/version/initData2.js

@@ -104,2 +104,14 @@ // roles
   },
+  admin: {
+    item: {
+      userName: 'admin',
+      realName: 'admin',
+      email: null,
+      mobile: null,
+      avatar: null,
+      motto: null,
+      locale: null,
+    },
+    roleId: 'superuser',
+  },
 };
@@ -106,0 +118,0 @@

package.json

 {
   "name": "egg-born-module-a-base-sync",
-  "version": "4.8.11",
+  "version": "4.8.12",
   "title": "Base",
@@ -5,0 +5,0 @@ "eggBornModule": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

2585647

increased by0.15%

Lines of code

34690

increased by0.25%

No dependency changes