fixing a further typing bug where pages and app router types are returns as optional rather than static

Author: jowo-io

examples/app-router/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "next-auth-pubkey",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "type": "module",
   "description": "A light-weight Lightning and Nostr auth provider for your Next.js app that's entirely self-hosted and plugs seamlessly into the next-auth framework.",
   "license": "ISC",

examples/drizzle/package-lock.json

@@ -3,7 +3,7 @@ import { OAuthConfig } from "next-auth/providers/oauth";
 
 import { formatConfig, UserConfig } from "./config/index";
 import { NextRequest, NextResponse } from "next/server";
-import pubkeyHandler from "./utils/handlers";
+import getHandler, { appHandler, pagesHandler } from "./utils/handlers";
 
 const lightningLogo =
   "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjgyIiBoZWlnaHQ9IjI4MiIgdmlld0JveD0iMCAwIDI4MiAyODIiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiPgo8Y2lyY2xlIGN4PSIxNDAuOTgzIiBjeT0iMTQxLjAwMyIgcj0iMTQxIiBmaWxsPSIjN0IxQUY3Ii8+CjxwYXRoIGQ9Ik03OS43NjA5IDE0NC4wNDdMMTczLjc2MSA2My4wNDY2QzE3Ny44NTcgNjAuNDIzNSAxODEuNzYxIDYzLjA0NjYgMTc5LjI2MSA2Ny41NDY2TDE0OS4yNjEgMTI2LjU0N0gyMDIuNzYxQzIwMi43NjEgMTI2LjU0NyAyMTEuMjYxIDEyNi41NDcgMjAyLjc2MSAxMzMuNTQ3TDExMC4yNjEgMjE1LjA0N0MxMDMuNzYxIDIyMC41NDcgOTkuMjYxIDIxNy41NDcgMTAzLjc2MSAyMDkuMDQ3TDEzMi43NjEgMTUxLjU0N0g3OS43NjA5Qzc5Ljc2MDkgMTUxLjU0NyA3MS4yNjA5IDE1MS41NDcgNzkuNzYwOSAxNDQuMDQ3WiIgZmlsbD0id2hpdGUiLz4KPC9nPgo8ZGVmcz4KPGNsaXBQYXRoIGlkPSJjbGlwMCI+CjxyZWN0IHdpZHRoPSIyODIiIGhlaWdodD0iMjgyIiBmaWxsPSJ3aGl0ZSIvPgo8L2NsaXBQYXRoPgo8L2RlZnM+Cjwvc3ZnPgo=";
@@ -97,10 +97,10 @@ export default function NextAuthPubkey(userConfig: UserConfig) {
     lightningProvider,
     nostrProvider,
     handler: async (req: NextApiRequest, res: NextApiResponse) =>
-      pubkeyHandler({ type: "pages", req, res, config }),
+      pagesHandler(req, res, config, getHandler({ req, res, config })),
     GET: async (req: NextRequest) =>
-      pubkeyHandler({ type: "app", req, config }),
+      appHandler(req, config, getHandler({ req, config })),
     POST: async (req: NextRequest) =>
-      pubkeyHandler({ type: "app", req, config }),
+      appHandler(req, config, getHandler({ req, config })),
   };
 }

examples/kv/package-lock.json

@@ -249,63 +249,47 @@ export async function appHandler(
 }
 
 type Arguments = {
-  type: "pages" | "app";
   config: Config;
   req: NextApiRequest | NextRequest;
   res?: NextApiResponse;
 };
 
-export default async function pubkeyHandler(args: Arguments) {
-  const { type, req, res, config } = args;
+export default function getHandler(args: Arguments) {
+  const { req, res, config } = args;
 
   // get path from either pages or app router req/res objects
   const path = (res as any)?.params
     ? new URL((req as NextRequest).nextUrl).pathname
     : (req as any)?.url.replace(config.baseUrl, "");
 
-  console.log(path);
-
   let handler;
   if (path?.indexOf(config.apis.create) === 0) {
-    handler = createHandler;
+    return createHandler;
   } else if (path?.indexOf(config.apis.poll) === 0) {
-    handler = pollHandler;
+    return pollHandler;
   } else if (path?.indexOf(config.apis.callback) === 0) {
-    handler = callbackHandler;
+    return callbackHandler;
   } else if (path?.indexOf(config.apis.token) === 0) {
-    handler = tokenHandler;
+    return tokenHandler;
   } else if (path?.indexOf(config.apis.lightningSignIn) === 0) {
-    handler = lightningSignInHandler;
+    return lightningSignInHandler;
   } else if (path?.indexOf(config.apis.nostrSignIn) === 0) {
-    handler = nostrSignInHandler;
+    return nostrSignInHandler;
   } else if (path?.indexOf(config.apis.avatar) === 0) {
-    handler = avatarHandler;
+    return avatarHandler;
   } else if (path?.indexOf(config.apis.qr) === 0) {
-    handler = qrHandler;
+    return qrHandler;
   } else if (
     path?.indexOf(config.apis.diagnostics) === 0 &&
     config.flags.diagnostics
   ) {
-    handler = diagnosticsHandler;
+    return diagnosticsHandler;
   }
 
-  if (!handler) {
-    handler = async function ({}: HandlerArguments): Promise<HandlerReturn> {
-      return {
-        error: "NotFound",
-        status: 404,
-      };
+  return async function ({}: HandlerArguments): Promise<HandlerReturn> {
+    return {
+      error: "NotFound",
+      status: 404,
     };
-  }
-
-  if (type === "pages") {
-    return await pagesHandler(
-      req as NextApiRequest,
-      res as NextApiResponse,
-      config,
-      handler
-    );
-  } else {
-    return await appHandler(req as NextRequest, config, handler);
-  }
+  };
 }