@azteam/express 1.2.157 → 1.2.169

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/package.json +2 -16
  2. package/src/AdminController.js +11 -11
  3. package/src/Server.js +0 -7
  4. package/src/middleware/adminRoleMiddleware.js +7 -0
  5. package/src/middleware/index.js +1 -0
package/package.json CHANGED
@@ -1,29 +1,15 @@
1
1
  {
2
2
  "name": "@azteam/express",
3
- "version": "1.2.157",
4
- "description": "",
3
+ "version": "1.2.169",
5
4
  "main": "src/index.js",
6
- "repository": {
7
- "type": "git",
8
- "url": "git+https://github.com/toda93/express.git"
9
- },
10
5
  "engines": {
11
6
  "node": ">= 12.0.0",
12
7
  "npm": ">=7.0.0"
13
8
  },
14
- "keywords": [
15
- "toda",
16
- "nodejs",
17
- "express"
18
- ],
19
9
  "author": "toda <sp.azsolution.net@gmail.com>",
20
10
  "license": "MIT",
21
- "bugs": {
22
- "url": "https://github.com/toda93/express/issues"
23
- },
24
- "homepage": "https://github.com/toda93/express#readme",
25
11
  "dependencies": {
26
- "@azteam/crypto": "1.0.19",
12
+ "@azteam/crypto": "1.0.22",
27
13
  "@azteam/error": "1.0.17",
28
14
  "@azteam/http-client": "1.0.88",
29
15
  "@grpc/grpc-js": "1.6.7",
package/src/AdminController.js CHANGED
@@ -1,9 +1,9 @@
1
1
  import {NOT_EXISTS} from '@azteam/error';
2
2
 
3
- import {REQUEST_TYPE, USER_LEVEL} from './constant';
4
- import {paginateMiddleware, roleMiddleware, validateMiddleware} from './middleware';
3
+ import {REQUEST_TYPE} from './constant';
5
4
  import {rulesID} from './validate';
6
5
  import Controller from './Controller';
6
+ import {adminRoleMiddleware, paginateMiddleware, validateMiddleware} from './middleware';
7
7
 
8
8
  class AdminController extends Controller {
9
9
  constructor(pathName, repository, options = {}) {
@@ -32,7 +32,7 @@ class AdminController extends Controller {
32
32
  return {
33
33
  path: '/',
34
34
  method: [
35
- roleMiddleware([this.options.roles.READ], USER_LEVEL.ADMIN),
35
+ adminRoleMiddleware([this.options.roles.READ]),
36
36
  paginateMiddleware(this.options.paginateOptions),
37
37
  async (req, res) => {
38
38
  const paginateData = await this.repository.find(req.query, req.paginate);
@@ -47,7 +47,7 @@ class AdminController extends Controller {
47
47
  return {
48
48
  path: '/',
49
49
  method: [
50
- roleMiddleware([this.options.roles.READ], USER_LEVEL.ADMIN),
50
+ adminRoleMiddleware([this.options.roles.READ]),
51
51
  paginateMiddleware(this.options.paginateOptions),
52
52
  async (req, res) => {
53
53
  const paginateData = await this.repository.findTrash(req.query, req.paginate);
@@ -62,7 +62,7 @@ class AdminController extends Controller {
62
62
  return {
63
63
  path: '/:id',
64
64
  method: [
65
- roleMiddleware([this.options.roles.READ], USER_LEVEL.ADMIN),
65
+ adminRoleMiddleware([this.options.roles.READ]),
66
66
  validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
67
67
  async (req, res) => {
68
68
  const item = await this.repository.findOneById(req.params.id);
@@ -77,7 +77,7 @@ class AdminController extends Controller {
77
77
  return {
78
78
  path: '/:id',
79
79
  method: [
80
- roleMiddleware([this.options.roles.READ], USER_LEVEL.ADMIN),
80
+ adminRoleMiddleware([this.options.roles.READ]),
81
81
  validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
82
82
  async (req, res) => {
83
83
  const item = await this.repository.findOneTrashById(req.params.id);
@@ -100,7 +100,7 @@ class AdminController extends Controller {
100
100
  return {
101
101
  path: '/',
102
102
  method: [
103
- roleMiddleware([this.options.roles.CREATE], USER_LEVEL.ADMIN),
103
+ adminRoleMiddleware([this.options.roles.CREATE]),
104
104
  validateMiddleware(REQUEST_TYPE.BODY, this.options.rulesCreate),
105
105
  async (req, res) => {
106
106
  const data = await this.beforeCreate(req.body, req.user);
@@ -127,7 +127,7 @@ class AdminController extends Controller {
127
127
  return {
128
128
  path: '/:id',
129
129
  method: [
130
- roleMiddleware([this.options.roles.UPDATE], USER_LEVEL.ADMIN),
130
+ adminRoleMiddleware([this.options.roles.UPDATE]),
131
131
  validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
132
132
  validateMiddleware(REQUEST_TYPE.BODY, this.options.rulesModify),
133
133
  async (req, res) => {
@@ -150,7 +150,7 @@ class AdminController extends Controller {
150
150
  return {
151
151
  path: '/:id',
152
152
  method: [
153
- roleMiddleware([this.options.roles.DELETE], USER_LEVEL.ADMIN),
153
+ adminRoleMiddleware([this.options.roles.DELETE]),
154
154
  validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
155
155
  async (req, res) => {
156
156
  const item = await this.repository.findOneById(req.params.id);
@@ -167,7 +167,7 @@ class AdminController extends Controller {
167
167
  return {
168
168
  path: '/:id',
169
169
  method: [
170
- roleMiddleware([this.options.roles.RESTORE], USER_LEVEL.ADMIN),
170
+ adminRoleMiddleware([this.options.roles.RESTORE]),
171
171
  validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
172
172
  async (req, res) => {
173
173
  const item = await this.repository.findOneTrashById(req.params.id);
@@ -184,7 +184,7 @@ class AdminController extends Controller {
184
184
  return {
185
185
  path: '/:id',
186
186
  method: [
187
- roleMiddleware([this.options.roles.DESTROY], USER_LEVEL.ADMIN),
187
+ adminRoleMiddleware([this.options.roles.DESTROY]),
188
188
  validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
189
189
  async (req, res) => {
190
190
  const item = await this.repository.findOneTrashById(req.params.id);
package/src/Server.js CHANGED
@@ -38,8 +38,6 @@ function omitItem(item, guard, allows) {
38
38
  class Server {
39
39
  constructor(currentDir = '', options = {}) {
40
40
  this.redis = null;
41
- this.messageQueue = null;
42
-
43
41
  this.options = options;
44
42
 
45
43
  this.cookieOptions = {
@@ -59,11 +57,6 @@ class Server {
59
57
  this.initController(currentDir);
60
58
  }
61
59
 
62
- setMessageQueue(messageQueue) {
63
- this.messageQueue = messageQueue;
64
- return this;
65
- }
66
-
67
60
  setRedis(redis) {
68
61
  this.redis = redis;
69
62
  return this;
package/src/middleware/adminRoleMiddleware.js ADDED
@@ -0,0 +1,7 @@
1
+ import {USER_LEVEL} from '../constant';
2
+
3
+ import roleMiddleware from './roleMiddleware';
4
+
5
+ export default function (roles = null) {
6
+ return roleMiddleware(roles, USER_LEVEL.ADMIN);
7
+ }
package/src/middleware/index.js CHANGED
@@ -2,6 +2,7 @@ export {default as signMiddleware} from './signMiddleware';
2
2
  export {default as etagMiddleware} from './etagMiddleware';
3
3
  export {default as authMiddleware} from './authMiddleware';
4
4
  export {default as roleMiddleware} from './roleMiddleware';
5
+ export {default as adminRoleMiddleware} from './adminRoleMiddleware';
5
6
  export {default as paginateMiddleware} from './paginateMiddleware';
6
7
  export {default as validateMiddleware} from './validateMiddleware';
7
8
  export {default as limitRequestMiddleware} from './limitRequestMiddleware';