refactor(core): reorg SAML app related codes (#6966)

packages/core/src/routes/init.ts

@@ -7,8 +7,6 @@ import koaAuditLog from '#src/middleware/koa-audit-log.js';
 import koaBodyEtag from '#src/middleware/koa-body-etag.js';
 import { koaManagementApiHooks } from '#src/middleware/koa-management-api-hooks.js';
 import koaTenantGuard from '#src/middleware/koa-tenant-guard.js';
-import samlApplicationAnonymousRoutes from '#src/saml-applications/routes/anonymous.js';
-import samlApplicationRoutes from '#src/saml-applications/routes/index.js';
 import type TenantContext from '#src/tenants/TenantContext.js';
 
 import koaAuth from '../middleware/koa-auth/index.js';
@@ -42,6 +40,8 @@ import resourceRoutes from './resource.js';
 import resourceScopeRoutes from './resource.scope.js';
 import roleRoutes from './role.js';
 import roleScopeRoutes from './role.scope.js';
+import samlApplicationAnonymousRoutes from './saml-application/anonymous.js';
+import samlApplicationRoutes from './saml-application/index.js';
 import signInExperiencesRoutes from './sign-in-experience/index.js';
 import ssoConnectors from './sso-connector/index.js';
 import statusRoutes from './status.js';

packages/core/src/routes/saml-application/anonymous.ts

@@ -11,12 +11,11 @@ import RequestError from '#src/errors/RequestError/index.js';
 import koaAuditLog from '#src/middleware/koa-audit-log.js';
 import koaGuard from '#src/middleware/koa-guard.js';
 import type { AnonymousRouter, RouterInitArgs } from '#src/routes/types.js';
+import { SamlApplication } from '#src/saml-application/SamlApplication/index.js';
+import { generateAutoSubmitForm } from '#src/saml-application/SamlApplication/utils.js';
 import assertThat from '#src/utils/assert-that.js';
 import { getConsoleLogFromContext } from '#src/utils/console.js';
 
-import { SamlApplication } from '../SamlApplication/index.js';
-import { generateAutoSubmitForm } from '../SamlApplication/utils.js';
-
 const samlApplicationSignInCallbackQueryParametersGuard = z.union([
   z.object({
     code: z.string(),

packages/core/src/routes/saml-application/index.ts

@@ -10,23 +10,21 @@ import { generateStandardId } from '@logto/shared';
 import { removeUndefinedKeys } from '@silverhand/essentials';
 import { z } from 'zod';
 
-import { EnvSet } from '#src/env-set/index.js';
+import { EnvSet, getTenantEndpoint } from '#src/env-set/index.js';
 import RequestError from '#src/errors/RequestError/index.js';
+import {
+  calculateCertificateFingerprints,
+  ensembleSamlApplication,
+  validateAcsUrl,
+} from '#src/libraries/saml-application/utils.js';
 import koaGuard from '#src/middleware/koa-guard.js';
 import { koaQuotaGuard } from '#src/middleware/koa-quota-guard.js';
 import { buildOidcClientMetadata } from '#src/oidc/utils.js';
 import { generateInternalSecret } from '#src/routes/applications/application-secret.js';
 import type { ManagementApiRouter, RouterInitArgs } from '#src/routes/types.js';
+import { getSamlAppCallbackUrl } from '#src/saml-application/SamlApplication/utils.js';
 import assertThat from '#src/utils/assert-that.js';
 
-import { getTenantEndpoint } from '../../env-set/utils.js';
-import { getSamlAppCallbackUrl } from '../SamlApplication/utils.js';
-import {
-  calculateCertificateFingerprints,
-  ensembleSamlApplication,
-  validateAcsUrl,
-} from '../libraries/utils.js';
-
 export default function samlApplicationRoutes<T extends ManagementApiRouter>(
   ...[router, { id: tenantId, queries, libraries }]: RouterInitArgs<T>
 ) {

packages/core/src/saml-application/SamlApplication/index.ts

@@ -18,6 +18,11 @@ import { ZodError, z } from 'zod';
 
 import { EnvSet, getTenantEndpoint } from '#src/env-set/index.js';
 import RequestError from '#src/errors/RequestError/index.js';
+import {
+  buildSingleSignOnUrl,
+  buildSamlIdentityProviderEntityId,
+} from '#src/libraries/saml-application/utils.js';
+import { type SamlApplicationDetails } from '#src/queries/saml-application/index.js';
 import {
   fetchOidcConfigRaw,
   getRawUserInfoResponse,
@@ -34,10 +39,7 @@ import {
   samlLogInResponseTemplate,
   samlAttributeNameFormatBasic,
   samlValueXmlnsXsi,
-} from '../libraries/consts.js';
-import { buildSingleSignOnUrl, buildSamlIdentityProviderEntityId } from '../libraries/utils.js';
-import { type SamlApplicationDetails } from '../queries/index.js';
-
+} from './consts.js';
 import {
   buildSamlAssertionNameId,
   getSamlAppCallbackUrl,

packages/core/src/tenants/Libraries.ts

@@ -11,13 +11,13 @@ import { createPhraseLibrary } from '#src/libraries/phrase.js';
 import { createProtectedAppLibrary } from '#src/libraries/protected-app.js';
 import { createQuotaLibrary } from '#src/libraries/quota.js';
 import { createRoleScopeLibrary } from '#src/libraries/role-scope.js';
+import { createSamlApplicationsLibrary } from '#src/libraries/saml-application/saml-applications.js';
 import { createScopeLibrary } from '#src/libraries/scope.js';
 import { createSignInExperienceLibrary } from '#src/libraries/sign-in-experience/index.js';
 import { createSocialLibrary } from '#src/libraries/social.js';
 import { createSsoConnectorLibrary } from '#src/libraries/sso-connector.js';
 import { createUserLibrary } from '#src/libraries/user.js';
 import { createVerificationStatusLibrary } from '#src/libraries/verification-status.js';
-import { createSamlApplicationsLibrary } from '#src/saml-applications/libraries/saml-applications.js';
 
 import type Queries from './Queries.js';
 

packages/core/src/tenants/Queries.ts

@@ -19,6 +19,10 @@ import { createPasscodeQueries } from '#src/queries/passcode.js';
 import { createResourceQueries } from '#src/queries/resource.js';
 import { createRolesScopesQueries } from '#src/queries/roles-scopes.js';
 import { createRolesQueries } from '#src/queries/roles.js';
+import { createSamlApplicationConfigQueries } from '#src/queries/saml-application/configs.js';
+import { createSamlApplicationQueries } from '#src/queries/saml-application/index.js';
+import { createSamlApplicationSecretsQueries } from '#src/queries/saml-application/secrets.js';
+import { createSamlApplicationSessionQueries } from '#src/queries/saml-application/sessions.js';
 import { createScopeQueries } from '#src/queries/scope.js';
 import { createSignInExperienceQueries } from '#src/queries/sign-in-experience.js';
 import SsoConnectorQueries from '#src/queries/sso-connectors.js';
@@ -28,10 +32,6 @@ import UserSsoIdentityQueries from '#src/queries/user-sso-identities.js';
 import { createUserQueries } from '#src/queries/user.js';
 import { createUsersRolesQueries } from '#src/queries/users-roles.js';
 import { createVerificationStatusQueries } from '#src/queries/verification-status.js';
-import { createSamlApplicationConfigQueries } from '#src/saml-applications/queries/configs.js';
-import { createSamlApplicationQueries } from '#src/saml-applications/queries/index.js';
-import { createSamlApplicationSecretsQueries } from '#src/saml-applications/queries/secrets.js';
-import { createSamlApplicationSessionQueries } from '#src/saml-applications/queries/sessions.js';
 
 import { AccountCenterQueries } from '../queries/account-center.js';
 import { PersonalAccessTokensQueries } from '../queries/personal-access-tokens.js';