Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-02-17 22:04:19 -05:00
Code Issues Activity

refactor(core): extract verified interaction guard middleware (#6336)

Browse source 
* refactor(core): refactor backup code generate flow

refactor backup code generate flow

* fix(core): fix api payload

fix api payload

* fix(core): fix rebase issue

fix rebase issue

* refactor(core): extract verified interaction guard middleware

extract verified interaction guard middleware
This commit is contained in:
simeng-li 2024-07-31 11:16:14 +08:00 • committed by GitHub
parent b97c720c59
commit ea150f1c7a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 33 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
packages/core/src/routes/experience/profile-routes.ts
View file

@ -4,6 +4,7 @@ import {
SignInIdentifier,
updateProfileApiPayloadGuard,
} from '@logto/schemas';
import { type MiddlewareType } from 'koa';
import type Router from 'koa-router';
import { z } from 'zod';
@ -17,6 +18,35 @@ import { identifierCodeVerificationTypeMap } from './classes/verifications/code-
import { experienceRoutes } from './const.js';
import { type WithExperienceInteractionContext } from './middleware/koa-experience-interaction.js';
/**
* @throws {RequestError} with status 400 if current interaction is ForgotPassword
* @throws {RequestError} with status 404 if current interaction is not identified
* @throws {RequestError} with status 403 if MFA verification status is not verified
*/
function verifiedInteractionGuard<
StateT,
ContextT extends WithLogContext,
ResponseT,
>(): MiddlewareType<StateT, WithExperienceInteractionContext<ContextT>, ResponseT> {
return async (ctx, next) => {
const { experienceInteraction } = ctx;
// Guard current interaction event is not ForgotPassword
assertThat(
experienceInteraction.interactionEvent !== InteractionEvent.ForgotPassword,
new RequestError({
code: 'session.not_supported_for_forgot_password',
statue: 400,
})
);
// Guard MFA verification status
await experienceInteraction.guardMfaVerificationStatus();
return next();
};
}
export default function interactionProfileRoutes<T extends WithLogContext>(
router: Router<unknown, WithExperienceInteractionContext<T>>,
tenant: TenantContext
@ -27,21 +57,9 @@ export default function interactionProfileRoutes<T extends WithLogContext>(
body: updateProfileApiPayloadGuard,
status: [204, 400, 403, 404, 422],
}),
verifiedInteractionGuard(),
async (ctx, next) => {
const { experienceInteraction, guard } = ctx;
// Guard current interaction event is not ForgotPassword
assertThat(
experienceInteraction.interactionEvent !== InteractionEvent.ForgotPassword,
new RequestError({
code: 'session.not_supported_for_forgot_password',
statue: 400,
})
);
// Guard MFA verification status
await experienceInteraction.guardMfaVerificationStatus();
const profilePayload = guard.body;
switch (profilePayload.type) {
@ -114,21 +132,10 @@ export default function interactionProfileRoutes<T extends WithLogContext>(
router.post(
`${experienceRoutes.mfa}/mfa-skipped`,
koaGuard({ status: [204, 400, 403, 404, 422] }),
verifiedInteractionGuard(),
async (ctx, next) => {
const { experienceInteraction, guard } = ctx;
// Guard current interaction event is not ForgotPassword
assertThat(
experienceInteraction.interactionEvent !== InteractionEvent.ForgotPassword,
new RequestError({
code: 'session.not_supported_for_forgot_password',
statue: 400,
})
);
// Guard current interaction event is identified and MFA verified
await experienceInteraction.guardMfaVerificationStatus();
await experienceInteraction.mfa.skip();
await experienceInteraction.save();
@ -147,22 +154,11 @@ export default function interactionProfileRoutes<T extends WithLogContext>(
}),
status: [204, 400, 403, 404, 422],
}),
verifiedInteractionGuard(),
async (ctx, next) => {
const { experienceInteraction, guard } = ctx;
const { type, verificationId } = guard.body;
// Guard current interaction event is not ForgotPassword
assertThat(
experienceInteraction.interactionEvent !== InteractionEvent.ForgotPassword,
new RequestError({
code: 'session.not_supported_for_forgot_password',
statue: 400,
})
);
// Guard current interaction event is identified and MFA verified
await experienceInteraction.guardMfaVerificationStatus();
switch (type) {
case MfaFactor.TOTP: {
await experienceInteraction.mfa.addTotpByVerificationId(verificationId);