Update

Zaubrik · May 14, 2024 · 8db1dc5 · 8db1dc5
1 parent 673d88b
commit 8db1dc5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/functions/deps.ts b/functions/deps.ts
@@ -41,3 +41,6 @@ export {
   isUndefined,
   isUrl,
 } from "https://dev.zaubrik.com/[email protected]/type.js";
+export {
+  type AuthInput,
+} from "https://dev.zaubrik.com/[email protected]/server/response.ts";
diff --git a/functions/jwt.ts b/functions/jwt.ts
@@ -1,4 +1,5 @@
 import {
+  type AuthInput,
   create,
   decodeJwt,
   isObject,
@@ -86,6 +87,16 @@ 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/rpc.ts b/middlewares/rpc.ts
@@ -5,25 +5,15 @@ import {
   type Options,
   respond,
 } from "./deps.ts";
-import { verifyJwt } from "../functions/jwt.ts";
-
-function addVerifyFunctions(authInput: AuthInput) {
-  const verification = authInput.verification;
-  return {
-    ...authInput,
-    verification: typeof verification === "function"
-      ? verification
-      : verifyJwt(verification),
-  };
-}
+import { ensureVerifyFunction } from "../functions/jwt.ts";
 
 export function rpcRespond(
   methods: Methods,
   options: Options & { methodsUrl?: URL } = {},
   authInput?: AuthInput | AuthInput[],
 ) {
   const authInputArray = authInput
-    ? [authInput].flat().map(addVerifyFunctions)
+    ? [authInput].flat().map(ensureVerifyFunction)
     : undefined;
   return async <C extends Context>(ctx: C) => {
     const rpcMethods = options.methodsUrl