schiwagoa/tianji
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix isUser middleware will call twice problem

Browse Source
This commit is contained in:
moonrailgun 2024-11-04 00:54:57 +08:00
parent 6a4bdd324c
commit c70e69879f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/package.json
View File

@ -8,6 +8,7 @@
}, },
"scripts": { "scripts": {
"dev": "tsx watch --env-file=.env ./main.ts", "dev": "tsx watch --env-file=.env ./main.ts",
"dev:debug": "tsx --inspect-brk --env-file=.env ./main.ts",
"build": "tsc", "build": "tsc",
"postinstall": "pnpm db:generate", "postinstall": "pnpm db:generate",
"check:type": "tsc --noEmit --skipLibCheck", "check:type": "tsc --noEmit --skipLibCheck",

7
src/server/trpc/trpc.ts
View File

@ -119,7 +119,7 @@ const isSystemAdmin = isUser.unstable_pipe(async (opts) => {
}); });
export const systemAdminProcedure = t.procedure.use(prom).use(isSystemAdmin); export const systemAdminProcedure = t.procedure.use(prom).use(isSystemAdmin);
export const workspaceProcedure = protectProedure export const workspaceProcedure = publicProcedure
.input( .input(
z.object({ z.object({
workspaceId: z.string().cuid2(), workspaceId: z.string().cuid2(),
@ -127,7 +127,7 @@ export const workspaceProcedure = protectProedure
) )
.use(createWorkspacePermissionMiddleware()); .use(createWorkspacePermissionMiddleware());
export const workspaceAdminProcedure = protectProedure export const workspaceAdminProcedure = publicProcedure
.input( .input(
z.object({ z.object({
workspaceId: z.string().cuid2(), workspaceId: z.string().cuid2(),
@ -135,7 +135,7 @@ export const workspaceAdminProcedure = protectProedure
) )
.use(createWorkspacePermissionMiddleware([ROLES.owner, ROLES.admin])); .use(createWorkspacePermissionMiddleware([ROLES.owner, ROLES.admin]));
export const workspaceOwnerProcedure = protectProedure export const workspaceOwnerProcedure = publicProcedure
.input( .input(
z.object({ z.object({
workspaceId: z.string().cuid2(), workspaceId: z.string().cuid2(),
@ -145,6 +145,7 @@ export const workspaceOwnerProcedure = protectProedure
/** /**
* Create a trpc middleware which help user check workspace permission * Create a trpc middleware which help user check workspace permission
* NOTE: this middleware already include user auth, so we dont need use it under protectProedure which will trigger user auth twice.
*/ */
function createWorkspacePermissionMiddleware(roles: ROLES[] = []) { function createWorkspacePermissionMiddleware(roles: ROLES[] = []) {
return isUser.unstable_pipe(async (opts) => { return isUser.unstable_pipe(async (opts) => {