new version

package.json

@@ -26,5 +26,9 @@
         "source-map-support": "^0.5.21",
         "uuid": "^9.0.0",
         "yargs": "^17.7.2"
-    }
+    },
+    "workspaces": [
+        "packages/core",
+        "packages/ui"
+    ]
 }

packages/core/declare/perm.ts

@@ -121,14 +121,12 @@ export function checkPerm(value: number, model: string, perm: string) {
 }
 
 export function perm(model: string, name: string) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return function(target: any, methodName: string, descriptor: any) {
+    return function(target, methodName: string, descriptor) {
         descriptor.originalMethodPerm = descriptor.value;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        descriptor.value = async function run(args: any) {
+        descriptor.value = async function run(args) {
             let id = args?.id || 0;
             if (id === 0) {
-                id = await token.stripId(args.token);
+                id = await token.stripId(args.token || this.token);
                 if (id === -1) {
                     id = 0;
                 }
@@ -137,12 +135,17 @@ export function perm(model: string, name: string) {
                     id = 0;
                 }
             }
+            this.id = id;
             const defaultValue = permColl[model].default,
                 guestValue = permColl[model].guest;
             let value = 0;
             if (id !== 0) {
                 const dbData = await db.getone('perm', { id });
-                value = (dbData || {})[model] || defaultValue;
+                if (dbData[model] === undefined) {
+                    value = defaultValue;
+                } else {
+                    value = dbData[model];
+                }
             } else {
                 value = guestValue;
             }

packages/core/handle.ts

@@ -7,6 +7,8 @@ import KoaStatic from 'awesome-static';
 import * as path from 'path';
 // import KoaConnect from 'koa-connect';
 import { RenderFromPage } from './service/render';
+import { perm } from './declare/perm';
+import { user } from './model/user';
 
 export const app = new Koa();
 const router = new KoaRouter();
@@ -30,9 +32,11 @@ function transWord(word: string) {
 
 export class Handler {
     ctx: KoaContext;
+    id: number;
+    @perm('user', 'view')
     async get() {
         this.ctx.type = 'text/html';
-        this.ctx.body = await RenderFromPage();
+        this.ctx.body = await RenderFromPage(await user.getHeader(this.id));
         return;
     }
 }
@@ -47,6 +51,7 @@ async function handle(ctx: KoaContext, Handler) {
     const h = new Handler();
     const args = {};
     h.ctx = ctx;
+    h.token = ctx.cookies.get('token');
     Object.assign(args, body);
     Object.assign(args, ctx.params);
     Object.assign(args, ctx.request.query);
@@ -64,11 +69,20 @@ async function handle(ctx: KoaContext, Handler) {
         }
     } catch (err) {
         if (['perm', 'validation'].includes(err?.errorType)) {
-            ctx.body = JSON.stringify({
-                status: 'error',
-                type: err?.errorType,
-                param: err?.errorParam
-            });
+            console.log(method);
+            if (method === 'get' && err?.errorType === 'perm') {
+                ctx.type = 'text/html';
+                ctx.body = await RenderFromPage({
+                    type: 'back',
+                    template: 'Blocked',
+                })
+            } else {
+                ctx.body = JSON.stringify({
+                    status: 'error',
+                    type: err?.errorType,
+                    param: err?.errorParam
+                });
+            }
             ctx.response.status = 200;
         } else {
             console.error(err);

packages/core/handler/page.ts

@@ -1,5 +1,6 @@
 import { perm } from '../declare/perm';
 import { Handler, Route } from '../handle';
+import { user } from '../model/user';
 // import * as fs from 'fs';
 // import * as path from 'path';
 import { RenderFromPage } from '../service/render';
@@ -8,7 +9,7 @@ class MainPageHandler extends Handler {
     @perm('user', 'view')
     async get() {
         this.ctx.type = 'text/html';
-        this.ctx.body = await RenderFromPage();
+        this.ctx.body = await RenderFromPage(await user.getHeader(this.id));
         return;
     }
 }