fix: comment list and dashboard add admin check

walinejs · Dec 3, 2020 · 5438a9c · 5438a9c
1 parent ec2d3a7
commit 5438a9c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/packages/admin/src/App.js b/packages/admin/src/App.js
@@ -22,7 +22,7 @@ export const createRouter = function(config) {
   const PrivateRoute = Comp => props => {
     // 检查用户登录状态
     const user = useSelector(state => state.user);
-    if (!user || !user.email) {
+    if (!user || !user.email || !user.type !== 'administrator') {
       return (location.href = '/ui/login');
     }
     return React.createElement(Comp, props);

diff --git a/packages/server/src/logic/comment.js b/packages/server/src/logic/comment.js
@@ -1,5 +1,22 @@
 const Base = require('./base');
 module.exports = class extends Base {
+  async __before() {
+    await super.__before();
+
+    const {type, path} = this.get();
+    if(this.isGet && (type !== 'list' || path)) {
+      return;
+    }
+
+    const {userInfo} = this.ctx.state;
+    if(think.isEmpty(userInfo)) {
+      return this.ctx.throw(401);
+    }
+    if(userInfo.type !== 'administrator') {
+      return this.ctx.throw(403);
+    }
+  }
+
   getAction() {
     const {type} = this.get();
     switch(type) {
@@ -56,18 +73,4 @@ module.exports = class extends Base {
         break;
     }
   }
-
-  putAction() {
-    const {userInfo} = this.ctx.state;
-    if(userInfo.type !== 'administrator') {
-      return this.fail();
-    }
-  }
-
-  deleteAction() {
-    const {userInfo} = this.ctx.state;
-    if(userInfo.type !== 'administrator') {
-      return this.fail();
-    }
-  }
 }