& so it begins

packages/logic/domains/2fa/controller.ts

@@ -0,0 +1,349 @@
+import { errAsync, okAsync, ResultAsync } from "neverthrow";
+import { FlowExecCtx } from "@core/flow.execution.context";
+import { UserRepository } from "@domains/user/repository";
+import { getRedisInstance, Redis } from "@pkg/redis";
+import { TwofaRepository } from "./repository";
+import { auth } from "../auth/config.base";
+import type { TwoFaSession } from "./data";
+import { User } from "@domains/user/data";
+import { settings } from "@core/settings";
+import { type Err } from "@pkg/result";
+import { twofaErrors } from "./errors";
+import { logger } from "@pkg/logger";
+import { db } from "@pkg/db";
+
+export class TwofaController {
+    constructor(
+        private twofaRepo: TwofaRepository,
+        private userRepo: UserRepository,
+        private store: Redis,
+    ) {}
+
+    checkTotp(secret: string, code: string) {
+        return this.twofaRepo.checkTotp(secret, code);
+    }
+
+    is2faEnabled(fctx: FlowExecCtx, userId: string) {
+        return this.twofaRepo
+            .getUsers2FAInfo(fctx, userId, true)
+            .map((data) => !!data)
+            .orElse(() => okAsync(false));
+    }
+
+    isUserBanned(fctx: FlowExecCtx, userId: string) {
+        return this.userRepo.isUserBanned(fctx, userId).orElse((error) => {
+            logger.error("Error checking user ban status:", error);
+            return okAsync(false);
+        });
+    }
+
+    setup2FA(fctx: FlowExecCtx, user: User) {
+        return this.is2faEnabled(fctx, user.id)
+            .andThen((enabled) =>
+                enabled
+                    ? errAsync(twofaErrors.alreadyEnabled(fctx))
+                    : this.twofaRepo.setup(fctx, user.id),
+            )
+            .map((secret) => {
+                const appName = settings.appName;
+                const totpUri = `otpauth://totp/${appName}:${user.email}?secret=${secret}&issuer=${appName}`;
+                return { totpURI: totpUri, secret };
+            });
+    }
+
+    verifyAndEnable2FA(
+        fctx: FlowExecCtx,
+        user: User,
+        code: string,
+        headers: Headers,
+    ) {
+        return this.is2faEnabled(fctx, user.id)
+            .andThen((enabled) => {
+                if (enabled) {
+                    return errAsync(twofaErrors.alreadyEnabled(fctx));
+                }
+                return okAsync(undefined);
+            })
+            .andThen(() => {
+                logger.info(`Verifying 2fa for ${user.id} : ${code}`, {
+                    flowId: fctx.flowId,
+                });
+                return this.twofaRepo.verifyAndEnable2FA(fctx, user.id, code);
+            })
+            .andThen((verified) => {
+                if (verified) {
+                    return ResultAsync.combine([
+                        ResultAsync.fromPromise(
+                            auth.api.revokeOtherSessions({ headers }),
+                            () => twofaErrors.revokeSessionsFailed(fctx),
+                        ),
+                        this.userRepo.updateLastVerified2FaAtToNow(
+                            fctx,
+                            user.id,
+                        ),
+                    ]).map(() => true);
+                }
+                return okAsync(verified);
+            });
+    }
+
+    disable(fctx: FlowExecCtx, user: User, code: string) {
+        return this.is2faEnabled(fctx, user.id)
+            .andThen((enabled) => {
+                if (!enabled) {
+                    return errAsync(twofaErrors.notEnabled(fctx));
+                }
+                return okAsync(undefined);
+            })
+            .andThen(() => this.twofaRepo.get2FASecret(fctx, user.id))
+            .andThen((secret) => {
+                if (!secret) {
+                    return errAsync(twofaErrors.invalidSetup(fctx));
+                }
+                if (!this.checkTotp(secret, code)) {
+                    return errAsync(twofaErrors.invalidCode(fctx));
+                }
+                return okAsync(undefined);
+            })
+            .andThen(() => this.twofaRepo.disable(fctx, user.id));
+    }
+
+    generateBackupCodes(fctx: FlowExecCtx, user: User) {
+        return this.is2faEnabled(fctx, user.id)
+            .andThen((enabled) => {
+                if (!enabled) {
+                    return errAsync(twofaErrors.notEnabled(fctx));
+                }
+                return okAsync(undefined);
+            })
+            .andThen(() => this.twofaRepo.generateBackupCodes(fctx, user.id));
+    }
+
+    requiresInitialVerification(
+        fctx: FlowExecCtx,
+        user: User,
+        sessionId: string,
+    ) {
+        return this.is2faEnabled(fctx, user.id).andThen((enabled) => {
+            if (!enabled) {
+                return okAsync(false);
+            }
+
+            return ResultAsync.fromPromise(
+                this.store.get(`initial_2fa_completed:${sessionId}`),
+                () => null,
+            )
+                .map((completed) => !completed && completed !== "0")
+                .orElse(() => okAsync(true));
+        });
+    }
+
+    requiresSensitiveActionVerification(fctx: FlowExecCtx, user: User) {
+        return this.is2faEnabled(fctx, user.id).andThen((enabled) => {
+            if (!enabled) {
+                return okAsync(false);
+            }
+
+            if (!user.last2FAVerifiedAt) {
+                return okAsync(true);
+            }
+
+            const requiredHours = settings.twofaRequiredHours || 24;
+            const verificationAge =
+                Date.now() - user.last2FAVerifiedAt.getTime();
+            const maxAge = requiredHours * 60 * 60 * 1000;
+
+            return okAsync(verificationAge > maxAge);
+        });
+    }
+
+    markInitialVerificationComplete(sessionId: string) {
+        return ResultAsync.fromPromise(
+            this.store.setex(
+                `initial_2fa_completed:${sessionId}`,
+                60 * 60 * 24 * 7,
+                "true",
+            ),
+            () => null,
+        )
+            .map(() => undefined)
+            .orElse((error) => {
+                logger.error("Error marking initial 2FA as complete:", error);
+                return okAsync(undefined);
+            });
+    }
+
+    startVerification(
+        fctx: FlowExecCtx,
+        params: {
+            userId: string;
+            sessionId: string;
+            ipAddress?: string;
+            userAgent?: string;
+        },
+    ) {
+        return this.twofaRepo.createSession(fctx, params).map((session) => ({
+            verificationToken: session.verificationToken,
+        }));
+    }
+
+    private validateSession(fctx: FlowExecCtx, session: TwoFaSession) {
+        if (session.status !== "pending") {
+            return errAsync(twofaErrors.sessionNotActive(fctx));
+        }
+
+        if (session.expiresAt < new Date()) {
+            return this.twofaRepo
+                .updateSession(fctx, session.id, { status: "expired" })
+                .andThen(() => errAsync(twofaErrors.sessionExpired(fctx)));
+        }
+
+        return okAsync(session);
+    }
+
+    private handleMaxAttempts(
+        fctx: FlowExecCtx,
+        session: TwoFaSession,
+        userId: string,
+    ) {
+        const banExpiresAt = new Date();
+        banExpiresAt.setHours(banExpiresAt.getHours() + 1);
+
+        return this.twofaRepo
+            .updateSession(fctx, session.id, { status: "failed" })
+            .andThen(() =>
+                this.userRepo.banUser(
+                    fctx,
+                    userId,
+                    "Too many failed 2FA verification attempts",
+                    banExpiresAt,
+                ),
+            )
+            .andThen(() => errAsync(twofaErrors.tooManyAttempts(fctx)));
+    }
+
+    private checkAttemptsLimit(
+        fctx: FlowExecCtx,
+        session: TwoFaSession,
+        userId: string,
+    ) {
+        if (session.attempts >= session.maxAttempts) {
+            return this.handleMaxAttempts(fctx, session, userId);
+        }
+        return okAsync(session);
+    }
+
+    private checkCodeReplay(
+        fctx: FlowExecCtx,
+        session: TwoFaSession,
+        code: string,
+    ): ResultAsync<TwoFaSession, Err> {
+        if (session.codeUsed === code) {
+            return this.twofaRepo
+                .incrementAttempts(fctx, session.id)
+                .andThen(() => errAsync(twofaErrors.codeReplay(fctx)));
+        }
+        return okAsync(session);
+    }
+
+    private verifyTotpCode(
+        fctx: FlowExecCtx,
+        session: TwoFaSession,
+        userId: string,
+        code: string,
+    ) {
+        return this.twofaRepo.get2FASecret(fctx, userId).andThen((secret) => {
+            if (!secret) {
+                return errAsync(twofaErrors.invalidSetup(fctx));
+            }
+
+            if (!this.checkTotp(secret, code)) {
+                return this.twofaRepo
+                    .incrementAttempts(fctx, session.id)
+                    .andThen(() => errAsync(twofaErrors.invalidCode(fctx)));
+            }
+
+            return okAsync(session);
+        });
+    }
+
+    private completeVerification(
+        fctx: FlowExecCtx,
+        session: TwoFaSession,
+        userId: string,
+        code: string,
+    ) {
+        return this.twofaRepo
+            .updateSession(fctx, session.id, {
+                status: "verified",
+                verifiedAt: new Date(),
+                codeUsed: code,
+            })
+            .andThen(() =>
+                ResultAsync.combine([
+                    this.userRepo.updateLastVerified2FaAtToNow(fctx, userId),
+                    this.markInitialVerificationComplete(session.sessionId),
+                ]),
+            )
+            .map(() => undefined);
+    }
+
+    verifyCode(
+        fctx: FlowExecCtx,
+        params: { verificationSessToken: string; code: string },
+        user?: User,
+    ) {
+        if (!user) {
+            return errAsync(twofaErrors.userNotFound(fctx));
+        }
+
+        return this.is2faEnabled(fctx, user.id)
+            .andThen((enabled) => {
+                if (!enabled) {
+                    return errAsync(
+                        twofaErrors.notEnabledForVerification(fctx),
+                    );
+                }
+                return okAsync(undefined);
+            })
+            .andThen(() =>
+                this.twofaRepo.getSessionByToken(
+                    fctx,
+                    params.verificationSessToken,
+                ),
+            )
+            .andThen((session) => {
+                if (!session) {
+                    return errAsync(twofaErrors.sessionNotFound(fctx));
+                }
+                return okAsync(session);
+            })
+            .andThen((session) => this.validateSession(fctx, session))
+            .andThen((session) =>
+                this.checkAttemptsLimit(fctx, session, user.id),
+            )
+            .andThen((session) =>
+                this.checkCodeReplay(fctx, session, params.code),
+            )
+            .andThen((session) =>
+                this.verifyTotpCode(fctx, session, user.id, params.code),
+            )
+            .andThen((session) =>
+                this.completeVerification(fctx, session, user.id, params.code),
+            )
+            .map(() => ({ success: true }));
+    }
+
+    cleanupExpiredSessions(fctx: FlowExecCtx) {
+        return this.twofaRepo.cleanupExpiredSessions(fctx);
+    }
+}
+
+export function getTwofaController() {
+    const _redis = getRedisInstance();
+    return new TwofaController(
+        new TwofaRepository(db, _redis),
+        new UserRepository(db),
+        _redis,
+    );
+}

packages/logic/domains/2fa/data.ts

@@ -0,0 +1,48 @@
+import * as v from "valibot";
+
+export const startVerificationSchema = v.object({
+    userId: v.string(),
+    sessionId: v.string(),
+});
+
+export const verifyCodeSchema = v.object({
+    verificationToken: v.string(),
+    code: v.string(),
+});
+
+export const enable2FACodeSchema = v.object({
+    code: v.string(),
+});
+
+export const disable2FASchema = v.object({
+    code: v.string(),
+});
+
+export const twoFactorSchema = v.object({
+    id: v.string(),
+    secret: v.string(),
+    backupCodes: v.array(v.string()),
+    userId: v.string(),
+    createdAt: v.date(),
+    updatedAt: v.date(),
+});
+export type TwoFactor = v.InferOutput<typeof twoFactorSchema>;
+
+export type TwoFaSessionStatus = "pending" | "verified" | "failed" | "expired";
+
+export const twoFaSessionSchema = v.object({
+    id: v.string(),
+    userId: v.string(),
+    sessionId: v.string(),
+    verificationToken: v.string(),
+    codeUsed: v.optional(v.string()),
+    status: v.picklist(["pending", "verified", "failed", "expired"]),
+    attempts: v.number(),
+    maxAttempts: v.number(),
+    verifiedAt: v.optional(v.date()),
+    expiresAt: v.date(),
+    createdAt: v.date(),
+    ipAddress: v.string(),
+    userAgent: v.string(),
+});
+export type TwoFaSession = v.InferOutput<typeof twoFaSessionSchema>;

packages/logic/domains/2fa/errors.ts

@@ -0,0 +1,180 @@
+import { FlowExecCtx } from "@/core/flow.execution.context";
+import { ERROR_CODES, type Err } from "@pkg/result";
+import { getError } from "@pkg/logger";
+
+export const twofaErrors = {
+    dbError: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Database operation failed",
+            description: "Please try again later",
+            detail,
+        }),
+
+    alreadyEnabled: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "2FA already enabled",
+            description: "Disable it first if you want to re-enable it",
+            detail: "2FA already enabled",
+        }),
+
+    notEnabled: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "2FA not enabled for this user",
+            description: "Enable 2FA to perform this action",
+            detail: "2FA not enabled for this user",
+        }),
+
+    userNotFound: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "User not found",
+            description: "Session is invalid or expired",
+            detail: "User ID not found in database",
+        }),
+
+    sessionNotActive: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "Verification session is no longer active",
+            description: "Please request a new verification code",
+            detail: "Session status is not 'pending'",
+        }),
+
+    sessionExpired: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "Verification session has expired",
+            description: "Please request a new verification code",
+            detail: "Session expired timestamp passed",
+        }),
+
+    sessionNotFound: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.NOT_FOUND,
+            message: "Invalid or expired verification session",
+            description: "Your verification session has expired or is invalid",
+            detail: "Session not found by verification token",
+        }),
+
+    tooManyAttempts: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.BANNED,
+            message: "Too many failed attempts",
+            description:
+                "Your account has been banned, contact us to resolve this issue",
+            detail: "Max attempts reached for 2FA verification",
+        }),
+
+    codeReplay: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "This code has already been used",
+            description: "Please request a new verification code",
+            detail: "Code replay attempt detected",
+        }),
+
+    invalidSetup: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "Invalid 2FA setup found",
+            description: "Please contact us to resolve this issue",
+            detail: "Invalid 2FA data found",
+        }),
+
+    invalidCode: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "Invalid verification code",
+            description: "Please try again with the correct code",
+            detail: "Code is invalid",
+        }),
+
+    notEnabledForVerification: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "2FA not enabled for this user",
+            description:
+                "Two-factor authentication is not enabled on your account",
+            detail: "User has 2FA disabled but verification attempted",
+        }),
+
+    revokeSessionsFailed: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "Failed to revoke sessions",
+            description: "Please try again later",
+            detail: "Failed to revoke other sessions",
+        }),
+
+    // Repository errors
+    notFound: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.NOT_FOUND,
+            message: "2FA not found",
+            description: "Likely not enabled, otherwise please contact us :)",
+            detail: "2FA not found",
+        }),
+
+    setupNotFound: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.VALIDATION_ERROR,
+            message: "Cannot perform action",
+            description: "If 2FA is not enabled, please refresh and try again",
+            detail: "2FA setup not found",
+        }),
+
+    maxAttemptsReached: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "Too many failed attempts",
+            description: "Please refresh and try again",
+            detail: "Max attempts reached for session",
+        }),
+
+    backupCodesNotFound: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.NOT_FOUND,
+            message: "2FA info not found",
+            description: "Please setup 2FA or contact us if this is unexpected",
+            detail: "2FA info not found for user",
+        }),
+
+    backupCodesAlreadyGenerated: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.AUTH_ERROR,
+            message: "Backup codes already generated",
+            description:
+                "Can only generate if not already present, or all are used up",
+            detail: "Backup codes already generated",
+        }),
+
+    sessionNotFoundById: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.NOT_FOUND,
+            message: "2FA session not found",
+            description: "The verification session may have expired",
+            detail: "Session ID not found in database",
+        }),
+};

packages/logic/domains/2fa/repository.ts

@@ -0,0 +1,554 @@
+import { errAsync, okAsync, ResultAsync } from "neverthrow";
+import { FlowExecCtx } from "@core/flow.execution.context";
+import { hashString, verifyHash } from "@/core/hash.utils";
+import { twoFactor, twofaSessions } from "@pkg/db/schema";
+import { TwoFactor, type TwoFaSession } from "./data";
+import { and, Database, eq, gt, lt } from "@pkg/db";
+import { settings } from "@core/settings";
+import type { Err } from "@pkg/result";
+import { twofaErrors } from "./errors";
+import { authenticator } from "otplib";
+import { logger } from "@pkg/logger";
+import { Redis } from "@pkg/redis";
+import { nanoid } from "nanoid";
+
+type TwoFaSetup = {
+    secret: string;
+    lastUsedCode: string;
+    tries: number;
+};
+
+export class TwofaRepository {
+    private PENDING_KEY_PREFIX = "pending_enabling_2fa:";
+    private EXPIRY_TIME = 60 * 20; // 20 mins
+    private DEFAULT_BACKUP_CODES_AMT = 8;
+    private MAX_SETUP_ATTEMPTS = 3;
+
+    constructor(
+        private db: Database,
+        private store: Redis,
+    ) {}
+
+    checkTotp(secret: string, code: string) {
+        const checked = authenticator.verify({ secret, token: code });
+        logger.debug("TOTP check result", { checked });
+        return checked;
+    }
+
+    async checkBackupCode(hash: string, code: string) {
+        return verifyHash({ hash, target: code });
+    }
+
+    private getKey(userId: string) {
+        if (userId.includes(this.PENDING_KEY_PREFIX)) {
+            return userId;
+        }
+        return `${this.PENDING_KEY_PREFIX}${userId}`;
+    }
+
+    getUsers2FAInfo(
+        fctx: FlowExecCtx,
+        userId: string,
+        returnUndefined?: boolean,
+    ): ResultAsync<TwoFactor | undefined, Err> {
+        logger.info("Getting user 2FA info", { ...fctx, userId });
+
+        return ResultAsync.fromPromise(
+            this.db.query.twoFactor.findFirst({
+                where: eq(twoFactor.userId, userId),
+            }),
+            () => twofaErrors.dbError(fctx, "Failed to query 2FA info"),
+        ).andThen((found) => {
+            if (!found) {
+                logger.debug("2FA info not found for user", {
+                    ...fctx,
+                    userId,
+                });
+                if (returnUndefined) {
+                    return okAsync(undefined);
+                }
+                return errAsync(twofaErrors.notFound(fctx));
+            }
+            logger.info("2FA info retrieved successfully", { ...fctx, userId });
+            return okAsync(found as TwoFactor);
+        });
+    }
+
+    isSetupPending(
+        fctx: FlowExecCtx,
+        userId: string,
+    ): ResultAsync<boolean, Err> {
+        logger.debug("Checking if 2FA setup is pending", { ...fctx, userId });
+
+        return ResultAsync.fromPromise(
+            this.store.get(this.getKey(userId)),
+            () =>
+                twofaErrors.dbError(
+                    fctx,
+                    "Failed to check setup pending status",
+                ),
+        ).map((found) => {
+            const isPending = !!found;
+            logger.debug("Setup pending status checked", {
+                ...fctx,
+                userId,
+                isPending,
+            });
+            return isPending;
+        });
+    }
+
+    setup(fctx: FlowExecCtx, userId: string): ResultAsync<string, Err> {
+        logger.info("Starting 2FA setup", { ...fctx, userId });
+
+        return ResultAsync.fromSafePromise(
+            (async () => {
+                const secret = authenticator.generateSecret();
+                const payload = {
+                    secret,
+                    lastUsedCode: "",
+                    tries: 0,
+                } as TwoFaSetup;
+                await this.store.setex(
+                    this.getKey(userId),
+                    this.EXPIRY_TIME,
+                    JSON.stringify(payload),
+                );
+                logger.info("Created temp 2FA session", {
+                    ...fctx,
+                    userId,
+                    expiresIn: this.EXPIRY_TIME,
+                });
+                return secret;
+            })(),
+        ).mapErr(() =>
+            twofaErrors.dbError(fctx, "Setting to data store failed"),
+        );
+    }
+
+    verifyAndEnable2FA(
+        fctx: FlowExecCtx,
+        userId: string,
+        code: string,
+    ): ResultAsync<boolean, Err> {
+        logger.info("Verifying and enabling 2FA", { ...fctx, userId });
+
+        return ResultAsync.fromPromise(
+            this.store.get(this.getKey(userId)),
+            () => twofaErrors.dbError(fctx, "Failed to get setup session"),
+        )
+            .andThen((payload) => {
+                if (!payload) {
+                    logger.error("Setup session not found", {
+                        ...fctx,
+                        userId,
+                    });
+                    return errAsync(twofaErrors.setupNotFound(fctx));
+                }
+                return okAsync(JSON.parse(payload) as TwoFaSetup);
+            })
+            .andThen((payloadObj) => {
+                const key = this.getKey(userId);
+
+                if (payloadObj.tries >= this.MAX_SETUP_ATTEMPTS) {
+                    logger.warn("Max setup attempts reached", {
+                        ...fctx,
+                        userId,
+                        tries: payloadObj.tries,
+                    });
+                    return ResultAsync.fromPromise(this.store.del(key), () =>
+                        twofaErrors.dbError(
+                            fctx,
+                            "Failed to delete setup session",
+                        ),
+                    ).andThen(() =>
+                        errAsync(twofaErrors.maxAttemptsReached(fctx)),
+                    );
+                }
+
+                if (
+                    !this.checkTotp(payloadObj.secret, code) ||
+                    code === payloadObj.lastUsedCode
+                ) {
+                    logger.warn("Invalid 2FA code during setup", {
+                        ...fctx,
+                        userId,
+                        tries: payloadObj.tries + 1,
+                        codeReused: code === payloadObj.lastUsedCode,
+                    });
+                    return ResultAsync.fromPromise(
+                        this.store.setex(
+                            key,
+                            this.EXPIRY_TIME,
+                            JSON.stringify({
+                                secret: payloadObj.secret,
+                                lastUsedCode: code,
+                                tries: payloadObj.tries + 1,
+                            }),
+                        ),
+                        () =>
+                            twofaErrors.dbError(
+                                fctx,
+                                "Failed to update setup session",
+                            ),
+                    ).map(() => false);
+                }
+
+                logger.info("2FA code verified successfully, enabling 2FA", {
+                    ...fctx,
+                    userId,
+                });
+
+                return ResultAsync.fromPromise(this.store.del(key), () =>
+                    twofaErrors.dbError(fctx, "Failed to delete setup session"),
+                )
+                    .andThen(() =>
+                        ResultAsync.fromPromise(
+                            this.db
+                                .insert(twoFactor)
+                                .values({
+                                    id: nanoid(),
+                                    secret: payloadObj.secret,
+                                    userId: userId,
+                                    createdAt: new Date(),
+                                    updatedAt: new Date(),
+                                })
+                                .execute(),
+                            () =>
+                                twofaErrors.dbError(
+                                    fctx,
+                                    "Failed to insert 2FA record",
+                                ),
+                        ),
+                    )
+                    .map(() => {
+                        logger.info("2FA enabled successfully", {
+                            ...fctx,
+                            userId,
+                        });
+                        return true;
+                    });
+            });
+    }
+
+    disable(fctx: FlowExecCtx, userId: string): ResultAsync<boolean, Err> {
+        logger.info("Disabling 2FA", { ...fctx, userId });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .delete(twoFactor)
+                .where(eq(twoFactor.userId, userId))
+                .execute(),
+            () => twofaErrors.dbError(fctx, "Failed to delete 2FA record"),
+        ).map((result) => {
+            logger.info("2FA disabled successfully", { ...fctx, userId });
+            return true;
+        });
+    }
+
+    generateBackupCodes(
+        fctx: FlowExecCtx,
+        userId: string,
+    ): ResultAsync<string[], Err> {
+        logger.info("Generating backup codes", { ...fctx, userId });
+
+        return ResultAsync.fromPromise(
+            this.db.query.twoFactor.findFirst({
+                where: eq(twoFactor.userId, userId),
+            }),
+            () => twofaErrors.dbError(fctx, "Failed to query 2FA info"),
+        )
+            .andThen((found) => {
+                if (!found) {
+                    logger.error("2FA not enabled for user", {
+                        ...fctx,
+                        userId,
+                    });
+                    return errAsync(twofaErrors.backupCodesNotFound(fctx));
+                }
+                if (found.backupCodes && found.backupCodes.length) {
+                    logger.warn("Backup codes already generated", {
+                        ...fctx,
+                        userId,
+                    });
+                    return errAsync(
+                        twofaErrors.backupCodesAlreadyGenerated(fctx),
+                    );
+                }
+                return okAsync(found);
+            })
+            .andThen(() => {
+                const codes = Array.from(
+                    { length: this.DEFAULT_BACKUP_CODES_AMT },
+                    () => nanoid(12),
+                );
+
+                logger.debug("Backup codes generated, hashing", {
+                    ...fctx,
+                    userId,
+                    count: codes.length,
+                });
+
+                return ResultAsync.fromPromise(
+                    (async () => {
+                        const hashed = [];
+                        for (const code of codes) {
+                            const hash = await hashString(code);
+                            hashed.push(hash);
+                        }
+                        return { codes, hashed };
+                    })(),
+                    () =>
+                        twofaErrors.dbError(
+                            fctx,
+                            "Failed to hash backup codes",
+                        ),
+                ).andThen(({ codes, hashed }) =>
+                    ResultAsync.fromPromise(
+                        this.db
+                            .update(twoFactor)
+                            .set({ backupCodes: hashed })
+                            .where(eq(twoFactor.userId, userId))
+                            .returning(),
+                        () =>
+                            twofaErrors.dbError(
+                                fctx,
+                                "Failed to update backup codes",
+                            ),
+                    ).map(() => {
+                        logger.info("Backup codes generated successfully", {
+                            ...fctx,
+                            userId,
+                        });
+                        return codes;
+                    }),
+                );
+            });
+    }
+
+    get2FASecret(
+        fctx: FlowExecCtx,
+        userId: string,
+    ): ResultAsync<string | null, Err> {
+        logger.debug("Getting 2FA secret", { ...fctx, userId });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .select()
+                .from(twoFactor)
+                .where(eq(twoFactor.userId, userId))
+                .limit(1),
+            () => twofaErrors.dbError(fctx, "Failed to query 2FA secret"),
+        ).map((result) => {
+            if (!result.length) {
+                logger.debug("No 2FA secret found", { ...fctx, userId });
+                return null;
+            }
+            logger.debug("2FA secret retrieved", { ...fctx, userId });
+            return result[0].secret;
+        });
+    }
+
+    createSession(
+        fctx: FlowExecCtx,
+        params: {
+            userId: string;
+            sessionId: string;
+            ipAddress?: string;
+            userAgent?: string;
+        },
+    ): ResultAsync<TwoFaSession, Err> {
+        logger.info("Creating 2FA verification session", {
+            ...fctx,
+            userId: params.userId,
+            sessionId: params.sessionId,
+        });
+
+        return ResultAsync.fromSafePromise(
+            (async () => {
+                const expiryMinutes = settings.twofaSessionExpiryMinutes || 10;
+                const now = new Date();
+                const expiresAt = new Date(
+                    now.getTime() + expiryMinutes * 60 * 1000,
+                );
+
+                return { expiresAt, now, params };
+            })(),
+        ).andThen(({ expiresAt, now, params }) =>
+            ResultAsync.fromPromise(
+                this.db
+                    .insert(twofaSessions)
+                    .values({
+                        id: nanoid(),
+                        userId: params.userId,
+                        sessionId: params.sessionId,
+                        verificationToken: nanoid(32),
+                        status: "pending",
+                        attempts: 0,
+                        maxAttempts: 5,
+                        expiresAt,
+                        createdAt: now,
+                        ipAddress: params.ipAddress,
+                        userAgent: params.userAgent,
+                    })
+                    .returning(),
+                () => twofaErrors.dbError(fctx, "Failed to create 2FA session"),
+            ).map(([session]) => {
+                logger.info("2FA verification session created", {
+                    ...fctx,
+                    sessionId: session.id,
+                    userId: params.userId,
+                });
+                return session as TwoFaSession;
+            }),
+        );
+    }
+
+    getSessionByToken(
+        fctx: FlowExecCtx,
+        token: string,
+    ): ResultAsync<TwoFaSession | null, Err> {
+        logger.debug("Getting 2FA session by token", { ...fctx });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .select()
+                .from(twofaSessions)
+                .where(
+                    and(
+                        eq(twofaSessions.verificationToken, token),
+                        gt(twofaSessions.expiresAt, new Date()),
+                    ),
+                )
+                .limit(1),
+            () => twofaErrors.dbError(fctx, "Failed to query 2FA session"),
+        ).map((result) => {
+            if (!result.length) {
+                logger.warn("2FA session not found or expired", { ...fctx });
+                return null;
+            }
+            logger.debug("2FA session found", {
+                ...fctx,
+                sessionId: result[0].id,
+            });
+            return result[0] as TwoFaSession;
+        });
+    }
+
+    updateSession(
+        fctx: FlowExecCtx,
+        id: string,
+        updates: Partial<
+            Pick<
+                TwoFaSession,
+                "status" | "attempts" | "verifiedAt" | "codeUsed"
+            >
+        >,
+    ): ResultAsync<TwoFaSession, Err> {
+        logger.debug("Updating 2FA session", {
+            ...fctx,
+            sessionId: id,
+            updates,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .update(twofaSessions)
+                .set(updates)
+                .where(eq(twofaSessions.id, id))
+                .returning(),
+            () => twofaErrors.dbError(fctx, "Failed to update 2FA session"),
+        ).andThen(([session]) => {
+            if (!session) {
+                logger.error("2FA session not found for update", {
+                    ...fctx,
+                    sessionId: id,
+                });
+                return errAsync(twofaErrors.sessionNotFoundById(fctx));
+            }
+            logger.debug("2FA session updated successfully", {
+                ...fctx,
+                sessionId: id,
+            });
+            return okAsync(session as TwoFaSession);
+        });
+    }
+
+    incrementAttempts(
+        fctx: FlowExecCtx,
+        id: string,
+    ): ResultAsync<TwoFaSession, Err> {
+        logger.debug("Incrementing session attempts", {
+            ...fctx,
+            sessionId: id,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db.query.twofaSessions.findFirst({
+                where: eq(twofaSessions.id, id),
+                columns: { id: true, attempts: true },
+            }),
+            () =>
+                twofaErrors.dbError(
+                    fctx,
+                    "Failed to query session for increment",
+                ),
+        )
+            .andThen((s) => {
+                if (!s) {
+                    logger.error("Session not found for increment", {
+                        ...fctx,
+                        sessionId: id,
+                    });
+                    return errAsync(twofaErrors.sessionNotFoundById(fctx));
+                }
+                return okAsync(s);
+            })
+            .andThen((s) =>
+                ResultAsync.fromPromise(
+                    this.db
+                        .update(twofaSessions)
+                        .set({ attempts: s.attempts + 1 })
+                        .where(eq(twofaSessions.id, id))
+                        .returning(),
+                    () =>
+                        twofaErrors.dbError(
+                            fctx,
+                            "Failed to increment attempts",
+                        ),
+                ).andThen(([session]) => {
+                    if (!session) {
+                        logger.error("Session not found after increment", {
+                            ...fctx,
+                            sessionId: id,
+                        });
+                        return errAsync(twofaErrors.sessionNotFoundById(fctx));
+                    }
+
+                    logger.warn("Failed verification attempt", {
+                        ...fctx,
+                        sessionId: session.id,
+                        attempts: session.attempts,
+                    });
+
+                    return okAsync(session as TwoFaSession);
+                }),
+            );
+    }
+
+    cleanupExpiredSessions(fctx: FlowExecCtx): ResultAsync<number, Err> {
+        logger.info("Cleaning up expired 2FA sessions", { ...fctx });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .delete(twofaSessions)
+                .where(lt(twofaSessions.expiresAt, new Date())),
+            () =>
+                twofaErrors.dbError(fctx, "Failed to cleanup expired sessions"),
+        ).map((result) => {
+            const count = result.rowCount || 0;
+            logger.info("Expired sessions cleaned up", { ...fctx, count });
+            return count;
+        });
+    }
+}

packages/logic/domains/2fa/router.ts

@@ -0,0 +1,170 @@
+import {
+    disable2FASchema,
+    enable2FACodeSchema,
+    startVerificationSchema,
+    verifyCodeSchema,
+} from "./data";
+import { sValidator } from "@hono/standard-validator";
+import { HonoContext } from "@/core/hono.helpers";
+import { getTwofaController } from "./controller";
+import { auth } from "@domains/auth/config.base";
+import { Hono } from "hono";
+
+const twofaController = getTwofaController();
+
+export const twofaRouter = new Hono<HonoContext>()
+    .post("/setup", async (c) => {
+        const res = await twofaController.setup2FA(
+            c.env.locals.fCtx,
+            c.env.locals.user,
+        );
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+    .post(
+        "/verify-and-enable",
+        sValidator("json", enable2FACodeSchema),
+        async (c) => {
+            const data = c.req.valid("json");
+            const res = await twofaController.verifyAndEnable2FA(
+                c.env.locals.fCtx,
+                c.env.locals.user,
+                data.code,
+                c.req.raw.headers,
+            );
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    )
+    .get("/generate-backup-codes", async (c) => {
+        const res = await twofaController.generateBackupCodes(
+            c.env.locals.fCtx,
+            c.env.locals.user,
+        );
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+    .delete("/disable", sValidator("json", disable2FASchema), async (c) => {
+        const data = c.req.valid("json");
+        const res = await twofaController.disable(
+            c.env.locals.fCtx,
+            c.env.locals.user,
+            data.code,
+        );
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+    .get("/requires-verification", async (c) => {
+        const user = c.env.locals.user;
+        const sessionId = c.req.query("sessionId")?.toString() ?? "";
+        const res = await twofaController.requiresInitialVerification(
+            c.env.locals.fCtx,
+            user,
+            sessionId,
+        );
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+    .get("/requires-sensitive-action", async (c) => {
+        const res = await twofaController.requiresSensitiveActionVerification(
+            c.env.locals.fCtx,
+            c.env.locals.user,
+        );
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+    .post(
+        "/start-verification-session",
+        sValidator("json", startVerificationSchema),
+        async (c) => {
+            const data = c.req.valid("json");
+
+            const ipAddress =
+                c.req.header("x-forwarded-for") ||
+                c.req.header("x-real-ip") ||
+                "unknown";
+            const userAgent = c.req.header("user-agent") || "unknown";
+
+            const res = await twofaController.startVerification(
+                c.env.locals.fCtx,
+                {
+                    userId: data.userId,
+                    sessionId: data.sessionId,
+                    ipAddress,
+                    userAgent,
+                },
+            );
+
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+            );
+        },
+    )
+    .post(
+        "/verify-session-code",
+        sValidator("json", verifyCodeSchema),
+        async (c) => {
+            const data = c.req.valid("json");
+
+            let user = c.env.locals.user;
+            if (!user) {
+                const out = await auth.api.getSession({
+                    headers: c.req.raw.headers,
+                });
+                user = out?.user as any;
+            }
+
+            const res = await twofaController.verifyCode(
+                c.env.locals.fCtx,
+                {
+                    verificationSessToken: data.verificationToken,
+                    code: data.code,
+                },
+                user,
+            );
+
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    )
+    .post("/cleanup-expired-sessions", async (c) => {
+        const res = await twofaController.cleanupExpiredSessions(
+            c.env.locals.fCtx,
+        );
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    });

packages/logic/domains/2fa/sensitive-actions.ts

@@ -0,0 +1,43 @@
+import { FlowExecCtx } from "@core/flow.execution.context";
+import { getTwofaController } from "./controller";
+import type { User } from "@/domains/user/data";
+
+const twofaController = getTwofaController();
+
+/**
+ * Check if user needs 2FA verification for sensitive actions
+ * Call this before executing sensitive operations like:
+ * - Changing password
+ * - Viewing billing info
+ * - Deleting account
+ * - etc.
+ */
+export async function requiresSensitiveAction2FA(
+    fctx: FlowExecCtx,
+    user: User,
+): Promise<boolean> {
+    const result = await twofaController.requiresSensitiveActionVerification(
+        fctx,
+        user,
+    );
+    return result.match(
+        (data) => data,
+        () => true, // On error, require verification for security
+    );
+}
+
+export async function checkInitial2FaRequired(
+    fctx: FlowExecCtx,
+    user: User,
+    sessionId: string,
+): Promise<boolean> {
+    const result = await twofaController.requiresInitialVerification(
+        fctx,
+        user,
+        sessionId,
+    );
+    return result.match(
+        (data) => data,
+        () => true,
+    );
+}

packages/logic/domains/auth/config.base.ts

@@ -0,0 +1,205 @@
+import {
+    admin,
+    customSession,
+    magicLink,
+    multiSession,
+    username,
+} from "better-auth/plugins";
+import { getUserController, UserController } from "../user/controller";
+import { AuthController, getAuthController } from "./controller";
+import { drizzleAdapter } from "better-auth/adapters/drizzle";
+import { FlowExecCtx } from "@/core/flow.execution.context";
+import { UserRoleMap } from "@domains/user/data";
+import { getRedisInstance } from "@pkg/redis";
+import { APIError } from "better-auth/api";
+import { settings } from "@core/settings";
+import { betterAuth } from "better-auth";
+import { logger } from "@pkg/logger";
+import { db, schema } from "@pkg/db";
+import { nanoid } from "nanoid";
+
+// Constants
+const EMAIL_EXPIRES_IN_MINS = 10;
+const EMAIL_EXPIRES_IN_SECONDS = 60 * EMAIL_EXPIRES_IN_MINS;
+const COOKIE_CACHE_MAX_AGE = 60 * 5;
+
+// Helper to create flow context for better-auth callbacks
+function createAuthFlowContext(contextLabel: string): FlowExecCtx {
+    return {
+        flowId: `auth:${contextLabel}:${nanoid(10)}`,
+    };
+}
+
+// Singleton controller instances
+let authControllerInstance: AuthController | null = null;
+let userControllerInstance: UserController | null = null;
+
+function getAuthControllerInstance(): AuthController {
+    if (!authControllerInstance) {
+        authControllerInstance = getAuthController();
+    }
+    return authControllerInstance;
+}
+
+function getUserControllerInstance(): UserController {
+    if (!userControllerInstance) {
+        userControllerInstance = getUserController();
+    }
+    return userControllerInstance;
+}
+
+export const auth = betterAuth({
+    trustedOrigins: ["http://localhost:5173", settings.betterAuthUrl],
+    advanced: { useSecureCookies: settings.nodeEnv === "production" },
+    appName: settings.appName,
+    emailAndPassword: {
+        enabled: true,
+        disableSignUp: true,
+        requireEmailVerification: false,
+    },
+    plugins: [
+        customSession(async ({ user, session }) => {
+            session.id = session.token;
+            return { user, session };
+        }),
+        username({
+            minUsernameLength: 5,
+            maxUsernameLength: 20,
+            usernameValidator: async (username) => {
+                const fctx = createAuthFlowContext("username-check");
+                const uc = getUserControllerInstance();
+
+                const result = await uc
+                    .isUsernameAvailable(fctx, username)
+                    .match(
+                        (isAvailable) => ({ success: true, isAvailable }),
+                        (error) => {
+                            logger.error(
+                                `[${fctx.flowId}] Failed to check username availability`,
+                                error,
+                            );
+                            return { success: false, isAvailable: false };
+                        },
+                    );
+
+                return result.isAvailable;
+            },
+        }),
+        magicLink({
+            expiresIn: EMAIL_EXPIRES_IN_SECONDS,
+            rateLimit: { window: 60, max: 4 },
+            sendMagicLink: async ({ email, token, url }, request) => {
+                const fctx = createAuthFlowContext("magic-link");
+                const ac = getAuthControllerInstance();
+
+                const result = await ac
+                    .sendMagicLink(fctx, email, token, url)
+                    .match(
+                        () => ({ success: true, error: undefined }),
+                        (error) => ({ success: false, error }),
+                    );
+
+                if (!result.success || result?.error) {
+                    logger.error(
+                        `[${fctx.flowId}] Failed to send magic link`,
+                        result.error,
+                    );
+                    throw new APIError("INTERNAL_SERVER_ERROR", {
+                        message: result.error?.message,
+                    });
+                }
+            },
+        }),
+        admin({
+            defaultRole: UserRoleMap.admin,
+            defaultBanReason:
+                "Stop fanum taxing the server bub, losing aura points fr",
+            defaultBanExpiresIn: 60 * 60 * 24,
+        }),
+        multiSession({ maximumSessions: 5 }),
+    ],
+    logger: {
+        log: (level, message, metadata) => {
+            logger.log(level, message, metadata);
+        },
+        level: settings.isDevelopment ? "debug" : "info",
+    },
+    database: drizzleAdapter(db, { provider: "pg", schema: { ...schema } }),
+    secondaryStorage: {
+        get: async (key) => {
+            const redis = getRedisInstance();
+            return await redis.get(key);
+        },
+        set: async (key, value, ttl) => {
+            const redis = getRedisInstance();
+            if (ttl) {
+                await redis.setex(key, ttl, value);
+            } else {
+                await redis.set(key, value);
+            }
+        },
+        delete: async (key) => {
+            const redis = getRedisInstance();
+            const out = await redis.del(key);
+            if (!out && out !== 0) {
+                return null;
+            }
+            return out.toString() as any;
+        },
+    },
+    session: {
+        modelName: "session",
+        expiresIn: 60 * 60 * 24 * 7,
+        updateAge: 60 * 60 * 24,
+        cookieCache: {
+            enabled: true,
+            maxAge: COOKIE_CACHE_MAX_AGE,
+        },
+    },
+    user: {
+        changeEmail: {
+            enabled: true,
+            sendChangeEmailVerification: async (
+                { user, newEmail, url, token },
+                request,
+            ) => {
+                const fctx = createAuthFlowContext("email-change");
+                const ac = getAuthControllerInstance();
+
+                const result = await ac
+                    .sendEmailChangeVerificationEmail(
+                        fctx,
+                        newEmail,
+                        token,
+                        url,
+                    )
+                    .match(
+                        () => ({ success: true, error: undefined }),
+                        (error) => ({ success: false, error }),
+                    );
+
+                if (!result.success || result?.error) {
+                    logger.error(
+                        `[${fctx.flowId}] Failed to send email change verification`,
+                        result.error,
+                    );
+                    throw new APIError("INTERNAL_SERVER_ERROR", {
+                        message: result.error?.message,
+                    });
+                }
+            },
+        },
+        modelName: "user",
+        additionalFields: {
+            onboardingDone: {
+                type: "boolean",
+                defaultValue: false,
+                required: false,
+            },
+            last2FAVerifiedAt: { type: "date", required: false },
+            parentId: { required: false, type: "string" },
+        },
+    },
+});
+
+// - - -

packages/logic/domains/auth/controller.ts

@@ -0,0 +1,148 @@
+import { AuthContext, MiddlewareContext, MiddlewareOptions } from "better-auth";
+import { AccountRepository } from "../user/account.repository";
+import { FlowExecCtx } from "@/core/flow.execution.context";
+import { ResultAsync } from "neverthrow";
+import type { Err } from "@pkg/result";
+import { authErrors } from "./errors";
+import { logger } from "@pkg/logger";
+import { nanoid } from "nanoid";
+import { db } from "@pkg/db";
+
+export class AuthController {
+    private readonly mins = 10;
+
+    constructor(private accountRepo: AccountRepository) {}
+
+    sendEmailChangeVerificationEmail(
+        fctx: FlowExecCtx,
+        newEmail: string,
+        token: string,
+        url: string,
+    ): ResultAsync<void, Err> {
+        logger.info("Sending email change verification link", {
+            ...fctx,
+            newEmail,
+        });
+        logger.debug("Original URL", { ...fctx, url });
+
+        const transformedUrl = url
+            .replace("/api/auth/verify-email", "/account/verify-email")
+            .replace("/api/", "/");
+
+        logger.debug("Transformed URL", { ...fctx, transformedUrl });
+
+        // Simulate email sending with 90/10 success/failure
+        const success = Math.random() > 0.1;
+
+        if (!success) {
+            logger.error("Failed to send email change verification link", {
+                ...fctx,
+                error: "Simulated email service failure",
+            });
+            return ResultAsync.fromPromise(
+                Promise.reject(
+                    authErrors.emailChangeVerificationFailed(
+                        fctx,
+                        "Simulated email service failure",
+                    ),
+                ),
+                (error) => error as Err,
+            );
+        }
+
+        logger.info("Email change verification sent successfully", {
+            ...fctx,
+            newEmail,
+        });
+        return ResultAsync.fromSafePromise(Promise.resolve(undefined));
+    }
+
+    swapAccountPasswordForTwoFactor(
+        fctx: FlowExecCtx,
+        ctx: MiddlewareContext<
+            MiddlewareOptions,
+            AuthContext & { returned?: unknown; responseHeaders?: Headers }
+        >,
+    ) {
+        logger.info("Swapping account password for 2FA", {
+            ...fctx,
+        });
+
+        if (!ctx.path.includes("two-factor")) {
+            return ResultAsync.fromSafePromise(Promise.resolve(ctx));
+        }
+
+        if (!ctx.body.password || ctx.body.password.length === 0) {
+            return ResultAsync.fromSafePromise(Promise.resolve(ctx));
+        }
+
+        logger.info("Rotating password for 2FA setup for user", {
+            ...fctx,
+            userId: ctx.body.userId,
+        });
+
+        return this.accountRepo
+            .rotatePassword(fctx, ctx.body.userId, nanoid())
+            .mapErr((err) => {
+                logger.error("Failed to rotate password for 2FA", {
+                    ...fctx,
+                    error: err,
+                });
+                return authErrors.passwordRotationFailed(fctx, err.detail);
+            })
+            .map((newPassword) => {
+                logger.info("Password rotated successfully for 2FA setup", {
+                    ...fctx,
+                });
+                return {
+                    ...ctx,
+                    body: { ...ctx.body, password: newPassword },
+                };
+            });
+    }
+
+    sendMagicLink(
+        fctx: FlowExecCtx,
+        email: string,
+        token: string,
+        url: string,
+    ): ResultAsync<void, Err> {
+        logger.info("Sending magic link", { ...fctx, email });
+        logger.debug("Original URL", { ...fctx, url });
+
+        const transformedUrl = url
+            .replace("/api/auth/magic-link/verify", "/auth/magic-link")
+            .replace("/api/", "/");
+
+        logger.debug("Transformed URL", { ...fctx, transformedUrl });
+
+        // Simulate email sending with 90/10 success/failure
+        const success = Math.random() > 0.1;
+
+        if (!success) {
+            logger.error("Failed to send magic link email", {
+                ...fctx,
+                error: "Simulated email service failure",
+            });
+            return ResultAsync.fromPromise(
+                Promise.reject(
+                    authErrors.magicLinkEmailFailed(
+                        fctx,
+                        "Simulated email service failure",
+                    ),
+                ),
+                (error) => error as Err,
+            );
+        }
+
+        logger.info("Magic link email sent successfully", {
+            ...fctx,
+            email,
+        });
+        return ResultAsync.fromSafePromise(Promise.resolve(undefined));
+    }
+}
+
+export function getAuthController(): AuthController {
+    return new AuthController(new AccountRepository(db));
+}

packages/logic/domains/auth/errors.ts

@@ -0,0 +1,59 @@
+import { FlowExecCtx } from "@/core/flow.execution.context";
+import { getError } from "@pkg/logger";
+import { ERROR_CODES, type Err } from "@pkg/result";
+
+export const authErrors = {
+    emailSendFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.INTERNAL_SERVER_ERROR,
+            message: "Failed to send email",
+            description: "An error occurred while sending the email",
+            detail,
+        }),
+
+    magicLinkEmailFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.INTERNAL_SERVER_ERROR,
+            message: "Failed to send magic link email",
+            description: "An error occurred while sending the magic link",
+            detail,
+        }),
+
+    emailChangeVerificationFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.INTERNAL_SERVER_ERROR,
+            message: "Failed to send email change verification link",
+            description: "An error occurred while sending the verification email",
+            detail,
+        }),
+
+    passwordRotationFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.INTERNAL_SERVER_ERROR,
+            message: "Failed to begin 2FA setup",
+            description: "An error occurred while rotating the password for 2FA",
+            detail,
+        }),
+
+    dbError: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Database operation failed",
+            description: "Please try again later",
+            detail,
+        }),
+
+    accountNotFound: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.NOT_FOUND,
+            message: "Account not found",
+            description: "Please try again later",
+            detail: "Account not found for user",
+        }),
+};

packages/logic/domains/notifications/controller.ts

@@ -0,0 +1,96 @@
+import { FlowExecCtx } from "@/core/flow.execution.context";
+import { okAsync } from "neverthrow";
+import {
+    NotificationFilters,
+    PaginationOptions,
+} from "./data";
+import { NotificationRepository } from "./repository";
+import { db } from "@pkg/db";
+
+export class NotificationController {
+    constructor(private notifsRepo: NotificationRepository) {}
+
+    getNotifications(
+        fctx: FlowExecCtx,
+        filters: NotificationFilters,
+        pagination: PaginationOptions,
+    ) {
+        return this.notifsRepo.getNotifications(fctx, filters, pagination);
+    }
+
+    markAsRead(
+        fctx: FlowExecCtx,
+        notificationIds: number[],
+        userId: string,
+    ) {
+        return this.notifsRepo.markAsRead(fctx, notificationIds, userId);
+    }
+
+    markAsUnread(
+        fctx: FlowExecCtx,
+        notificationIds: number[],
+        userId: string,
+    ) {
+        return this.notifsRepo.markAsUnread(fctx, notificationIds, userId);
+    }
+
+    archive(
+        fctx: FlowExecCtx,
+        notificationIds: number[],
+        userId: string,
+    ) {
+        return this.notifsRepo.archive(fctx, notificationIds, userId);
+    }
+
+    unarchive(
+        fctx: FlowExecCtx,
+        notificationIds: number[],
+        userId: string,
+    ) {
+        return this.notifsRepo.unarchive(fctx, notificationIds, userId);
+    }
+
+    deleteNotifications(
+        fctx: FlowExecCtx,
+        notificationIds: number[],
+        userId: string,
+    ) {
+        return this.notifsRepo.deleteNotifications(fctx, notificationIds, userId);
+    }
+
+    getUnreadCount(
+        fctx: FlowExecCtx,
+        userId: string,
+    ) {
+        return this.notifsRepo.getUnreadCount(fctx, userId);
+    }
+
+    markAllAsRead(
+        fctx: FlowExecCtx,
+        userId: string,
+    ) {
+        // Get all unread notification IDs for this user
+        const filters: NotificationFilters = {
+            userId,
+            isRead: false,
+            isArchived: false,
+        };
+
+        // Get a large number to handle bulk operations
+        const pagination: PaginationOptions = { page: 1, pageSize: 1000 };
+
+        return this.notifsRepo
+            .getNotifications(fctx, filters, pagination)
+            .map((paginated) => paginated.data.map((n) => n.id))
+            .andThen((notificationIds) => {
+                if (notificationIds.length === 0) {
+                    return okAsync(true);
+                }
+                return this.notifsRepo.markAsRead(fctx, notificationIds, userId);
+            });
+    }
+}
+
+export function getNotificationController(): NotificationController {
+    return new NotificationController(new NotificationRepository(db));
+}

packages/logic/domains/notifications/data.ts

@@ -0,0 +1,102 @@
+import * as v from "valibot";
+
+// Notification schema
+export const notificationSchema = v.object({
+    id: v.pipe(v.number(), v.integer()),
+    title: v.string(),
+    body: v.string(),
+    priority: v.string(),
+    type: v.string(),
+    category: v.string(),
+    isRead: v.boolean(),
+    isArchived: v.boolean(),
+    actionUrl: v.string(),
+    actionType: v.string(),
+    actionData: v.string(),
+    icon: v.string(),
+    userId: v.string(),
+    sentAt: v.date(),
+    readAt: v.nullable(v.date()),
+    expiresAt: v.nullable(v.date()),
+    createdAt: v.date(),
+    updatedAt: v.date(),
+});
+
+export type Notification = v.InferOutput<typeof notificationSchema>;
+export type Notifications = Notification[];
+
+// Notification filters schema
+export const notificationFiltersSchema = v.object({
+    userId: v.string(),
+    isRead: v.optional(v.boolean()),
+    isArchived: v.optional(v.boolean()),
+    type: v.optional(v.string()),
+    category: v.optional(v.string()),
+    priority: v.optional(v.string()),
+    search: v.optional(v.string()),
+});
+export type NotificationFilters = v.InferOutput<
+    typeof notificationFiltersSchema
+>;
+
+// Pagination options schema
+export const paginationOptionsSchema = v.object({
+    page: v.pipe(v.number(), v.integer()),
+    pageSize: v.pipe(v.number(), v.integer()),
+    sortBy: v.optional(v.string()),
+    sortOrder: v.optional(v.string()),
+});
+export type PaginationOptions = v.InferOutput<typeof paginationOptionsSchema>;
+
+// Paginated notifications schema
+export const paginatedNotificationsSchema = v.object({
+    data: v.array(notificationSchema),
+    total: v.pipe(v.number(), v.integer()),
+    page: v.pipe(v.number(), v.integer()),
+    pageSize: v.pipe(v.number(), v.integer()),
+    totalPages: v.pipe(v.number(), v.integer()),
+});
+export type PaginatedNotifications = v.InferOutput<
+    typeof paginatedNotificationsSchema
+>;
+
+// Get notifications schema
+export const getNotificationsSchema = v.object({
+    filters: notificationFiltersSchema,
+    pagination: paginationOptionsSchema,
+});
+export type GetNotifications = v.InferOutput<typeof getNotificationsSchema>;
+
+// Bulk notification IDs schema
+export const bulkNotificationIdsSchema = v.object({
+    notificationIds: v.array(v.pipe(v.number(), v.integer())),
+});
+export type BulkNotificationIds = v.InferOutput<
+    typeof bulkNotificationIdsSchema
+>;
+
+// View Model specific types
+export const clientNotificationFiltersSchema = v.object({
+    userId: v.string(),
+    isRead: v.optional(v.boolean()),
+    isArchived: v.optional(v.boolean()),
+    type: v.optional(v.string()),
+    category: v.optional(v.string()),
+    priority: v.optional(v.string()),
+    search: v.optional(v.string()),
+});
+export type ClientNotificationFilters = v.InferOutput<
+    typeof clientNotificationFiltersSchema
+>;
+
+export const clientPaginationStateSchema = v.object({
+    page: v.pipe(v.number(), v.integer()),
+    pageSize: v.pipe(v.number(), v.integer()),
+    total: v.pipe(v.number(), v.integer()),
+    totalPages: v.pipe(v.number(), v.integer()),
+    sortBy: v.picklist(["createdAt", "sentAt", "readAt", "priority"]),
+    sortOrder: v.picklist(["asc", "desc"]),
+});
+export type ClientPaginationState = v.InferOutput<
+    typeof clientPaginationStateSchema
+>;

packages/logic/domains/notifications/errors.ts

@@ -0,0 +1,78 @@
+import { FlowExecCtx } from "@/core/flow.execution.context";
+import { ERROR_CODES, type Err } from "@pkg/result";
+import { getError } from "@pkg/logger";
+
+export const notificationErrors = {
+    dbError: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Database operation failed",
+            description: "Please try again later",
+            detail,
+        }),
+
+    getNotificationsFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Failed to fetch notifications",
+            description: "Please try again later",
+            detail,
+        }),
+
+    markAsReadFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Failed to mark notifications as read",
+            description: "Please try again later",
+            detail,
+        }),
+
+    markAsUnreadFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Failed to mark notifications as unread",
+            description: "Please try again later",
+            detail,
+        }),
+
+    archiveFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Failed to archive notifications",
+            description: "Please try again later",
+            detail,
+        }),
+
+    unarchiveFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Failed to unarchive notifications",
+            description: "Please try again later",
+            detail,
+        }),
+
+    deleteNotificationsFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Failed to delete notifications",
+            description: "Please try again later",
+            detail,
+        }),
+
+    getUnreadCountFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Failed to get unread count",
+            description: "Please try again later",
+            detail,
+        }),
+};
+

packages/logic/domains/notifications/repository.ts

@@ -0,0 +1,384 @@
+import { and, asc, count, Database, desc, eq, like, or, sql } from "@pkg/db";
+import { notifications } from "@pkg/db/schema";
+import { ResultAsync } from "neverthrow";
+import { FlowExecCtx } from "@core/flow.execution.context";
+import type {
+    Notification,
+    NotificationFilters,
+    PaginatedNotifications,
+    PaginationOptions,
+} from "./data";
+import { type Err } from "@pkg/result";
+import { notificationErrors } from "./errors";
+import { logger } from "@pkg/logger";
+
+export class NotificationRepository {
+    constructor(private db: Database) {}
+
+    getNotifications(
+        fctx: FlowExecCtx,
+        filters: NotificationFilters,
+        pagination: PaginationOptions,
+    ): ResultAsync<PaginatedNotifications, Err> {
+        logger.info("Getting notifications with filters", { ...fctx, filters });
+
+        const { userId, isRead, isArchived, type, category, priority, search } =
+            filters;
+        const {
+            page,
+            pageSize,
+            sortBy = "createdAt",
+            sortOrder = "desc",
+        } = pagination;
+
+        // Build WHERE conditions
+        const conditions = [eq(notifications.userId, userId)];
+
+        if (isRead !== undefined) {
+            conditions.push(eq(notifications.isRead, isRead));
+        }
+
+        if (isArchived !== undefined) {
+            conditions.push(eq(notifications.isArchived, isArchived));
+        }
+
+        if (type) {
+            conditions.push(eq(notifications.type, type));
+        }
+
+        if (category) {
+            conditions.push(eq(notifications.category, category));
+        }
+
+        if (priority) {
+            conditions.push(eq(notifications.priority, priority));
+        }
+
+        if (search) {
+            conditions.push(
+                or(
+                    like(notifications.title, `%${search}%`),
+                    like(notifications.body, `%${search}%`),
+                )!,
+            );
+        }
+
+        const whereClause = and(...conditions);
+
+        return ResultAsync.fromPromise(
+            this.db.select({ count: count() }).from(notifications).where(whereClause),
+            (error) => {
+                logger.error("Failed to get notifications count", {
+                    ...fctx,
+                    error,
+                });
+                return notificationErrors.getNotificationsFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).andThen((totalResult) => {
+            const total = totalResult[0]?.count || 0;
+            const offset = (page - 1) * pageSize;
+
+            // Map sortBy to proper column
+            const getOrderColumn = (sortBy: string) => {
+                switch (sortBy) {
+                    case "createdAt":
+                        return notifications.createdAt;
+                    case "sentAt":
+                        return notifications.sentAt;
+                    case "readAt":
+                        return notifications.readAt;
+                    case "priority":
+                        return notifications.priority;
+                    default:
+                        return notifications.createdAt;
+                }
+            };
+
+            const orderColumn = getOrderColumn(sortBy);
+            const orderFunc = sortOrder === "asc" ? asc : desc;
+
+            return ResultAsync.fromPromise(
+                this.db
+                    .select()
+                    .from(notifications)
+                    .where(whereClause)
+                    .orderBy(orderFunc(orderColumn))
+                    .limit(pageSize)
+                    .offset(offset),
+                (error) => {
+                    logger.error("Failed to get notifications data", {
+                        ...fctx,
+                        error,
+                    });
+                    return notificationErrors.getNotificationsFailed(
+                        fctx,
+                        error instanceof Error ? error.message : String(error),
+                    );
+                },
+            ).map((data) => {
+                const totalPages = Math.ceil(total / pageSize);
+                logger.info("Retrieved notifications", {
+                    ...fctx,
+                    count: data.length,
+                    page,
+                    totalPages,
+                });
+
+                return {
+                    data: data as Notification[],
+                    total,
+                    page,
+                    pageSize,
+                    totalPages,
+                };
+            });
+        });
+    }
+
+    markAsRead(
+        fctx: FlowExecCtx,
+        notificationIds: number[],
+        userId: string,
+    ): ResultAsync<boolean, Err> {
+        logger.info("Marking notifications as read", {
+            ...fctx,
+            notificationIds,
+            userId,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .update(notifications)
+                .set({
+                    isRead: true,
+                    readAt: new Date(),
+                    updatedAt: new Date(),
+                })
+                .where(
+                    and(
+                        eq(notifications.userId, userId),
+                        sql`${notifications.id} = ANY(${notificationIds})`,
+                    ),
+                ),
+            (error) => {
+                logger.error("Failed to mark notifications as read", {
+                    ...fctx,
+                    error,
+                });
+                return notificationErrors.markAsReadFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).map(() => {
+            logger.info("Notifications marked as read successfully", {
+                ...fctx,
+                notificationIds,
+            });
+            return true;
+        });
+    }
+
+    markAsUnread(
+        fctx: FlowExecCtx,
+        notificationIds: number[],
+        userId: string,
+    ): ResultAsync<boolean, Err> {
+        logger.info("Marking notifications as unread", {
+            ...fctx,
+            notificationIds,
+            userId,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .update(notifications)
+                .set({
+                    isRead: false,
+                    readAt: null,
+                    updatedAt: new Date(),
+                })
+                .where(
+                    and(
+                        eq(notifications.userId, userId),
+                        sql`${notifications.id} = ANY(${notificationIds})`,
+                    ),
+                ),
+            (error) => {
+                logger.error("Failed to mark notifications as unread", {
+                    ...fctx,
+                    error,
+                });
+                return notificationErrors.markAsUnreadFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).map(() => {
+            logger.info("Notifications marked as unread successfully", {
+                ...fctx,
+                notificationIds,
+            });
+            return true;
+        });
+    }
+
+    archive(
+        fctx: FlowExecCtx,
+        notificationIds: number[],
+        userId: string,
+    ): ResultAsync<boolean, Err> {
+        logger.info("Archiving notifications", {
+            ...fctx,
+            notificationIds,
+            userId,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .update(notifications)
+                .set({
+                    isArchived: true,
+                    updatedAt: new Date(),
+                })
+                .where(
+                    and(
+                        eq(notifications.userId, userId),
+                        sql`${notifications.id} = ANY(${notificationIds})`,
+                    ),
+                ),
+            (error) => {
+                logger.error("Failed to archive notifications", {
+                    ...fctx,
+                    error,
+                });
+                return notificationErrors.archiveFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).map(() => {
+            logger.info("Notifications archived successfully", {
+                ...fctx,
+                notificationIds,
+            });
+            return true;
+        });
+    }
+
+    unarchive(
+        fctx: FlowExecCtx,
+        notificationIds: number[],
+        userId: string,
+    ): ResultAsync<boolean, Err> {
+        logger.info("Unarchiving notifications", {
+            ...fctx,
+            notificationIds,
+            userId,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .update(notifications)
+                .set({
+                    isArchived: false,
+                    updatedAt: new Date(),
+                })
+                .where(
+                    and(
+                        eq(notifications.userId, userId),
+                        sql`${notifications.id} = ANY(${notificationIds})`,
+                    ),
+                ),
+            (error) => {
+                logger.error("Failed to unarchive notifications", {
+                    ...fctx,
+                    error,
+                });
+                return notificationErrors.unarchiveFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).map(() => {
+            logger.info("Notifications unarchived successfully", {
+                ...fctx,
+                notificationIds,
+            });
+            return true;
+        });
+    }
+
+    deleteNotifications(
+        fctx: FlowExecCtx,
+        notificationIds: number[],
+        userId: string,
+    ): ResultAsync<boolean, Err> {
+        logger.info("Deleting notifications", {
+            ...fctx,
+            notificationIds,
+            userId,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .delete(notifications)
+                .where(
+                    and(
+                        eq(notifications.userId, userId),
+                        sql`${notifications.id} = ANY(${notificationIds})`,
+                    ),
+                ),
+            (error) => {
+                logger.error("Failed to delete notifications", {
+                    ...fctx,
+                    error,
+                });
+                return notificationErrors.deleteNotificationsFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).map(() => {
+            logger.info("Notifications deleted successfully", {
+                ...fctx,
+                notificationIds,
+            });
+            return true;
+        });
+    }
+
+    getUnreadCount(
+        fctx: FlowExecCtx,
+        userId: string,
+    ): ResultAsync<number, Err> {
+        logger.info("Getting unread count", { ...fctx, userId });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .select({ count: count() })
+                .from(notifications)
+                .where(
+                    and(
+                        eq(notifications.userId, userId),
+                        eq(notifications.isRead, false),
+                        eq(notifications.isArchived, false),
+                    ),
+                ),
+            (error) => {
+                logger.error("Failed to get unread count", { ...fctx, error });
+                return notificationErrors.getUnreadCountFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).map((result) => {
+            const count = result[0]?.count || 0;
+            logger.info("Retrieved unread count", { ...fctx, count });
+            return count;
+        });
+    }
+}

packages/logic/domains/notifications/router.ts

@@ -0,0 +1,160 @@
+import { bulkNotificationIdsSchema, getNotificationsSchema } from "./data";
+import { getNotificationController } from "./controller";
+import { sValidator } from "@hono/standard-validator";
+import { HonoContext } from "@core/hono.helpers";
+import { Hono } from "hono";
+
+const nc = getNotificationController();
+
+export const notificationsRouter = new Hono<HonoContext>()
+    .get("/", async (c) => {
+        const fctx = c.env.locals.fCtx;
+        const userId = c.env.locals.user.id;
+        const url = new URL(c.req.url);
+
+        const filters = {
+            userId,
+            isRead: url.searchParams.get("isRead")
+                ? url.searchParams.get("isRead") === "true"
+                : undefined,
+            isArchived: url.searchParams.get("isArchived")
+                ? url.searchParams.get("isArchived") === "true"
+                : undefined,
+            type: url.searchParams.get("type") || undefined,
+            category: url.searchParams.get("category") || undefined,
+            priority: url.searchParams.get("priority") || undefined,
+            search: url.searchParams.get("search") || undefined,
+        };
+
+        const pagination = {
+            page: parseInt(url.searchParams.get("page") || "1"),
+            pageSize: parseInt(url.searchParams.get("pageSize") || "20"),
+            sortBy: url.searchParams.get("sortBy") || "createdAt",
+            sortOrder: url.searchParams.get("sortOrder") || "desc",
+        };
+
+        const res = await nc.getNotifications(fctx, filters, pagination);
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+    .post(
+        "/get-notifications",
+        sValidator("json", getNotificationsSchema),
+        async (c) => {
+            const fctx = c.env.locals.fCtx;
+            const data = c.req.valid("json");
+            const res = await nc.getNotifications(fctx, data.filters, data.pagination);
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    )
+    .put(
+        "/mark-read",
+        sValidator("json", bulkNotificationIdsSchema),
+        async (c) => {
+            const fctx = c.env.locals.fCtx;
+            const data = c.req.valid("json");
+            const userId = c.env.locals.user.id;
+            const res = await nc.markAsRead(fctx, [...data.notificationIds], userId);
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    )
+    .put(
+        "/mark-unread",
+        sValidator("json", bulkNotificationIdsSchema),
+        async (c) => {
+            const fctx = c.env.locals.fCtx;
+            const data = c.req.valid("json");
+            const userId = c.env.locals.user.id;
+            const res = await nc.markAsUnread(fctx, [...data.notificationIds], userId);
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    )
+    .put(
+        "/archive",
+        sValidator("json", bulkNotificationIdsSchema),
+        async (c) => {
+            const fctx = c.env.locals.fCtx;
+            const data = c.req.valid("json");
+            const userId = c.env.locals.user.id;
+            const res = await nc.archive(fctx, [...data.notificationIds], userId);
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    )
+    .put(
+        "/unarchive",
+        sValidator("json", bulkNotificationIdsSchema),
+        async (c) => {
+            const fctx = c.env.locals.fCtx;
+            const data = c.req.valid("json");
+            const userId = c.env.locals.user.id;
+            const res = await nc.unarchive(fctx, [...data.notificationIds], userId);
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    )
+    .delete(
+        "/delete",
+        sValidator("json", bulkNotificationIdsSchema),
+        async (c) => {
+            const fctx = c.env.locals.fCtx;
+            const data = c.req.valid("json");
+            const userId = c.env.locals.user.id;
+            const res = await nc.deleteNotifications(fctx, [...data.notificationIds], userId);
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    )
+    .put("/mark-all-read", async (c) => {
+        const fctx = c.env.locals.fCtx;
+        const userId = c.env.locals.user.id;
+        const res = await nc.markAllAsRead(fctx, userId);
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+    .get("/unread-count", async (c) => {
+        const fctx = c.env.locals.fCtx;
+        const userId = c.env.locals.user.id;
+        const res = await nc.getUnreadCount(fctx, userId);
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    });

packages/logic/domains/user/account.repository.ts

@@ -0,0 +1,213 @@
+import { FlowExecCtx } from "@/core/flow.execution.context";
+import { ERROR_CODES, type Err } from "@pkg/result";
+import { getError, logger } from "@pkg/logger";
+import { auth } from "../auth/config.base";
+import { account } from "@pkg/db/schema";
+import { ResultAsync } from "neverthrow";
+import { Database, eq } from "@pkg/db";
+import { nanoid } from "nanoid";
+
+export class AccountRepository {
+    constructor(private db: Database) {}
+
+    private dbError(fctx: FlowExecCtx, detail: string): Err {
+        return getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Database operation failed",
+            description: "Please try again later",
+            detail,
+        });
+    }
+
+    private accountNotFound(fctx: FlowExecCtx): Err {
+        return getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.NOT_FOUND,
+            message: "Account not found",
+            description: "Please try again later",
+            detail: "Account not found for user",
+        });
+    }
+
+    ensureAccountExists(
+        fctx: FlowExecCtx,
+        userId: string,
+    ): ResultAsync<boolean, Err> {
+        logger.info("Checking if account exists for user", {
+            ...fctx,
+            userId,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db.query.account.findFirst({
+                where: eq(account.userId, userId),
+            }),
+            (error) => {
+                logger.error("Failed to check account existence", {
+                    ...fctx,
+                    error,
+                });
+                return this.dbError(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).andThen((existingAccount) => {
+            if (existingAccount) {
+                logger.info("Account already exists for user", {
+                    ...fctx,
+                    userId,
+                });
+                return ResultAsync.fromSafePromise(Promise.resolve(true));
+            }
+
+            logger.info(
+                "Account does not exist, creating new account for user",
+                {
+                    ...fctx,
+                    userId,
+                },
+            );
+
+            return ResultAsync.fromPromise(
+                auth.$context.then((ctx) => ctx.password.hash(nanoid())),
+                (error) => {
+                    logger.error("Failed to hash password", {
+                        ...fctx,
+                        error,
+                    });
+                    return this.dbError(
+                        fctx,
+                        error instanceof Error ? error.message : String(error),
+                    );
+                },
+            ).andThen((password) => {
+                const aid = nanoid();
+
+                return ResultAsync.fromPromise(
+                    this.db
+                        .insert(account)
+                        .values({
+                            id: aid,
+                            accountId: userId,
+                            providerId: "credential",
+                            userId: userId,
+                            password,
+                            createdAt: new Date(),
+                            updatedAt: new Date(),
+                        })
+                        .execute(),
+                    (error) => {
+                        logger.error("Failed to create account", {
+                            ...fctx,
+                            error,
+                        });
+                        return this.dbError(
+                            fctx,
+                            error instanceof Error
+                                ? error.message
+                                : String(error),
+                        );
+                    },
+                ).map(() => {
+                    logger.info("Account created successfully for user", {
+                        ...fctx,
+                        userId,
+                    });
+                    return false;
+                });
+            });
+        });
+    }
+
+    rotatePassword(
+        fctx: FlowExecCtx,
+        userId: string,
+        password: string,
+    ): ResultAsync<string, Err> {
+        logger.info("Starting password rotation for user", {
+            ...fctx,
+            userId,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db.query.account.findFirst({
+                where: eq(account.userId, userId),
+            }),
+            (error) => {
+                logger.error(
+                    "Failed to check account existence for password rotation",
+                    {
+                        ...fctx,
+                        error,
+                    },
+                );
+                return this.dbError(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).andThen((existingAccount) => {
+            if (!existingAccount) {
+                logger.error("Account not found for user", {
+                    ...fctx,
+                    userId,
+                });
+                return ResultAsync.fromSafePromise(
+                    Promise.resolve(this.accountNotFound(fctx)),
+                ).andThen((err) =>
+                    ResultAsync.fromSafePromise(Promise.reject(err)),
+                );
+            }
+
+            return ResultAsync.fromPromise(
+                auth.$context.then((ctx) => ctx.password.hash(password)),
+                (error) => {
+                    logger.error("Failed to hash password for rotation", {
+                        ...fctx,
+                        error,
+                    });
+                    return this.dbError(
+                        fctx,
+                        error instanceof Error ? error.message : String(error),
+                    );
+                },
+            ).andThen((hashed) => {
+                logger.info("Updating user's password in database", {
+                    ...fctx,
+                });
+
+                return ResultAsync.fromPromise(
+                    this.db
+                        .update(account)
+                        .set({ password: hashed })
+                        .where(eq(account.userId, userId))
+                        .returning()
+                        .execute(),
+                    (error) => {
+                        logger.error("Failed to update password", {
+                            ...fctx,
+                            error,
+                        });
+                        return this.dbError(
+                            fctx,
+                            error instanceof Error
+                                ? error.message
+                                : String(error),
+                        );
+                    },
+                ).map((result) => {
+                    logger.info("User's password updated successfully", {
+                        ...fctx,
+                    });
+                    logger.debug("Password rotation result", {
+                        ...fctx,
+                        result,
+                    });
+                    return password;
+                });
+            });
+        });
+    }
+}

packages/logic/domains/user/controller.ts

@@ -0,0 +1,55 @@
+import { FlowExecCtx } from "@/core/flow.execution.context";
+import { AccountRepository } from "./account.repository";
+import { UserRepository } from "./repository";
+import { db } from "@pkg/db";
+
+export class UserController {
+    constructor(
+        private userRepository: UserRepository,
+        private accountRepo: AccountRepository,
+    ) {}
+
+    getUserInfo(fctx: FlowExecCtx, userId: string) {
+        return this.userRepository.getUserInfo(fctx, userId);
+    }
+
+    ensureAccountExists(fctx: FlowExecCtx, userId: string) {
+        return this.accountRepo.ensureAccountExists(fctx, userId);
+    }
+
+    isUsernameAvailable(fctx: FlowExecCtx, username: string) {
+        return this.userRepository.isUsernameAvailable(fctx, username);
+    }
+
+    updateLastVerified2FaAtToNow(fctx: FlowExecCtx, userId: string) {
+        return this.userRepository.updateLastVerified2FaAtToNow(fctx, userId);
+    }
+
+    banUser(
+        fctx: FlowExecCtx,
+        userId: string,
+        reason: string,
+        banExpiresAt: Date,
+    ) {
+        return this.userRepository.banUser(fctx, userId, reason, banExpiresAt);
+    }
+
+    isUserBanned(fctx: FlowExecCtx, userId: string) {
+        return this.userRepository.isUserBanned(fctx, userId);
+    }
+
+    getBanInfo(fctx: FlowExecCtx, userId: string) {
+        return this.userRepository.getBanInfo(fctx, userId);
+    }
+
+    rotatePassword(fctx: FlowExecCtx, userId: string, password: string) {
+        return this.accountRepo.rotatePassword(fctx, userId, password);
+    }
+}
+
+export function getUserController(): UserController {
+    return new UserController(
+        new UserRepository(db),
+        new AccountRepository(db),
+    );
+}

packages/logic/domains/user/data.ts

@@ -0,0 +1,159 @@
+import { Session } from "better-auth";
+import * as v from "valibot";
+
+export type { Session } from "better-auth";
+
+export type ModifiedSession = Session & { isCurrent?: boolean };
+
+// User role enum
+export enum UserRoleMap {
+    user = "user",
+    admin = "admin",
+}
+
+// User role schema
+export const userRoleSchema = v.picklist(["user", "admin"]);
+export type UserRole = v.InferOutput<typeof userRoleSchema>;
+
+// User schema
+export const userSchema = v.object({
+    id: v.string(),
+    name: v.string(),
+    email: v.string(),
+    emailVerified: v.boolean(),
+    image: v.optional(v.string()),
+    createdAt: v.date(),
+    updatedAt: v.date(),
+    username: v.optional(v.string()),
+    displayUsername: v.optional(v.string()),
+    role: v.optional(v.string()),
+    banned: v.optional(v.boolean()),
+    banReason: v.optional(v.string()),
+    banExpires: v.optional(v.date()),
+    onboardingDone: v.optional(v.boolean()),
+    last2FAVerifiedAt: v.optional(v.date()),
+    parentId: v.optional(v.string()),
+});
+export type User = v.InferOutput<typeof userSchema>;
+
+// Account schema
+export const accountSchema = v.object({
+    id: v.string(),
+    accountId: v.string(),
+    providerId: v.string(),
+    userId: v.string(),
+    accessToken: v.string(),
+    refreshToken: v.string(),
+    idToken: v.string(),
+    accessTokenExpiresAt: v.date(),
+    refreshTokenExpiresAt: v.date(),
+    scope: v.string(),
+    password: v.string(),
+    createdAt: v.date(),
+    updatedAt: v.date(),
+});
+export type Account = v.InferOutput<typeof accountSchema>;
+
+// Ensure account exists schema
+export const ensureAccountExistsSchema = v.object({
+    userId: v.string(),
+});
+export type EnsureAccountExists = v.InferOutput<
+    typeof ensureAccountExistsSchema
+>;
+
+// Ban info schema
+export const banInfoSchema = v.object({
+    banned: v.boolean(),
+    reason: v.optional(v.string()),
+    expires: v.optional(v.date()),
+});
+export type BanInfo = v.InferOutput<typeof banInfoSchema>;
+
+// Ban user schema
+export const banUserSchema = v.object({
+    userId: v.string(),
+    reason: v.string(),
+    banExpiresAt: v.date(),
+});
+export type BanUser = v.InferOutput<typeof banUserSchema>;
+
+// Check username availability schema
+export const checkUsernameSchema = v.object({
+    username: v.string(),
+});
+export type CheckUsername = v.InferOutput<typeof checkUsernameSchema>;
+
+// Rotate password schema
+export const rotatePasswordSchema = v.object({
+    userId: v.string(),
+    password: v.string(),
+});
+export type RotatePassword = v.InferOutput<typeof rotatePasswordSchema>;
+
+// View Model specific types
+
+// Search and filter types
+export const searchFieldSchema = v.picklist(["email", "name", "username"]);
+export type SearchField = v.InferOutput<typeof searchFieldSchema>;
+
+export const searchOperatorSchema = v.picklist([
+    "contains",
+    "starts_with",
+    "ends_with",
+]);
+export type SearchOperator = v.InferOutput<typeof searchOperatorSchema>;
+
+export const filterOperatorSchema = v.picklist([
+    "eq",
+    "ne",
+    "lt",
+    "lte",
+    "gt",
+    "gte",
+]);
+export type FilterOperator = v.InferOutput<typeof filterOperatorSchema>;
+
+export const sortDirectionSchema = v.picklist(["asc", "desc"]);
+export type SortDirection = v.InferOutput<typeof sortDirectionSchema>;
+
+// Users query state
+export const usersQueryStateSchema = v.object({
+    // searching
+    searchValue: v.optional(v.string()),
+    searchField: v.optional(searchFieldSchema),
+    searchOperator: v.optional(searchOperatorSchema),
+
+    // pagination
+    limit: v.pipe(v.number(), v.integer()),
+    offset: v.pipe(v.number(), v.integer()),
+
+    // sorting
+    sortBy: v.optional(v.string()),
+    sortDirection: v.optional(sortDirectionSchema),
+
+    // filtering
+    filterField: v.optional(v.string()),
+    filterValue: v.optional(v.union([v.string(), v.number(), v.boolean()])),
+    filterOperator: v.optional(filterOperatorSchema),
+});
+export type UsersQueryState = v.InferOutput<typeof usersQueryStateSchema>;
+
+// UI View Model types
+
+export const banExpiryModeSchema = v.picklist([
+    "never",
+    "1d",
+    "7d",
+    "30d",
+    "custom",
+]);
+export type BanExpiryMode = v.InferOutput<typeof banExpiryModeSchema>;
+
+export const createUserFormSchema = v.object({
+    email: v.string(),
+    password: v.string(),
+    name: v.string(),
+    role: v.union([userRoleSchema, v.array(userRoleSchema)]),
+});
+export type CreateUserForm = v.InferOutput<typeof createUserFormSchema>;

packages/logic/domains/user/errors.ts

@@ -0,0 +1,77 @@
+import { FlowExecCtx } from "@/core/flow.execution.context";
+import { ERROR_CODES, type Err } from "@pkg/result";
+import { getError } from "@pkg/logger";
+
+export const userErrors = {
+    dbError: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Database operation failed",
+            description: "Please try again later",
+            detail,
+        }),
+
+    userNotFound: (fctx: FlowExecCtx): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.NOT_FOUND,
+            message: "User not found",
+            description: "Try with a different user id",
+            detail: "User not found in database",
+        }),
+
+    usernameCheckFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "An error occurred while checking username availability",
+            description: "Try again later",
+            detail,
+        }),
+
+    banOperationFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Failed to perform ban operation",
+            description: "Please try again later",
+            detail,
+        }),
+
+    unbanFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Failed to unban user",
+            description: "Please try again later",
+            detail,
+        }),
+
+    updateFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "Failed to update user",
+            description: "Please try again later",
+            detail,
+        }),
+
+    getUserInfoFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "An error occurred while getting user info",
+            description: "Try again later",
+            detail,
+        }),
+
+    getBanInfoFailed: (fctx: FlowExecCtx, detail: string): Err =>
+        getError({
+            flowId: fctx.flowId,
+            code: ERROR_CODES.DATABASE_ERROR,
+            message: "An error occurred while getting ban info",
+            description: "Try again later",
+            detail,
+        }),
+};

packages/logic/domains/user/repository.ts

@@ -0,0 +1,289 @@
+import { ResultAsync, errAsync, okAsync } from "neverthrow";
+import { FlowExecCtx } from "@core/flow.execution.context";
+import { type Err } from "@pkg/result";
+import { Database, eq } from "@pkg/db";
+import { BanInfo, User } from "./data";
+import { user } from "@pkg/db/schema";
+import { userErrors } from "./errors";
+import { logger } from "@pkg/logger";
+
+export class UserRepository {
+    constructor(private db: Database) {}
+
+    getUserInfo(fctx: FlowExecCtx, userId: string): ResultAsync<User, Err> {
+        logger.info("Getting user info for user", {
+            flowId: fctx.flowId,
+            userId,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db.query.user.findFirst({
+                where: eq(user.id, userId),
+            }),
+            (error) => {
+                logger.error("Failed to get user info", {
+                    flowId: fctx.flowId,
+                    error,
+                });
+                return userErrors.getUserInfoFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).andThen((userData) => {
+            if (!userData) {
+                logger.error("User not found with id", {
+                    flowId: fctx.flowId,
+                    userId,
+                });
+                return errAsync(userErrors.userNotFound(fctx));
+            }
+
+            logger.info("User info retrieved successfully for user", {
+                flowId: fctx.flowId,
+                userId,
+            });
+            return okAsync(userData as User);
+        });
+    }
+
+    updateLastVerified2FaAtToNow(
+        fctx: FlowExecCtx,
+        userId: string,
+    ): ResultAsync<boolean, Err> {
+        logger.info("Updating last 2FA verified timestamp for user", {
+            flowId: fctx.flowId,
+            userId,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .update(user)
+                .set({ last2FAVerifiedAt: new Date() })
+                .where(eq(user.id, userId))
+                .execute(),
+            (error) => {
+                logger.error("Failed to update last 2FA verified timestamp", {
+                    ...fctx,
+                    error,
+                });
+                return userErrors.updateFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).map(() => {
+            logger.info("Last 2FA verified timestamp updated successfully", {
+                ...fctx,
+            });
+            return true;
+        });
+    }
+
+    isUsernameAvailable(
+        fctx: FlowExecCtx,
+        username: string,
+    ): ResultAsync<boolean, Err> {
+        logger.info("Checking username availability", {
+            ...fctx,
+            username,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db.query.user.findFirst({
+                where: eq(user.username, username),
+            }),
+            (error) => {
+                logger.error("Failed to check username availability", {
+                    ...fctx,
+                    error,
+                });
+                return userErrors.usernameCheckFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).map((existingUser) => {
+            const isAvailable = !existingUser?.id;
+            logger.info("Username availability checked", {
+                ...fctx,
+                username,
+                isAvailable,
+            });
+            return isAvailable;
+        });
+    }
+
+    banUser(
+        fctx: FlowExecCtx,
+        userId: string,
+        reason: string,
+        banExpiresAt: Date,
+    ): ResultAsync<boolean, Err> {
+        logger.info("Banning user", {
+            ...fctx,
+            userId,
+            banExpiresAt: banExpiresAt.toISOString(),
+            reason,
+        });
+
+        return ResultAsync.fromPromise(
+            this.db
+                .update(user)
+                .set({
+                    banned: true,
+                    banReason: reason,
+                    banExpires: banExpiresAt,
+                })
+                .where(eq(user.id, userId))
+                .execute(),
+            (error) => {
+                logger.error("Failed to ban user", { ...fctx, error });
+                return userErrors.banOperationFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).map(() => {
+            logger.info("User has been banned", {
+                ...fctx,
+                userId,
+                banExpiresAt: banExpiresAt.toISOString(),
+            });
+            return true;
+        });
+    }
+
+    isUserBanned(fctx: FlowExecCtx, userId: string): ResultAsync<boolean, Err> {
+        logger.info("Checking ban status for user", { ...fctx, userId });
+
+        return ResultAsync.fromPromise(
+            this.db.query.user.findFirst({
+                where: eq(user.id, userId),
+                columns: {
+                    banned: true,
+                    banExpires: true,
+                },
+            }),
+            (error) => {
+                logger.error("Failed to check ban status", {
+                    ...fctx,
+                    error,
+                });
+                return userErrors.dbError(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).andThen((userData) => {
+            if (!userData) {
+                logger.error("User not found when checking ban status", {
+                    ...fctx,
+                });
+                return errAsync(userErrors.userNotFound(fctx));
+            }
+
+            // If not banned, return false
+            if (!userData.banned) {
+                logger.info("User is not banned", { ...fctx, userId });
+                return okAsync(false);
+            }
+
+            // If banned but no expiry date, consider permanently banned
+            if (!userData.banExpires) {
+                logger.info("User is permanently banned", { ...fctx, userId });
+                return okAsync(true);
+            }
+
+            const now = new Date();
+            if (userData.banExpires <= now) {
+                logger.info("User ban has expired, removing ban status", {
+                    ...fctx,
+                    userId,
+                });
+
+                return ResultAsync.fromPromise(
+                    this.db
+                        .update(user)
+                        .set({
+                            banned: false,
+                            banReason: null,
+                            banExpires: null,
+                        })
+                        .where(eq(user.id, userId))
+                        .execute(),
+                    (error) => {
+                        logger.error("Failed to unban user after expiry", {
+                            ...fctx,
+                            error,
+                        });
+                        return userErrors.unbanFailed(
+                            fctx,
+                            error instanceof Error
+                                ? error.message
+                                : String(error),
+                        );
+                    },
+                )
+                    .map(() => {
+                        logger.info("User has been unbanned after expiry", {
+                            ...fctx,
+                            userId,
+                        });
+                        return false;
+                    })
+                    .orElse((error) => {
+                        logger.error(
+                            "Failed to unban user after expiry, still returning banned status",
+                            { ...fctx, userId, error },
+                        );
+                        // Still return banned status since we couldn't update
+                        return okAsync(true);
+                    });
+            }
+
+            logger.info("User is banned", {
+                ...fctx,
+                userId,
+                banExpires: userData.banExpires.toISOString(),
+            });
+            return okAsync(true);
+        });
+    }
+
+    getBanInfo(fctx: FlowExecCtx, userId: string): ResultAsync<BanInfo, Err> {
+        logger.info("Getting ban info for user", { ...fctx, userId });
+
+        return ResultAsync.fromPromise(
+            this.db.query.user.findFirst({
+                where: eq(user.id, userId),
+                columns: { banned: true, banReason: true, banExpires: true },
+            }),
+            (error) => {
+                logger.error("Failed to get ban info", { ...fctx, error });
+                return userErrors.getBanInfoFailed(
+                    fctx,
+                    error instanceof Error ? error.message : String(error),
+                );
+            },
+        ).andThen((userData) => {
+            if (!userData) {
+                logger.error("User not found when getting ban info", {
+                    ...fctx,
+                });
+                return errAsync(userErrors.userNotFound(fctx));
+            }
+
+            logger.info("Ban info retrieved successfully for user", {
+                ...fctx,
+                userId,
+            });
+
+            return okAsync({
+                banned: userData.banned || false,
+                reason: userData.banReason || undefined,
+                expires: userData.banExpires || undefined,
+            });
+        });
+    }
+}

packages/logic/domains/user/router.ts

@@ -0,0 +1,165 @@
+import {
+    banUserSchema,
+    checkUsernameSchema,
+    ensureAccountExistsSchema,
+    rotatePasswordSchema,
+} from "./data";
+import { HonoContext } from "@core/hono.helpers";
+import { sValidator } from "@hono/standard-validator";
+import { getUserController } from "./controller";
+import { Hono } from "hono";
+
+const uc = getUserController();
+
+export const usersRouter = new Hono<HonoContext>()
+    // Get current user info
+    .get("/me", async (c) => {
+        const fctx = c.env.locals.fCtx;
+        const userId = c.env.locals.user?.id;
+
+        if (!userId) {
+            return c.json(
+                {
+                    error: {
+                        code: "UNAUTHORIZED",
+                        message: "User not authenticated",
+                        description: "Please log in",
+                        detail: "No user ID found in session",
+                    },
+                },
+                401,
+            );
+        }
+
+        const res = await uc.getUserInfo(fctx, userId);
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+
+    // Get user info by ID
+    .get("/:userId", async (c) => {
+        const fctx = c.env.locals.fCtx;
+        const userId = c.req.param("userId");
+
+        const res = await uc.getUserInfo(fctx, userId);
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+
+    // Ensure account exists
+    .put(
+        "/ensure-account-exists",
+        sValidator("json", ensureAccountExistsSchema),
+        async (c) => {
+            const fctx = c.env.locals.fCtx;
+            const data = c.req.valid("json");
+
+            const res = await uc.ensureAccountExists(fctx, data.userId);
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    )
+
+    // Check username availability
+    .post(
+        "/check-username",
+        sValidator("json", checkUsernameSchema),
+        async (c) => {
+            const fctx = c.env.locals.fCtx;
+            const data = c.req.valid("json");
+
+            const res = await uc.isUsernameAvailable(fctx, data.username);
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    )
+
+    // Update last 2FA verification time
+    .put("/update-2fa-verified/:userId", async (c) => {
+        const fctx = c.env.locals.fCtx;
+        const userId = c.req.param("userId");
+
+        const res = await uc.updateLastVerified2FaAtToNow(fctx, userId);
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+
+    // Ban user
+    .post("/ban", sValidator("json", banUserSchema), async (c) => {
+        const fctx = c.env.locals.fCtx;
+        const data = c.req.valid("json");
+
+            const res = await uc.banUser(fctx, data.userId, data.reason, data.banExpiresAt);
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+    })
+
+    // Check if user is banned
+    .get("/:userId/is-banned", async (c) => {
+        const fctx = c.env.locals.fCtx;
+        const userId = c.req.param("userId");
+
+        const res = await uc.isUserBanned(fctx, userId);
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+
+    // Get ban info
+    .get("/:userId/ban-info", async (c) => {
+        const fctx = c.env.locals.fCtx;
+        const userId = c.req.param("userId");
+
+        const res = await uc.getBanInfo(fctx, userId);
+        return c.json(
+            res.isOk()
+                ? { data: res.value, error: null }
+                : { data: null, error: res.error },
+            res.isOk() ? 200 : 400,
+        );
+    })
+
+    // Rotate password
+    .put(
+        "/rotate-password",
+        sValidator("json", rotatePasswordSchema),
+        async (c) => {
+            const fctx = c.env.locals.fCtx;
+            const data = c.req.valid("json");
+
+            const res = await uc.rotatePassword(fctx, data.userId, data.password);
+            return c.json(
+                res.isOk()
+                    ? { data: res.value, error: null }
+                    : { data: null, error: res.error },
+                res.isOk() ? 200 : 400,
+            );
+        },
+    );