BREAKING: remove deprecated features (#217)

* BREAKING: remove deprecated features * fmt
boywithkeyboard-archive · Sep 4, 2023 · c833ae3 · c833ae3
1 parent c1aa32d
commit c833ae3
Show file tree

Hide file tree

Showing 25 changed files with 53 additions and 1,412 deletions.
diff --git a/build.ts b/build.ts
diff --git a/cheetah.ts b/cheetah.ts
@@ -2,7 +2,6 @@
 import { base, Method } from './base.ts'
 import { Collection } from './collection.ts'
 import { Context, Exception } from './context.ts'
-import { Exception as OriginalException } from './exception.ts'
 import { Extension, validExtension } from './extensions.ts'
 import {
   Handler,
@@ -514,7 +513,7 @@ export class cheetah extends base<cheetah>() {
     } catch (err) {
       let res: Response
 
-      if (err instanceof Exception || err instanceof OriginalException) {
+      if (err instanceof Exception) {
         res = err.response(req)
       } else {
         if (this.#debug) {

diff --git a/exception.ts b/exception.ts
diff --git a/extensions.ts b/extensions.ts
@@ -39,8 +39,6 @@ export type Extension<
               cookies?: ValidatedCookies
               headers?: ValidatedHeaders
               query?: ValidatedQuery
-              /** @deprecated please pass this option to the `c.req.body()` method! */
-              transform?: boolean // TODO remove at v2.0
               cors?: string
             }
             | Handler<
@@ -76,8 +74,6 @@ export type Extension<
               cookies?: ValidatedCookies
               headers?: ValidatedHeaders
               query?: ValidatedQuery
-              /** @deprecated please pass this option to the `c.req.body()` method! */
-              transform?: boolean // TODO remove at v2.0
               cors?: string
             }
             | Handler<

diff --git a/handler.ts b/handler.ts
@@ -87,8 +87,6 @@ export function handler<T>() {
         cookies?: ValidatedCookies
         headers?: ValidatedHeaders
         query?: ValidatedQuery
-        /** @deprecated please pass this option to the `c.req.body()` method! */
-        transform?: boolean // TODO remove at v2.0
         cors?: string
         params?: Partial<Record<keyof ExtractParams<Pathname>, ZodType>>
         gateway?: VersionRange
@@ -162,8 +160,6 @@ export type HandlerOrSchema =
     cookies?: ObjectType
     headers?: ObjectType
     query?: ObjectType
-    /** @deprecated please pass this option to the `c.req.body()` method! */
-    transform?: boolean // TODO remove at v2.0
     cors?: string
     params?: Record<string, ZodType>
     gateway?: VersionRange

diff --git a/mod.ts b/mod.ts
@@ -4,7 +4,6 @@ export type { AppConfig, AppContext } from './cheetah.ts'
 export { Collection } from './collection.ts'
 export { Context } from './context.ts'
 export { decrypt, encrypt } from './crypto.ts'
-export { Exception } from './exception.ts'
 export { createExtension } from './extensions.ts'
 export type { Extension } from './extensions.ts'
 export { default as jwt } from './jwt.ts'

diff --git a/oauth/get_session_data.ts b/oauth/get_session_data.ts
@@ -1,8 +1,7 @@
 // Copyright 2023 Samuel Kopp. All rights reserved. Apache-2.0 license.
 import { getCookies } from 'https://deno.land/std@0.200.0/http/cookie.ts'
 import { Context } from '../context.ts'
-import { getVariable } from '../x/env.ts'
-import { verify } from '../x/jwt.ts'
+import { verify } from '../jwt.ts'
 import { OAuthSessionData, OAuthSessionToken } from './types.ts'
 
 /**
@@ -25,9 +24,8 @@ export async function getSessionData(
   }
 
   const payload = await verify<OAuthSessionToken>(
+    c,
     cookies.token,
-    getVariable(c, 'JWT_SECRET') ?? getVariable(c, 'jwt_secret') ??
-      getVariable(c, 'jwtSecret'),
     { audience: 'oauth:session' },
   )
 

diff --git a/oauth/get_session_id.ts b/oauth/get_session_id.ts
@@ -1,8 +1,7 @@
 // Copyright 2023 Samuel Kopp. All rights reserved. Apache-2.0 license.
 import { getCookies } from 'https://deno.land/std@0.200.0/http/cookie.ts'
 import { Context } from '../context.ts'
-import { getVariable } from '../x/env.ts'
-import { verify } from '../x/jwt.ts'
+import { verify } from '../jwt.ts'
 import { OAuthSessionToken } from './types.ts'
 
 /**
@@ -23,9 +22,8 @@ export async function getSessionId(c: Context): Promise<string | undefined> {
   }
 
   const payload = await verify<OAuthSessionToken>(
+    c,
     cookies.token,
-    getVariable(c, 'JWT_SECRET') ?? getVariable(c, 'jwt_secret') ??
-      getVariable(c, 'jwtSecret'),
     { audience: 'oauth:session' },
   )
 

diff --git a/oauth/get_session_token.ts b/oauth/get_session_token.ts
@@ -1,8 +1,7 @@
 // Copyright 2023 Samuel Kopp. All rights reserved. Apache-2.0 license.
 import { getCookies } from 'https://deno.land/std@0.200.0/http/cookie.ts'
 import { Context } from '../context.ts'
-import { getVariable } from '../x/env.ts'
-import { verify } from '../x/jwt.ts'
+import { verify } from '../jwt.ts'
 
 /**
  * Get the session token without verifying the session.
@@ -19,8 +18,8 @@ export async function getSessionToken(c: Context) {
 
   const payload = await verify(
     cookies.token,
-    getVariable(c, 'JWT_SECRET') ?? getVariable(c, 'jwt_secret') ??
-      getVariable(c, 'jwtSecret'),
+    (c.env('JWT_SECRET') ?? c.env('jwt_secret') ??
+      c.env('jwtSecret')) as string,
     { audience: 'oauth:session' },
   )