Update

Zaubrik · May 14, 2024 · 7b45726 · 7b45726
1 parent 8db1dc5
commit 7b45726
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/functions/deps.ts b/functions/deps.ts
@@ -43,4 +43,4 @@ export {
 } from "https://dev.zaubrik.com/[email protected]/type.js";
 export {
   type AuthInput,
-} from "https://dev.zaubrik.com/[email protected].3/server/response.ts";
+} from "https://dev.zaubrik.com/[email protected].4/server/mod.ts";
diff --git a/functions/jwt.ts b/functions/jwt.ts
@@ -1,5 +1,4 @@
 import {
-  type AuthInput,
   create,
   decodeJwt,
   isObject,
@@ -87,16 +86,6 @@ export async function createJwt(
   }
 }
 
-export function ensureVerifyFunction(authInput: AuthInput) {
-  const verification = authInput.verification;
-  return {
-    ...authInput,
-    verification: typeof verification === "function"
-      ? verification
-      : verifyJwt(verification),
-  };
-}
-
 export function verifyJwt(input: CryptoKeyOrUpdateInput) {
   const cryptoKeyPromiseOrNull = isUpdateInput(input)
     ? fetchRsaCryptoKey(input.url, input.algorithm)

diff --git a/middlewares/deps.ts b/middlewares/deps.ts
@@ -47,10 +47,11 @@ export {
 } from "https://dev.zaubrik.com/[email protected]/mod.ts";
 export {
   type AuthInput,
+  ensureVerify,
   type Methods,
   type Options,
   respond,
-} from "https://dev.zaubrik.com/[email protected].3/server/response.ts";
+} from "https://dev.zaubrik.com/[email protected].4/server/response.ts";
 
 export {
   mergeUrl,

diff --git a/middlewares/rpc.ts b/middlewares/rpc.ts
@@ -1,19 +1,19 @@
 import {
   type AuthInput,
   type Context,
+  ensureVerify,
   type Methods,
   type Options,
   respond,
 } from "./deps.ts";
-import { ensureVerifyFunction } from "../functions/jwt.ts";
 
 export function rpcRespond(
   methods: Methods,
   options: Options & { methodsUrl?: URL } = {},
   authInput?: AuthInput | AuthInput[],
 ) {
   const authInputArray = authInput
-    ? [authInput].flat().map(ensureVerifyFunction)
+    ? [authInput].flat().map(ensureVerify)
     : undefined;
   return async <C extends Context>(ctx: C) => {
     const rpcMethods = options.methodsUrl