Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-12 15:53:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor sessions

Browse Source
This commit is contained in:
David Nguyen
2025-02-16 00:44:01 +11:00
parent 8d5fafec27
commit 1ed1cb0773
21 changed files with 261 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/auth/server/routes/callback.ts
View File

@ -4,10 +4,6 @@ import { GoogleAuthOptions, OidcAuthOptions } from '../config';
import { handleOAuthCallbackUrl } from '../lib/utils/handle-oauth-callback-url';
import type { HonoAuthContext } from '../types/context';
// Todo: Test
// api/auth/callback/google?
// api/auth/callback/oidc
/**
* Have to create this route instead of bundling callback with oauth routes to provide
* backwards compatibility for self-hosters (since we used to use NextAuth).
@ -20,7 +16,5 @@ export const callbackRoute = new Hono<HonoAuthContext>()
/**
* Google callback verification.
*
* Todo: Double check this is the correct callback.
*/
.get('/google', async (c) => handleOAuthCallbackUrl({ c, clientOptions: GoogleAuthOptions }));

14
packages/auth/server/routes/email-password.ts
View File

@ -27,7 +27,7 @@ import { UserSecurityAuditLogType } from '@documenso/prisma/client';
import { AuthenticationErrorCode } from '../lib/errors/error-codes';
import { getCsrfCookie } from '../lib/session/session-cookies';
import { onAuthorize } from '../lib/utils/authorizer';
import { getRequiredSession, getSession } from '../lib/utils/get-session';
import { getSession } from '../lib/utils/get-session';
import type { HonoAuthContext } from '../types/context';
import {
ZForgotPasswordSchema,
@ -176,10 +176,6 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
const session = await getSession(c);
if (!session.isAuthenticated) {
throw new AppError(AuthenticationErrorCode.Unauthorized);
}
await updatePassword({
userId: session.user.id,
password,
@ -251,7 +247,7 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
* Setup two factor authentication.
*/
.post('/2fa/setup', async (c) => {
const { user } = await getRequiredSession(c);
const { user } = await getSession(c);
const result = await setupTwoFactorAuthentication({
user,
@ -277,7 +273,7 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
async (c) => {
const requestMetadata = c.get('requestMetadata');
const { user: sessionUser } = await getRequiredSession(c);
const { user: sessionUser } = await getSession(c);
const user = await prisma.user.findFirst({
where: {
@ -324,7 +320,7 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
async (c) => {
const requestMetadata = c.get('requestMetadata');
const { user: sessionUser } = await getRequiredSession(c);
const { user: sessionUser } = await getSession(c);
const user = await prisma.user.findFirst({
where: {
@ -367,7 +363,7 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
}),
),
async (c) => {
const { user: sessionUser } = await getRequiredSession(c);
const { user: sessionUser } = await getSession(c);
const user = await prisma.user.findFirst({
where: {

25
packages/auth/server/routes/passkey.ts
View File

@ -119,28 +119,3 @@ export const passkeyRoute = new Hono<HonoAuthContext>()
200,
);
});
// Todo
// .post('/register', async (c) => {
// const { user } = await getRequiredSession(c);
// //
// })
// .post(
// '/pre-authenticate',
// sValidator(
// 'json',
// z.object({
// code: z.string(),
// }),
// ),
// async (c) => {
// //
// return c.json({
// success: true,
// recoveryCodes: result.recoveryCodes,
// });
// },
// );

4
packages/auth/server/routes/session.ts
View File

@ -1,10 +1,10 @@
import { Hono } from 'hono';
import type { SessionValidationResult } from '../lib/session/session';
import { getSession } from '../lib/utils/get-session';
import { getOptionalSession } from '../lib/utils/get-session';
export const sessionRoute = new Hono().get('/session', async (c) => {
const session: SessionValidationResult = await getSession(c);
const session: SessionValidationResult = await getOptionalSession(c);
return c.json(session);
});

10
packages/auth/server/routes/two-factor.ts
View File

@ -9,7 +9,7 @@ import { viewBackupCodes } from '@documenso/lib/server-only/2fa/view-backup-code
import { prisma } from '@documenso/prisma';
import { AuthenticationErrorCode } from '../lib/errors/error-codes';
import { getRequiredSession } from '../lib/utils/get-session';
import { getSession } from '../lib/utils/get-session';
import type { HonoAuthContext } from '../types/context';
import {
ZDisableTwoFactorRequestSchema,
@ -22,7 +22,7 @@ export const twoFactorRoute = new Hono<HonoAuthContext>()
* Setup two factor authentication.
*/
.post('/setup', async (c) => {
const { user } = await getRequiredSession(c);
const { user } = await getSession(c);
const result = await setupTwoFactorAuthentication({
user,
@ -41,7 +41,7 @@ export const twoFactorRoute = new Hono<HonoAuthContext>()
.post('/enable', sValidator('json', ZEnableTwoFactorRequestSchema), async (c) => {
const requestMetadata = c.get('requestMetadata');
const { user: sessionUser } = await getRequiredSession(c);
const { user: sessionUser } = await getSession(c);
const user = await prisma.user.findFirst({
where: {
@ -79,7 +79,7 @@ export const twoFactorRoute = new Hono<HonoAuthContext>()
.post('/disable', sValidator('json', ZDisableTwoFactorRequestSchema), async (c) => {
const requestMetadata = c.get('requestMetadata');
const { user: sessionUser } = await getRequiredSession(c);
const { user: sessionUser } = await getSession(c);
const user = await prisma.user.findFirst({
where: {
@ -117,7 +117,7 @@ export const twoFactorRoute = new Hono<HonoAuthContext>()
'/view-recovery-codes',
sValidator('json', ZViewTwoFactorRecoveryCodesRequestSchema),
async (c) => {
const { user: sessionUser } = await getRequiredSession(c);
const { user: sessionUser } = await getSession(c);
const user = await prisma.user.findFirst({
where: {