Revert "refactor: group auth related decorators (#8)" (#9)

This reverts commit b394fd2.

Author: peterpeterparker

src/context.ts

@@ -1,6 +1,6 @@
 import type { Context, RouteSchema } from 'elysia';
-import type { GitHubDecorator } from './decorators/auth/github';
-import type { JwtDecorator } from './decorators/auth/jwt';
+import type { GitHubDecorator } from './decorators/github';
+import type { JwtDecorator } from './decorators/jwt';
 
 export type ApiContext<Route extends RouteSchema = RouteSchema> = Context<Route> & {
 	github: GitHubDecorator;

src/decorators/auth/github.ts src/decorators/github.tssrc/decorators/auth/github.ts renamed to src/decorators/github.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
-import { GitHubApiError } from '../../errors';
-import { assertNonNullish } from '../../utils/assert';
+import { GitHubApiError } from '../errors';
+import { assertNonNullish } from '../utils/assert';
 
 const GitHubUserSchema = z.object({
 	id: z.number(),

src/decorators/auth/jwt.ts src/decorators/jwt.tssrc/decorators/auth/jwt.ts renamed to src/decorators/jwt.ts

@@ -7,7 +7,7 @@ import {
 	jwtVerify,
 	SignJWT
 } from 'jose';
-import { assertNonNullish } from '../../utils/assert';
+import { assertNonNullish } from '../utils/assert';
 
 const PRIVATE_KEY_PEM_PATH = process.env.JWT_PRIVATE_KEY_PATH;
 const PUBLIC_KEY_PEM_PATH = process.env.JWT_PUBLIC_KEY_PATH;

src/server.ts

@@ -2,8 +2,8 @@ import { cors } from '@elysiajs/cors';
 import { openapi } from '@elysiajs/openapi';
 import { Elysia } from 'elysia';
 import packageJson from '../package.json';
-import { GitHubDecorator } from './decorators/auth/github';
-import { JwtDecorator } from './decorators/auth/jwt';
+import { GitHubDecorator } from './decorators/github';
+import { JwtDecorator } from './decorators/jwt';
 import { GitHubApiError, GitHubAuthUnauthorizedError, NullishError } from './errors';
 import {
 	GitHubAuthFinalizeSchema,

test/decorators/auth/github.test.ts test/decorators/github.test.tstest/decorators/auth/github.test.ts renamed to test/decorators/github.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, mock, spyOn } from 'bun:test';
-import { GitHubDecorator } from '../../../src/decorators/auth/github';
-import { GitHubApiError } from '../../../src/errors';
+import { GitHubDecorator } from '../../src/decorators/github';
+import { GitHubApiError } from '../../src/errors';
 
 describe('decorators > github', () => {
 	let github: GitHubDecorator;

test/decorators/auth/jwt.test.ts test/decorators/jwt.test.tstest/decorators/auth/jwt.test.ts renamed to test/decorators/jwt.test.ts

@@ -1,5 +1,5 @@
 import { beforeAll, describe, expect, it } from 'bun:test';
-import { JwtDecorator } from '../../../src/decorators/auth/jwt';
+import { JwtDecorator } from '../../src/decorators/jwt';
 
 describe('decorators > jwt', () => {
 	let jwt: JwtDecorator;

test/handlers/auth/github.ts

@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, it, mock } from 'bun:test';
 import type { ApiContext } from '../../../src/context';
-import { JwtDecorator } from '../../../src/decorators/auth/jwt';
+import { JwtDecorator } from '../../../src/decorators/jwt';
 import { githubAuthInit } from '../../../src/handlers/auth/github';
 
 describe('handlers > auth > github', () => {

test/handlers/auth/jwks.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'bun:test';
 import type { ApiContext } from '../../../src/context';
-import { JwtDecorator } from '../../../src/decorators/auth/jwt';
+import { JwtDecorator } from '../../../src/decorators/jwt';
 import { authJwks } from '../../../src/handlers/auth/jwks';
 
 describe('handlers > auth > jwks', () => {

test/server.test.ts

@@ -33,7 +33,7 @@ describe('server', () => {
 			expect(data.state).toBeString();
 
 			// Verify the state JWT is valid
-			const { JwtDecorator } = await import('../src/decorators/auth/jwt');
+			const { JwtDecorator } = await import('../src/decorators/jwt');
 			const jwt = new JwtDecorator();
 			const verified = await jwt.verify(data.state);
 			expect(verified.valid).toBe(true);
@@ -82,7 +82,7 @@ describe('server', () => {
 			}) as typeof fetch);
 
 			// Create valid state token
-			const { JwtDecorator } = await import('../src/decorators/auth/jwt');
+			const { JwtDecorator } = await import('../src/decorators/jwt');
 			const jwt = new JwtDecorator();
 			const stateToken = await jwt.signOAuthJwt({
 				payload: {
@@ -144,7 +144,7 @@ describe('server', () => {
 		});
 
 		it('should return 401 on state mismatch', async () => {
-			const { JwtDecorator } = await import('../src/decorators/auth/jwt');
+			const { JwtDecorator } = await import('../src/decorators/jwt');
 			const jwt = new JwtDecorator();
 			const stateToken = await jwt.signOAuthJwt({
 				payload: { provider: 'github', token: 'a'.repeat(64), nonce: 'nonce' }