0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-10 22:22:45 -05:00

Merge pull request #5784 from logto-io/gao-update-router-name

refactor(core): update `AuthedRouter` -> `ManagementApiRouter`
This commit is contained in:
Gao Sun 2024-04-25 11:51:55 +08:00 committed by GitHub
commit 3c4971ee25
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
42 changed files with 98 additions and 87 deletions

View file

@ -14,9 +14,11 @@ import { encryptUserPassword } from '#src/libraries/user.js';
import koaGuard from '#src/middleware/koa-guard.js';
import assertThat from '#src/utils/assert-that.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
export default function adminUserBasicsRoutes<T extends AuthedRouter>(...args: RouterInitArgs<T>) {
export default function adminUserBasicsRoutes<T extends ManagementApiRouter>(
...args: RouterInitArgs<T>
) {
const [router, { queries, libraries }] = args;
const {
oidcModelInstances: { revokeInstanceByUserId },
@ -346,9 +348,9 @@ export default function adminUserBasicsRoutes<T extends AuthedRouter>(...args: R
ctx.body = pick(user, ...userInfoSelectFields);
// eslint-disable-next-line max-lines
return next();
}
// eslint-disable-next-line max-lines
);
router.delete(

View file

@ -1,4 +1,4 @@
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
import adminUserBasicsRoutes from './basics.js';
import adminUserMfaVerificationsRoutes from './mfa-verifications.js';
@ -7,7 +7,7 @@ import adminUserRoleRoutes from './role.js';
import adminUserSearchRoutes from './search.js';
import adminUserSocialRoutes from './social.js';
export default function adminUserRoutes<T extends AuthedRouter>(...args: RouterInitArgs<T>) {
export default function adminUserRoutes<T extends ManagementApiRouter>(...args: RouterInitArgs<T>) {
adminUserBasicsRoutes(...args);
adminUserRoleRoutes(...args);
adminUserSearchRoutes(...args);

View file

@ -11,9 +11,9 @@ import { transpileUserMfaVerifications } from '#src/utils/user.js';
import { generateBackupCodes } from '../interaction/utils/backup-code-validation.js';
import { generateTotpSecret } from '../interaction/utils/totp-validation.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
export default function adminUserMfaVerificationsRoutes<T extends AuthedRouter>(
export default function adminUserMfaVerificationsRoutes<T extends ManagementApiRouter>(
...args: RouterInitArgs<T>
) {
const [

View file

@ -3,9 +3,9 @@ import { z } from 'zod';
import koaGuard from '#src/middleware/koa-guard.js';
import { type AuthedRouter, type RouterInitArgs } from '../types.js';
import { type ManagementApiRouter, type RouterInitArgs } from '../types.js';
export default function adminUserOrganizationRoutes<T extends AuthedRouter>(
export default function adminUserOrganizationRoutes<T extends ManagementApiRouter>(
...[router, { queries }]: RouterInitArgs<T>
) {
router.get(

View file

@ -10,9 +10,9 @@ import koaRoleRlsErrorHandler from '#src/middleware/koa-role-rls-error-handler.j
import assertThat from '#src/utils/assert-that.js';
import { parseSearchParamsForSearch } from '#src/utils/search.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
export default function adminUserRoleRoutes<T extends AuthedRouter>(
export default function adminUserRoleRoutes<T extends ManagementApiRouter>(
...[router, { queries }]: RouterInitArgs<T>
) {
const {

View file

@ -12,7 +12,7 @@ import koaPagination from '#src/middleware/koa-pagination.js';
import { type UserConditions } from '#src/queries/user.js';
import { parseSearchParamsForSearch } from '#src/utils/search.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
const getQueryRelation = (
excludeRoleId: Nullable<string>,
@ -39,7 +39,7 @@ const getQueryRelation = (
return undefined;
};
export default function adminUserSearchRoutes<T extends AuthedRouter>(
export default function adminUserSearchRoutes<T extends ManagementApiRouter>(
...[router, { queries }]: RouterInitArgs<T>
) {
const {

View file

@ -13,9 +13,9 @@ import RequestError from '#src/errors/RequestError/index.js';
import koaGuard from '#src/middleware/koa-guard.js';
import assertThat from '#src/utils/assert-that.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
export default function adminUserSocialRoutes<T extends AuthedRouter>(
export default function adminUserSocialRoutes<T extends ManagementApiRouter>(
...[router, tenant]: RouterInitArgs<T>
) {
const {

View file

@ -6,9 +6,9 @@ import RequestError from '#src/errors/RequestError/index.js';
import koaGuard from '#src/middleware/koa-guard.js';
import assertThat from '#src/utils/assert-that.js';
import { type AuthedRouter, type RouterInitArgs } from '../types.js';
import { type ManagementApiRouter, type RouterInitArgs } from '../types.js';
export default function applicationProtectedAppMetadataRoutes<T extends AuthedRouter>(
export default function applicationProtectedAppMetadataRoutes<T extends ManagementApiRouter>(
...[
router,
{

View file

@ -10,9 +10,9 @@ import koaRoleRlsErrorHandler from '#src/middleware/koa-role-rls-error-handler.j
import assertThat from '#src/utils/assert-that.js';
import { parseSearchParamsForSearch } from '#src/utils/search.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
export default function applicationRoleRoutes<T extends AuthedRouter>(
export default function applicationRoleRoutes<T extends ManagementApiRouter>(
...[router, { queries }]: RouterInitArgs<T>
) {
const {

View file

@ -7,9 +7,9 @@ import { object, string } from 'zod';
import RequestError from '#src/errors/RequestError/index.js';
import koaGuard from '#src/middleware/koa-guard.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
function applicationSignInExperienceRoutes<T extends AuthedRouter>(
function applicationSignInExperienceRoutes<T extends ManagementApiRouter>(
...[
router,
{

View file

@ -4,9 +4,9 @@ import { z } from 'zod';
import koaGuard from '#src/middleware/koa-guard.js';
import koaPagination from '#src/middleware/koa-pagination.js';
import { type AuthedRouter, type RouterInitArgs } from '../types.js';
import { type ManagementApiRouter, type RouterInitArgs } from '../types.js';
export default function applicationUserConsentOrganizationRoutes<T extends AuthedRouter>(
export default function applicationUserConsentOrganizationRoutes<T extends ManagementApiRouter>(
...[
router,
{

View file

@ -7,9 +7,9 @@ import { object, string, nativeEnum } from 'zod';
import koaGuard from '#src/middleware/koa-guard.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
export default function applicationUserConsentScopeRoutes<T extends AuthedRouter>(
export default function applicationUserConsentScopeRoutes<T extends ManagementApiRouter>(
...[
router,
{

View file

@ -17,7 +17,7 @@ import { buildOidcClientMetadata } from '#src/oidc/utils.js';
import assertThat from '#src/utils/assert-that.js';
import { parseSearchParamsForSearch } from '#src/utils/search.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
import { applicationCreateGuard, applicationPatchGuard } from './types.js';
@ -34,7 +34,7 @@ const parseIsThirdPartQueryParam = (isThirdPartyQuery: 'true' | 'false' | undefi
const applicationTypeGuard = z.nativeEnum(ApplicationType);
export default function applicationRoutes<T extends AuthedRouter>(
export default function applicationRoutes<T extends ManagementApiRouter>(
...[
router,
{

View file

@ -5,9 +5,9 @@ import { object, string } from 'zod';
import koaGuard from '#src/middleware/koa-guard.js';
import assertThat from '#src/utils/assert-that.js';
import { type AuthedRouter, type RouterInitArgs } from '../types.js';
import { type ManagementApiRouter, type RouterInitArgs } from '../types.js';
export default function connectorAuthorizationUriRoutes<T extends AuthedRouter>(
export default function connectorAuthorizationUriRoutes<T extends ManagementApiRouter>(
...[router, tenant]: RouterInitArgs<T>
) {
const { getLogtoConnectorById } = tenant.connectors;

View file

@ -18,9 +18,9 @@ import koaGuard from '#src/middleware/koa-guard.js';
import assertThat from '#src/utils/assert-that.js';
import { loadConnectorFactories } from '#src/utils/connectors/index.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
export default function connectorConfigTestingRoutes<T extends AuthedRouter>(
export default function connectorConfigTestingRoutes<T extends ManagementApiRouter>(
...[router, { cloudConnection }]: RouterInitArgs<T>
) {
const { getClient } = cloudConnection;

View file

@ -6,9 +6,9 @@ import koaGuard from '#src/middleware/koa-guard.js';
import assertThat from '#src/utils/assert-that.js';
import { loadConnectorFactories, transpileConnectorFactory } from '#src/utils/connectors/index.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
export default function connectorFactoryRoutes<T extends AuthedRouter>(
export default function connectorFactoryRoutes<T extends ManagementApiRouter>(
...[router]: RouterInitArgs<T>
) {
router.get(

View file

@ -15,7 +15,7 @@ import { buildExtraInfo } from '#src/utils/connectors/extra-information.js';
import { loadConnectorFactories, transpileLogtoConnector } from '#src/utils/connectors/index.js';
import { checkSocialConnectorTargetAndPlatformUniqueness } from '#src/utils/connectors/platform.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
import connectorAuthorizationUriRoutes from './authorization-uri.js';
import connectorConfigTestingRoutes from './config-testing.js';
@ -32,7 +32,7 @@ const guardConnectorsQuota = async (
const passwordlessConnector = new Set([ConnectorType.Email, ConnectorType.Sms]);
export default function connectorRoutes<T extends AuthedRouter>(
export default function connectorRoutes<T extends ManagementApiRouter>(
...[router, tenant]: RouterInitArgs<T>
) {
const {

View file

@ -10,14 +10,14 @@ import koaGuard from '#src/middleware/koa-guard.js';
import assertThat from '#src/utils/assert-that.js';
import { isStrictlyPartial } from '#src/utils/translation.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
const cleanDeepTranslation = (translation: Translation) =>
// Since `Translation` type actually equals `Partial<Translation>`, force to cast it back to `Translation`.
// eslint-disable-next-line no-restricted-syntax
cleanDeep(translation) as Translation;
export default function customPhraseRoutes<T extends AuthedRouter>(
export default function customPhraseRoutes<T extends ManagementApiRouter>(
...[router, { queries }]: RouterInitArgs<T>
) {
const {

View file

@ -5,7 +5,7 @@ import { number, object, string } from 'zod';
import koaGuard from '#src/middleware/koa-guard.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
const getDateString = (date: Date | number) => format(date, 'yyyy-MM-dd');
@ -13,7 +13,7 @@ const indices = (length: number) => [...Array.from({ length }).keys()];
const getEndOfDayTimestamp = (date: Date | number) => endOfDay(date).valueOf();
export default function dashboardRoutes<T extends AuthedRouter>(
export default function dashboardRoutes<T extends ManagementApiRouter>(
...[router, { queries }]: RouterInitArgs<T>
) {
const {

View file

@ -7,9 +7,9 @@ import koaGuard from '#src/middleware/koa-guard.js';
import koaQuotaGuard from '#src/middleware/koa-quota-guard.js';
import assertThat from '#src/utils/assert-that.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
export default function domainRoutes<T extends AuthedRouter>(
export default function domainRoutes<T extends ManagementApiRouter>(
...[router, { queries, libraries }]: RouterInitArgs<T>
) {
const {

View file

@ -20,13 +20,13 @@ import koaQuotaGuard from '#src/middleware/koa-quota-guard.js';
import { type AllowedKeyPrefix } from '#src/queries/log.js';
import assertThat from '#src/utils/assert-that.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
const nonemptyUniqueHookEventsGuard = hookEventsGuard
.nonempty()
.transform((events) => deduplicate(events));
export default function hookRoutes<T extends AuthedRouter>(
export default function hookRoutes<T extends ManagementApiRouter>(
...[router, { queries, libraries }]: RouterInitArgs<T>
) {
const {

View file

@ -36,7 +36,7 @@ import ssoConnectors from './sso-connector/index.js';
import statusRoutes from './status.js';
import swaggerRoutes from './swagger/index.js';
import systemRoutes from './system.js';
import type { AnonymousRouter, AuthedRouter } from './types.js';
import type { AnonymousRouter, ManagementApiRouter } from './types.js';
import userAssetsRoutes from './user-assets.js';
import verificationCodeRoutes from './verification-code.js';
import wellKnownRoutes from './well-known.js';
@ -45,7 +45,7 @@ const createRouters = (tenant: TenantContext) => {
const interactionRouter: AnonymousRouter = new Router();
interactionRoutes(interactionRouter, tenant);
const managementRouter: AuthedRouter = new Router();
const managementRouter: ManagementApiRouter = new Router();
managementRouter.use(koaAuth(tenant.envSet, getManagementApiResourceIndicator(tenant.id)));
managementRouter.use(koaTenantGuard(tenant.id, tenant.queries));

View file

@ -5,9 +5,9 @@ import koaGuard from '#src/middleware/koa-guard.js';
import koaPagination from '#src/middleware/koa-pagination.js';
import { type AllowedKeyPrefix } from '#src/queries/log.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
export default function logRoutes<T extends AuthedRouter>(
export default function logRoutes<T extends ManagementApiRouter>(
...[router, { queries }]: RouterInitArgs<T>
) {
const { findLogById, countLogs, findLogs } = queries.logs;

View file

@ -19,7 +19,7 @@ import RequestError from '#src/errors/RequestError/index.js';
import koaGuard from '#src/middleware/koa-guard.js';
import { exportJWK } from '#src/utils/jwks.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
import logtoConfigJwtCustomizerRoutes from './jwt-customizer.js';
@ -59,7 +59,7 @@ const getRedactedOidcKeyResponse = async (
})
);
export default function logtoConfigRoutes<T extends AuthedRouter>(
export default function logtoConfigRoutes<T extends ManagementApiRouter>(
...[router, tenant]: RouterInitArgs<T>
) {
const { getAdminConsoleConfig, updateAdminConsoleConfig, updateOidcConfigsByKey } =

View file

@ -16,7 +16,7 @@ import RequestError, { formatZodError } from '#src/errors/RequestError/index.js'
import koaGuard, { parse } from '#src/middleware/koa-guard.js';
import koaQuotaGuard from '#src/middleware/koa-quota-guard.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
const getJwtTokenKeyAndBody = (tokenPath: LogtoJwtTokenKeyType, body: unknown) => {
if (tokenPath === LogtoJwtTokenKeyType.AccessToken) {
@ -31,7 +31,7 @@ const getJwtTokenKeyAndBody = (tokenPath: LogtoJwtTokenKeyType, body: unknown) =
};
};
export default function logtoConfigJwtCustomizerRoutes<T extends AuthedRouter>(
export default function logtoConfigJwtCustomizerRoutes<T extends ManagementApiRouter>(
...[
router,
{ id: tenantId, queries, logtoConfigs, cloudConnection, libraries },

View file

@ -17,14 +17,16 @@ import { userSearchKeys } from '#src/queries/user.js';
import SchemaRouter from '#src/utils/SchemaRouter.js';
import { parseSearchOptions } from '#src/utils/search.js';
import { type AuthedRouter, type RouterInitArgs } from '../types.js';
import { type ManagementApiRouter, type RouterInitArgs } from '../types.js';
import organizationInvitationRoutes from './invitations.js';
import organizationRoleRoutes from './roles.js';
import organizationScopeRoutes from './scopes.js';
import { errorHandler } from './utils.js';
export default function organizationRoutes<T extends AuthedRouter>(...args: RouterInitArgs<T>) {
export default function organizationRoutes<T extends ManagementApiRouter>(
...args: RouterInitArgs<T>
) {
const [
originalRouter,
{

View file

@ -11,11 +11,11 @@ import koaGuard from '#src/middleware/koa-guard.js';
import SchemaRouter from '#src/utils/SchemaRouter.js';
import assertThat from '#src/utils/assert-that.js';
import { type AuthedRouter, type RouterInitArgs } from '../types.js';
import { type ManagementApiRouter, type RouterInitArgs } from '../types.js';
import { errorHandler } from './utils.js';
export default function organizationInvitationRoutes<T extends AuthedRouter>(
export default function organizationInvitationRoutes<T extends ManagementApiRouter>(
...[
originalRouter,
{

View file

@ -15,11 +15,11 @@ import { organizationRoleSearchKeys } from '#src/queries/organization/index.js';
import SchemaRouter from '#src/utils/SchemaRouter.js';
import { parseSearchOptions } from '#src/utils/search.js';
import { type AuthedRouter, type RouterInitArgs } from '../types.js';
import { type ManagementApiRouter, type RouterInitArgs } from '../types.js';
import { errorHandler } from './utils.js';
export default function organizationRoleRoutes<T extends AuthedRouter>(
export default function organizationRoleRoutes<T extends ManagementApiRouter>(
...[
originalRouter,
{

View file

@ -3,11 +3,11 @@ import { OrganizationScopes } from '@logto/schemas';
import koaQuotaGuard from '#src/middleware/koa-quota-guard.js';
import SchemaRouter from '#src/utils/SchemaRouter.js';
import { type AuthedRouter, type RouterInitArgs } from '../types.js';
import { type ManagementApiRouter, type RouterInitArgs } from '../types.js';
import { errorHandler } from './utils.js';
export default function organizationScopeRoutes<T extends AuthedRouter>(
export default function organizationScopeRoutes<T extends ManagementApiRouter>(
...[
originalRouter,
{

View file

@ -9,9 +9,9 @@ import koaPagination from '#src/middleware/koa-pagination.js';
import assertThat from '#src/utils/assert-that.js';
import { parseSearchParamsForSearch } from '#src/utils/search.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
export default function resourceScopeRoutes<T extends AuthedRouter>(
export default function resourceScopeRoutes<T extends ManagementApiRouter>(
...[
router,
{

View file

@ -10,9 +10,9 @@ import koaQuotaGuard from '#src/middleware/koa-quota-guard.js';
import assertThat from '#src/utils/assert-that.js';
import { attachScopesToResources } from '#src/utils/resource.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
export default function resourceRoutes<T extends AuthedRouter>(
export default function resourceRoutes<T extends ManagementApiRouter>(
...[
router,
{

View file

@ -8,9 +8,9 @@ import koaGuard from '#src/middleware/koa-guard.js';
import koaPagination from '#src/middleware/koa-pagination.js';
import { parseSearchParamsForSearch } from '#src/utils/search.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
export default function roleApplicationRoutes<T extends AuthedRouter>(
export default function roleApplicationRoutes<T extends ManagementApiRouter>(
...[router, { queries }]: RouterInitArgs<T>
) {
const {

View file

@ -8,9 +8,9 @@ import koaGuard from '#src/middleware/koa-guard.js';
import koaPagination from '#src/middleware/koa-pagination.js';
import { parseSearchParamsForSearch } from '#src/utils/search.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
export default function roleScopeRoutes<T extends AuthedRouter>(
export default function roleScopeRoutes<T extends ManagementApiRouter>(
...[router, { queries, libraries }]: RouterInitArgs<T>
) {
const {

View file

@ -13,9 +13,11 @@ import { parseSearchParamsForSearch } from '#src/utils/search.js';
import roleApplicationRoutes from './role.application.js';
import roleUserRoutes from './role.user.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
export default function roleRoutes<T extends AuthedRouter>(...[router, tenant]: RouterInitArgs<T>) {
export default function roleRoutes<T extends ManagementApiRouter>(
...[router, tenant]: RouterInitArgs<T>
) {
const { queries, libraries } = tenant;
const {
rolesScopes: { insertRolesScopes },

View file

@ -9,9 +9,9 @@ import koaPagination from '#src/middleware/koa-pagination.js';
import { type UserConditions } from '#src/queries/user.js';
import { parseSearchParamsForSearch } from '#src/utils/search.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
export default function roleUserRoutes<T extends AuthedRouter>(
export default function roleUserRoutes<T extends ManagementApiRouter>(
...[router, { queries }]: RouterInitArgs<T>
) {
const {

View file

@ -6,9 +6,9 @@ import { validateSignUp, validateSignIn } from '#src/libraries/sign-in-experienc
import { validateMfa } from '#src/libraries/sign-in-experience/mfa.js';
import koaGuard from '#src/middleware/koa-guard.js';
import type { AuthedRouter, RouterInitArgs } from '../types.js';
import type { ManagementApiRouter, RouterInitArgs } from '../types.js';
export default function signInExperiencesRoutes<T extends AuthedRouter>(
export default function signInExperiencesRoutes<T extends ManagementApiRouter>(
...[router, { queries, libraries, connectors }]: RouterInitArgs<T>
) {
const { findDefaultSignInExperience, updateDefaultSignInExperience } = queries.signInExperiences;

View file

@ -17,7 +17,7 @@ import { isSupportedSsoProvider, isSupportedSsoConnector } from '#src/sso/utils.
import { tableToPathname } from '#src/utils/SchemaRouter.js';
import assertThat from '#src/utils/assert-that.js';
import { type AuthedRouter, type RouterInitArgs } from '../types.js';
import { type ManagementApiRouter, type RouterInitArgs } from '../types.js';
import {
parseFactoryDetail,
@ -27,7 +27,7 @@ import {
validateConnectorConfigConnectionStatus,
} from './utils.js';
export default function singleSignOnConnectorsRoutes<T extends AuthedRouter>(
export default function singleSignOnConnectorsRoutes<T extends ManagementApiRouter>(
...args: RouterInitArgs<T>
) {
const [

View file

@ -2,9 +2,9 @@ import { object, string } from 'zod';
import koaGuard from '#src/middleware/koa-guard.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
export default function systemRoutes<T extends AuthedRouter>(
export default function systemRoutes<T extends ManagementApiRouter>(
...[
router,
{

View file

@ -8,9 +8,12 @@ import type TenantContext from '#src/tenants/TenantContext.js';
export type AnonymousRouter = Router<unknown, WithLogContext & WithI18nContext>;
type AuthedRouterContext = WithAuthContext & WithLogContext & WithI18nContext & ExtendableContext;
type ManagementApiRouterContext = WithAuthContext &
WithLogContext &
WithI18nContext &
ExtendableContext;
export type AuthedRouter = Router<unknown, AuthedRouterContext>;
export type ManagementApiRouter = Router<unknown, ManagementApiRouterContext>;
type RouterInit<T> = (router: T, tenant: TenantContext) => void;
export type RouterInitArgs<T> = Parameters<RouterInit<T>>;

View file

@ -20,9 +20,11 @@ import { uploadFileGuard } from '#src/utils/storage/consts.js';
import { buildUploadFile } from '#src/utils/storage/index.js';
import { getTenantId } from '#src/utils/tenant.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
export default function userAssetsRoutes<T extends AuthedRouter>(...[router]: RouterInitArgs<T>) {
export default function userAssetsRoutes<T extends ManagementApiRouter>(
...[router]: RouterInitArgs<T>
) {
router.get(
'/user-assets/service-status',
koaGuard({

View file

@ -6,11 +6,11 @@ import {
import koaGuard from '#src/middleware/koa-guard.js';
import type { AuthedRouter, RouterInitArgs } from './types.js';
import type { ManagementApiRouter, RouterInitArgs } from './types.js';
const codeType = TemplateType.Generic;
export default function verificationCodeRoutes<T extends AuthedRouter>(
export default function verificationCodeRoutes<T extends ManagementApiRouter>(
...[router, { libraries }]: RouterInitArgs<T>
) {
const {

View file

@ -10,7 +10,7 @@ import type { IRouterParamContext } from 'koa-router';
import Router from 'koa-router';
import request from 'supertest';
import type { AuthedRouter, AnonymousRouter } from '#src/routes/types.js';
import type { ManagementApiRouter, AnonymousRouter } from '#src/routes/types.js';
import type TenantContext from '#src/tenants/TenantContext.js';
import type { Options } from '#src/test-utils/jest-koa-mocks/create-mock-context.js';
import createMockContext from '#src/test-utils/jest-koa-mocks/create-mock-context.js';
@ -106,7 +106,7 @@ export const createContextWithRouteParameters = (
/**
* Supertest Request Mock Utils
**/
type RouteLauncher<T extends AuthedRouter | AnonymousRouter> = (
type RouteLauncher<T extends ManagementApiRouter | AnonymousRouter> = (
router: T,
tenant: TenantContext
) => void;
@ -118,7 +118,7 @@ export function createRequester({
tenantContext,
}: {
anonymousRoutes?: RouteLauncher<AnonymousRouter> | Array<RouteLauncher<AnonymousRouter>>;
authedRoutes?: RouteLauncher<AuthedRouter> | Array<RouteLauncher<AuthedRouter>>;
authedRoutes?: RouteLauncher<ManagementApiRouter> | Array<RouteLauncher<ManagementApiRouter>>;
middlewares?: Middleware[];
tenantContext?: TenantContext;
}) {
@ -142,7 +142,7 @@ export function createRequester({
}
if (authedRoutes) {
const authRouter: AuthedRouter = new Router();
const authRouter: ManagementApiRouter = new Router();
authRouter.use(async (ctx, next) => {
ctx.auth = { type: 'user', id: 'foo' };