@kne/fastify-account 1.0.0-alpha.10 → 1.0.0-alpha.12

package/README.md

@@ -22,7 +22,7 @@ npm i --save @kne/fastify-account
 ### API
 
 ---
-title: "@kne/fastify-account v1.0.0-alpha.9"
+title: "@kne/fastify-account v1.0.0-alpha.11"
 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.9</h1>
+<h1 id="-kne-fastify-account">@kne/fastify-account v1.0.0-alpha.11</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.
 
@@ -87,19 +87,8 @@ fastify的用户管理账号等实现
   "type": "object",
   "properties": {
     "code": {
-      "type": "number"
-    },
-    "data": {
-      "type": "object",
-      "properties": {
-        "code": {
-          "type": "string",
-          "description": "验证码"
-        }
-      }
-    },
-    "msg": {
-      "type": "string"
+      "type": "string",
+      "description": "验证码"
     }
   }
 }
@@ -117,10 +106,7 @@ Status Code **200**
 
 |Name|Type|Required|Restrictions|Description|
 |---|---|---|---|---|
-|» code|number|false|none|none|
-|» data|object|false|none|none|
-|»» code|string|false|none|验证码|
-|» msg|string|false|none|none|
+|» code|string|false|none|验证码|
 
 <aside class="success">
 This operation does not require authentication
@@ -440,6 +426,48 @@ This operation does not require authentication
 This operation does not require authentication
 </aside>
 
+## post__api_v1_account_admin_setSuperAdmin
+
+`POST /api/v1/account/admin/setSuperAdmin`
+
+> Body parameter
+
+```json
+{
+  "type": "object",
+  "required": [
+    "status",
+    "userId"
+  ],
+  "properties": {
+    "status": {
+      "type": "boolean"
+    },
+    "userId": {
+      "type": "string"
+    }
+  }
+}
+```
+
+<h3 id="post__api_v1_account_admin_setsuperadmin-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|body|body|object|true|none|
+|» status|body|boolean|true|none|
+|» userId|body|string|true|none|
+
+<h3 id="post__api_v1_account_admin_setsuperadmin-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_admin_addUser
 
 `POST /api/v1/account/admin/addUser`
@@ -1997,6 +2025,28 @@ This operation does not require authentication
 This operation does not require authentication
 </aside>
 
+## get__api_v1_account_tenant_getTenantUserList
+
+`GET /api/v1/account/tenant/getTenantUserList`
+
+<h3 id="get__api_v1_account_tenant_gettenantuserlist-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|filter|query|object|false|none|
+|currentPage|query|number|false|none|
+|perPage|query|number|false|none|
+
+<h3 id="get__api_v1_account_tenant_gettenantuserlist-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>
+
 ## get__api_v1_account_tenant_orgList
 
 `GET /api/v1/account/tenant/orgList`

package/libs/controllers/account.js

@@ -19,14 +19,7 @@ module.exports = fp(async (fastify, options) => {
                 schema: {
                   type: 'object',
                   properties: {
-                    code: { type: 'number' },
-                    data: {
-                      type: 'object',
-                      properties: {
-                        code: { type: 'string', description: '验证码' }
-                      }
-                    },
-                    msg: { type: 'string' }
+                    code: { type: 'string', description: '验证码' }
                   }
                 }
               }

package/libs/controllers/admin.js

@@ -9,7 +9,7 @@ module.exports = fp(async (fastify, options) => {
       onRequest: [authenticate.user]
     },
     async request => {
-      await services.admin.initSuperAdmin(await services.user.getUser(request.authenticatePayload));
+      await services.admin.initSuperAdmin(request.userInfo);
       return {};
     }
   );
@@ -24,6 +24,28 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
+  fastify.post(
+    `${options.prefix}/admin/setSuperAdmin`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        body: {
+          type: 'object',
+          required: ['status', 'userId'],
+          properties: {
+            status: { type: 'boolean' },
+            userId: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { status, userId } = request.body;
+      await services.admin[status ? 'setSuperAdmin' : 'cancelSuperAdmin'](await services.user.getUser({ id: userId }));
+      return {};
+    }
+  );
+
   fastify.post(
     `${options.prefix}/admin/addUser`,
     {

package/libs/controllers/adminTenant.js

@@ -201,14 +201,30 @@ module.exports = fp(async (fastify, options) => {
         query: {
           type: 'object',
           properties: {
-            tenantId: { type: 'string' }
+            tenantId: { type: 'string' },
+            filter: {
+              type: 'object',
+              properties: {
+                name: { type: 'string' }
+              }
+            },
+            currentPage: { type: 'number' },
+            perPage: { type: 'number' }
           }
         }
       }
     },
     async request => {
-      const { tenantId } = request.query;
-      return await services.tenantUser.getTenantUserList({ tenantId });
+      const { filter, tenantId, currentPage, perPage } = Object.assign(
+        {},
+        {
+          filter: {},
+          currentPage: 1,
+          perPage: 20
+        },
+        request.query
+      );
+      return await services.tenantUser.getTenantUserList({ tenantId, filter, currentPage, perPage });
     }
   );
 

package/libs/controllers/tenant.js

@@ -21,6 +21,41 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
+  fastify.get(
+    `${options.prefix}/tenant/getTenantUserList`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        query: {
+          type: 'object',
+          properties: {
+            filter: {
+              type: 'object',
+              properties: {
+                name: { type: 'string' }
+              }
+            },
+            currentPage: { type: 'number' },
+            perPage: { type: 'number' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      const { filter, currentPage, perPage } = Object.assign(
+        {},
+        {
+          filter: {},
+          currentPage: 1,
+          perPage: 20
+        },
+        request.query
+      );
+      return await services.tenantUser.getTenantUserList({ tenantId, currentPage, perPage, filter });
+    }
+  );
+
   fastify.get(
     `${options.prefix}/tenant/orgList`,
     {

package/libs/services/admin.js

@@ -2,7 +2,7 @@ const fp = require('fastify-plugin');
 
 const ROLE = {
   SuperAdmin: 'SuperAdmin',
-  TenantAdmin: 'TenantAdmin'
+  Common: 'Common'
 };
 
 module.exports = fp(async (fastify, options) => {
@@ -41,7 +41,7 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const setSuperAdmin = async targetUser => {
-    const user = await services.user.getUserInfo(targetUser);
+    const user = await services.user.getUser(targetUser);
     if (
       (await models.adminRole.count({
         where: {
@@ -59,9 +59,30 @@ module.exports = fp(async (fastify, options) => {
     });
   };
 
-  const generateTenantAdminVerifyCode = async () => {};
+  const cancelSuperAdmin = async targetUser => {
+    const user = await services.user.getUser(targetUser);
+    if (
+      !(await models.adminRole.count({
+        where: {
+          userId: user.id,
+          role: ROLE['SuperAdmin']
+        }
+      })) > 0
+    ) {
+      throw new Error('当前用户不是超级管理员');
+    }
 
-  const verifyTenantAdmin = async () => {};
+    await models.adminRole.update(
+      {
+        role: ROLE['Common']
+      },
+      {
+        where: {
+          userId: user.id
+        }
+      }
+    );
+  };
 
   const resetUserPassword = async ({ userId, password }) => {
     await services.account.resetPassword({ userId, password });
@@ -70,9 +91,8 @@ module.exports = fp(async (fastify, options) => {
   services.admin = {
     initSuperAdmin,
     setSuperAdmin,
+    cancelSuperAdmin,
     checkIsSuperAdmin,
-    generateTenantAdminVerifyCode,
-    verifyTenantAdmin,
     addUser,
     resetUserPassword
   };

package/libs/services/tenant-user.js

@@ -456,12 +456,23 @@ module.exports = fp(async (fastify, options) => {
     await tenantUser.save();
   };
 
-  const getTenantUserList = async ({ tenantId }) => {
+  const getTenantUserList = async ({ tenantId, currentPage, perPage, filter }) => {
+    const queryFilter = {};
     await services.tenant.getTenant({ id: tenantId });
 
+    ['name', 'phone', 'email'].forEach(key => {
+      if (filter && filter[key]) {
+        queryFilter[key] = {
+          [Op.like]: `%${filter[key]}%`
+        };
+      }
+    });
+
     const { count, rows } = await fastify.account.models.tenantUser.findAndCountAll({
       include: [fastify.account.models.tenantRole, fastify.account.models.tenantOrg, fastify.account.models.user],
-      where: { tenantId }
+      where: Object.assign({}, queryFilter, { tenantId }),
+      offset: currentPage * (currentPage - 1),
+      limit: perPage
     });
 
     return {

package/package.json

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