@kne/fastify-account 1.0.0-alpha.3 → 1.0.0-alpha.5

package/README.md

@@ -22,7 +22,7 @@ npm i --save @kne/fastify-account
 ### API
 
 ---
-title: "@kne/fastify-account v1.0.0-alpha.3"
+title: "@kne/fastify-account v1.0.0-alpha.4"
 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.3</h1>
+<h1 id="-kne-fastify-account">@kne/fastify-account v1.0.0-alpha.4</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.
 

package/libs/controllers/tenant.js

@@ -27,7 +27,7 @@ module.exports = fp(async (fastify, options) => {
       onRequest: [authenticate.user, authenticate.tenant]
     },
     async request => {
-      const { tenantId } = request.tenantInfo;
+      const { id: tenantId } = request.tenantInfo.tenant;
       return await services.tenantOrg.getTenantOrgList({ tenantId });
     }
   );

package/libs/services/tenant-org.js

@@ -67,11 +67,11 @@ module.exports = fp(async (fastify, options) => {
   };
 
   const getTenantOrgList = async ({ tenantId }) => {
-    const { count, rows } = await models.tenantOrg.findAndCountAll({
+    const data = await models.tenantOrg.findAll({
       where: { tenantId }
     });
 
-    return { pageData: rows, totalCount: count };
+    return data.map(item => item.get({ plain: true }));
   };
 
   services.tenantOrg = {

package/libs/services/tenant-user.js

@@ -116,8 +116,8 @@ module.exports = fp(async (fastify, options) => {
     const currentTenant = currentTenantUser && tenantList.find(({ uuid }) => uuid === currentTenantUser.tenantId);
 
     return {
-      currentTenant: currentTenant && Object.assign({}, currentTenant, { id: currentTenant.uuid }),
-      currentTenantUser: currentTenantUser && Object.assign({}, currentTenantUser, { id: currentTenantUser.uuid }),
+      currentTenant: currentTenant && Object.assign({}, currentTenant.get({ plain: true }), { id: currentTenant.uuid }),
+      currentTenantUser: currentTenantUser && Object.assign({}, currentTenantUser.get({ plain: true }), { id: currentTenantUser.uuid }),
       tenantList: tenantList.map(item => {
         return Object.assign({}, item.get({ plain: true }), { id: item.uuid });
       }),
@@ -148,7 +148,7 @@ module.exports = fp(async (fastify, options) => {
     const tenant = await services.tenant.getTenant({ id: user.currentTenantId });
 
     const tenantUser = await models.tenantUser.findOne({
-      attributes: ['uuid', 'avatar', 'description', 'phone', 'email'],
+      attributes: ['uuid', 'avatar', 'name', 'description', 'phone', 'email'],
       include: [
         {
           attributes: ['id', 'name'],

package/package.json

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