@kne/fastify-account 1.0.0-alpha.22 → 1.0.0-alpha.24

package/README.md

@@ -22,7 +22,7 @@ npm i --save @kne/fastify-account
 ### API
 
 ---
-title: "@kne/fastify-account v1.0.0-alpha.21"
+title: "@kne/fastify-account v1.0.0-alpha.22"
 language_tabs:
   - shell: Shell
   - http: HTTP
@@ -42,7 +42,7 @@ headingLevel: 2
 
 <!-- Generator: Widdershins v4.0.1 -->
 
-<h1 id="-kne-fastify-account">@kne/fastify-account v1.0.0-alpha.21</h1>
+<h1 id="-kne-fastify-account">@kne/fastify-account v1.0.0-alpha.22</h1>
 
 > Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.
 
@@ -834,20 +834,6 @@ This operation does not require authentication
 This operation does not require authentication
 </aside>
 
-## get__api_v1_account_tenant_getTenantUserInfo
-
-`GET /api/v1/account/tenant/getTenantUserInfo`
-
-<h3 id="get__api_v1_account_tenant_gettenantuserinfo-responses">Responses</h3>
-
-|Status|Meaning|Description|Schema|
-|---|---|---|---|
-|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Default Response|None|
-
-<aside class="success">
-This operation does not require authentication
-</aside>
-
 ## post__api_v1_account_tenant_addOrg
 
 `POST /api/v1/account/tenant/addOrg`
@@ -2681,6 +2667,31 @@ This operation does not require authentication
 This operation does not require authentication
 </aside>
 
+## get__api_v1_account_tenant_getTenantUserInfo
+
+`GET /api/v1/account/tenant/getTenantUserInfo`
+
+*获取租户用户所有操作日志列表*
+
+<h3 id="get__api_v1_account_tenant_gettenantuserinfo-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|filter|path|object|true|none|
+|type|path|string|true|none|
+|perPage|path|number|true|none|
+|currentPage|path|number|true|none|
+
+<h3 id="get__api_v1_account_tenant_gettenantuserinfo-responses">Responses</h3>
+
+|Status|Meaning|Description|Schema|
+|---|---|---|---|
+|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Default Response|None|
+
+<aside class="success">
+This operation does not require authentication
+</aside>
+
 <h1 id="-kne-fastify-account--">管理后台-权限</h1>
 
 ## post__api_v1_account_admin_addApplication
@@ -3391,6 +3402,7 @@ This operation does not require authentication
 |Name|In|Type|Required|Description|
 |---|---|---|---|---|
 |name|query|string|false|租户名|
+|status|query|number|false|状态|
 |serviceStartTime|query|string(date-time)|false|服务开始时间|
 |serviceEndTime|query|string(date-time)|false|服务结束时间|
 |perPage|query|number|false|每页条数|

package/libs/controllers/adminTenant.js

@@ -16,6 +16,10 @@ module.exports = fp(async (fastify, options) => {
               type: 'string',
               description: '租户名'
             },
+            status: {
+              type: 'number',
+              description: '状态'
+            },
             serviceStartTime: {
               type: 'string',
               format: 'date-time',
@@ -70,7 +74,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      const { name, perPage, currentPage } = Object.assign(
+      const { name, status, perPage, currentPage } = Object.assign(
         {
           perPage: 20,
           currentPage: 1
@@ -78,7 +82,7 @@ module.exports = fp(async (fastify, options) => {
         request.query
       );
       return await services.tenant.getAllTenantList({
-        filter: { name },
+        filter: { name, status },
         perPage,
         currentPage
       });

package/libs/controllers/adminTenantRole.js

@@ -25,7 +25,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      const { filter, tenantId, perPage, currentPage } = Object.assign(
+      const { filter, tenantId, withoutDefaultRole, perPage, currentPage } = Object.assign(
         {
           perPage: 20,
           currentPage: 1,
@@ -33,7 +33,7 @@ module.exports = fp(async (fastify, options) => {
         },
         request.query
       );
-      return await services.tenantRole.getTenantRoleList({ tenantId, perPage, currentPage, filter });
+      return await services.tenantRole.getTenantRoleList({ tenantId, withoutDefaultRole, perPage, currentPage, filter });
     }
   );
 

package/libs/controllers/adminTenantUser.js

@@ -15,7 +15,8 @@ module.exports = fp(async (fastify, options) => {
             filter: {
               type: 'object',
               properties: {
-                name: { type: 'string' }
+                name: { type: 'string' },
+                roleIds: { type: 'array', items: { type: 'number' }, default: [] }
               }
             },
             currentPage: { type: 'number' },

package/libs/controllers/tenant.js

@@ -10,11 +10,34 @@ module.exports = fp(async (fastify, options) => {
       return await services.tenantUser.getUserTenant(request.authenticatePayload);
     }
   );
+  fastify.get(
+    `${options.prefix}/tenant/getTenantInfo`,
+    {
+      onRequest: [authenticate.user]
+    },
+    async request => {
+      return await services.tenant.getTenantInfo(request.query);
+    }
+  );
 
   fastify.get(
     `${options.prefix}/tenant/getTenantUserInfo`,
     {
-      onRequest: [authenticate.user, authenticate.tenant]
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        tags: ['管理后台'],
+        summary: '获取租户用户所有操作日志列表',
+        params: {
+          type: 'object',
+          required: [],
+          properties: {
+            filter: { type: 'object' },
+            type: { type: 'string' },
+            perPage: { type: 'number' },
+            currentPage: { type: 'number' }
+          }
+        }
+      }
     },
     async request => {
       return request.tenantInfo;

package/libs/models/permission.js

@@ -42,6 +42,7 @@ module.exports = ({ DataTypes }) => {
     options: {
       indexes: [
         {
+          name:'code_application_key',
           unique: true,
           fields: ['code', 'application_id', 'pid', 'deleted_at']
         }

package/libs/models/tenant-application.js

@@ -17,6 +17,7 @@ module.exports = ({ DataTypes }) => {
     options: {
       indexes: [
         {
+          name:'tenant_application_key',
           unique: true,
           fields: ['tenant_id', 'application_id', 'deleted_at']
         }

package/libs/models/tenant-permission.js

@@ -17,6 +17,7 @@ module.exports = ({ DataTypes }) => {
     options: {
       indexes: [
         {
+          name:'tenant_permission_key',
           unique: true,
           fields: ['tenant_id', 'permission_id', 'deleted_at']
         }

package/libs/models/tenant-role-application.js

@@ -21,7 +21,7 @@ module.exports = ({ DataTypes }) => {
     options: {
       indexes: [
         {
-          name: 'application_key',
+          name: 'tenant_role_application_key',
           unique: true,
           fields: ['tenant_id', 'application_id', 'role_id', 'deleted_at']
         }

package/libs/models/tenant-role-permission.js

@@ -21,7 +21,7 @@ module.exports = ({ DataTypes }) => {
     options: {
       indexes: [
         {
-          name: 'permission_key',
+          name: 'tenant_permission_role_key',
           unique: true,
           fields: ['tenant_id', 'permission_id', 'role_id', 'deleted_at']
         }

package/libs/models/tenant-token.js

@@ -21,6 +21,7 @@ module.exports = ({ DataTypes }) => {
     options: {
       indexes: [
         {
+          name:'tenant_token_key',
           unique: true,
           fields: ['tenant_id', 'token', 'type', 'deleted_at']
         }

package/libs/models/user.js

@@ -19,7 +19,7 @@ module.exports = ({ DataTypes }) => {
       },
       status: {
         type: DataTypes.INTEGER,
-        defaultValue: 0 //0:正常,10:初始化未激活，需要用户设置密码后使用,11:已禁用,12:已关闭,
+        defaultValue: 0 //0:正常,1:初始化未激活，需要用户设置密码后使用,11:已禁用,12:已关闭,
       },
       currentTenantId: {
         type: DataTypes.UUID

package/libs/services/admin.js

@@ -29,6 +29,9 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const addUser = async ({ avatar, nickname, phone, email, password, description }) => {
+    if (!email && !phone) {
+      throw new Error('请输入邮箱或手机号');
+    }
     return await services.user.addUser({
       avatar,
       nickname,

package/libs/services/tenant-role.js

@@ -1,14 +1,21 @@
 const fp = require('fastify-plugin');
 const isNil = require('lodash/isNil');
+const isEmpty = require('lodash/isEmpty');
+
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.account;
   const { Op } = fastify.sequelize.Sequelize;
 
-  const getTenantRoleList = async ({ tenantId, currentPage, perPage, filter }) => {
+  const getTenantRoleList = async ({ tenantId, withoutDefaultRole, currentPage, perPage, filter }) => {
     const queryFilter = {};
     if (!isNil(filter?.type)) {
       queryFilter.type = filter.type;
     }
+    if (!isEmpty(withoutDefaultRole) && withoutDefaultRole === 'true') {
+      queryFilter.type = {
+        [Op.not]: 1
+      };
+    }
     const { count, rows } = await models.tenantRole.findAndCountAll({
       where: Object.assign({}, queryFilter, { tenantId }),
       offset: perPage * (currentPage - 1),

package/libs/services/tenant-user.js

@@ -4,6 +4,7 @@ const groupBy = require('lodash/groupBy');
 const { Unauthorized } = require('http-errors');
 const pick = require('lodash/pick');
 const isNil = require('lodash/isNil');
+const isEmpty = require('lodash/isEmpty');
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.account;
   const { Op } = fastify.sequelize.Sequelize;
@@ -483,6 +484,24 @@ module.exports = fp(async (fastify, options) => {
         };
       }
     });
+    if (filter && !isEmpty(filter.status)) {
+      queryFilter['status'] = {
+        [Op.eq]: filter.status
+      };
+    }
+    if (!isEmpty(filter.roleIds)) {
+      const defaultTenant = await models.tenantUserRole.findAll({
+        where: {
+          tenantRoleId: {
+            [Op.in]: !isEmpty(filter.roleIds) ? filter.roleIds : []
+          },
+          tenantId: tenantId
+        }
+      });
+      queryFilter['uuid'] = {
+        [Op.in]: (defaultTenant || []).map(item => item.tenantUserId)
+      };
+    }
 
     const { count, rows } = await models.tenantUser.findAndCountAll({
       include: [models.tenantRole, models.tenantOrg, models.user],

package/libs/services/tenant.js

@@ -24,6 +24,11 @@ module.exports = fp(async (fastify, options) => {
 
     return Object.assign({}, tenant.get({ plain: true }), { id: tenant.uuid });
   };
+  const getTenantInfo = async ({ id }) => {
+    const tenantInfo = await services.tenant.getTenant({ id: id });
+    // console.log('getTenantInfo=======>\n', tenantInfo);
+    return tenantInfo;
+  };
 
   const closeTenant = async ({ tenantId }) => {
     const tenant = await getTenantInstance({ id: tenantId });
@@ -83,6 +88,11 @@ module.exports = fp(async (fastify, options) => {
         [fastify.sequelize.Sequelize.Op.like]: `%${filter.name}%`
       };
     }
+    if (filter?.status) {
+      queryFilter.status = {
+        [fastify.sequelize.Sequelize.Op.like]: filter.status
+      };
+    }
 
     if (filter?.serviceStartTime) {
       queryFilter.serviceStartTime = {
@@ -123,6 +133,7 @@ module.exports = fp(async (fastify, options) => {
   services.tenant = {
     getTenantInstance,
     getTenant,
+    getTenantInfo,
     closeTenant,
     openTenant,
     saveTenant,

package/libs/services/user.js

@@ -3,6 +3,7 @@ const { Unauthorized } = require('http-errors');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
 const isNil = require('lodash/isNil');
+const isEmpty = require('lodash/isEmpty');
 
 function userNameIsEmail(username) {
   return /^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/.test(username);
@@ -107,8 +108,10 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const saveUser = async ({ id, ...otherInfo }) => {
+    if (!otherInfo.email && !otherInfo.phone) {
+      throw new Error('请输入邮箱或手机号');
+    }
     const user = await getUserInstance({ id });
-
     if ((await accountIsExists({ phone: otherInfo.phone, email: otherInfo.email }, user)) > 0) {
       throw new Error('手机号或者邮箱都不能重复');
     }
@@ -142,20 +145,33 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const getAllUserList = async ({ filter, perPage, currentPage }) => {
-    const queryFilter = {};
+    const queryFilter = {},
+      roleQueryFilter = {};
 
-    ['nickname'].forEach(key => {
+    ['nickname', 'email', 'phone'].forEach(key => {
       if (filter && filter[key]) {
         queryFilter[key] = {
           [Op.like]: `%${filter[key]}%`
         };
       }
     });
+    if (filter && !isEmpty(filter.status)) {
+      queryFilter['status'] = {
+        [Op.eq]: filter.status
+      };
+    }
+    if (!isEmpty(filter?.isSuperAdmin)) {
+      roleQueryFilter['role'] = {
+        [Op.eq]: filter.isSuperAdmin === 'false' ? 'Common' : 'SuperAdmin'
+      };
+    }
     const { count, rows } = await models.user.findAndCountAll({
       include: [
         {
           attributes: ['role'],
-          model: models.adminRole
+          model: models.adminRole,
+          where: roleQueryFilter,
+          required: !!roleQueryFilter.role
         },
         {
           model: models.tenant

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-account",
-  "version": "1.0.0-alpha.22",
+  "version": "1.0.0-alpha.24",
   "description": "fastify的用户管理账号等实现",
   "main": "index.js",
   "scripts": {