Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-01-06 20:40:08 -05:00
Code Issues Activity

fix(core): fix quota guard for schema routers (#5242)

Browse source 
* fix(core): fix quota guard for schema routers

* chore: add comments
This commit is contained in:
Charles Zhao 2024-01-16 22:46:12 +08:00 committed by GitHub
parent 366adb2ff1
commit 191298fff4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/core/src/routes/organization/index.ts
View file

@ -34,6 +34,7 @@ export default function organizationRoutes<T extends AuthedRouter>(...args: Rout
] = args;
const router = new SchemaRouter(Organizations, organizations, {
middlewares: [koaQuotaGuard({ key: 'organizationsEnabled', quota, methods: ['POST', 'PUT'] })],
errorHandler,
searchFields: ['name'],
disabled: { get: true },
@ -243,8 +244,6 @@ export default function organizationRoutes<T extends AuthedRouter>(...args: Rout
organizationInvitationRoutes(...args);
}
router.use(koaQuotaGuard({ key: 'organizationsEnabled', quota, methods: ['POST', 'PUT'] }));
// Add routes to the router
originalRouter.use(router.routes());
}

3
packages/core/src/routes/organization/roles.ts
View file

@ -30,6 +30,7 @@ export default function organizationRoleRoutes<T extends AuthedRouter>(
]: RouterInitArgs<T>
) {
const router = new SchemaRouter(OrganizationRoles, roles, {
middlewares: [koaQuotaGuard({ key: 'organizationsEnabled', quota, methods: ['POST', 'PUT'] })],
disabled: { get: true, post: true },
errorHandler,
searchFields: ['name'],
@ -89,7 +90,5 @@ export default function organizationRoleRoutes<T extends AuthedRouter>(
router.addRelationRoutes(rolesScopes, 'scopes');
router.use(koaQuotaGuard({ key: 'organizationsEnabled', quota, methods: ['POST', 'PUT'] }));
originalRouter.use(router.routes());
}

3
packages/core/src/routes/organization/scopes.ts
View file

@ -19,11 +19,10 @@ export default function organizationScopeRoutes<T extends AuthedRouter>(
]: RouterInitArgs<T>
) {
const router = new SchemaRouter(OrganizationScopes, scopes, {
middlewares: [koaQuotaGuard({ key: 'organizationsEnabled', quota, methods: ['POST', 'PUT'] })],
errorHandler,
searchFields: ['name'],
});
router.use(koaQuotaGuard({ key: 'organizationsEnabled', quota, methods: ['POST', 'PUT'] }));
originalRouter.use(router.routes());
}

7
packages/core/src/utils/SchemaRouter.ts
View file

@ -3,6 +3,7 @@ import { generateStandardId } from '@logto/shared';
import { type DeepPartial } from '@silverhand/essentials';
import camelcase from 'camelcase';
import deepmerge from 'deepmerge';
import { type MiddlewareType } from 'koa';
import Router, { type IRouterParamContext } from 'koa-router';
import { z } from 'zod';
@ -50,6 +51,8 @@ type SchemaRouterConfig<Key extends string> = {
/** Disable `DELETE /:id` route. */
deleteById: boolean;
};
/** Middlewares that are used before creating API routes */
middlewares?: MiddlewareType[];
/** A custom error handler for the router before throwing the error. */
errorHandler?: (error: unknown) => void;
/** The fields that can be searched for the `GET /` route. */
@ -113,6 +116,10 @@ export default class SchemaRouter<
config
);
if (this.config.middlewares?.length) {
this.use(...this.config.middlewares);
}
if (this.config.errorHandler) {
this.use(async (_, next) => {
try {