naystack 1.4.34 → 1.4.35

package/dist/auth/email/index.cjs.js

@@ -25,9 +25,6 @@ __export(email_exports, {
 });
 module.exports = __toCommonJS(email_exports);
 
-// src/auth/email/utils.ts
-var import_jsonwebtoken2 = require("jsonwebtoken");
-
 // src/auth/email/token.ts
 var import_bcryptjs = require("bcryptjs");
 var import_jsonwebtoken = require("jsonwebtoken");
@@ -141,6 +138,9 @@ async function checkAuthStatus(redirectUnauthorizedURL) {
   return isAuthorized;
 }
 
+// src/auth/email/utils.ts
+var import_jsonwebtoken2 = require("jsonwebtoken");
+
 // src/auth/utils/errors.ts
 var import_server2 = require("next/server");
 function handleError(status, message, onError) {
@@ -303,8 +303,7 @@ function getEmailAuthRoutes(options) {
     GET: getGetRoute(options),
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
-    DELETE: getDeleteRoute(options),
-    getContext
+    DELETE: getDeleteRoute(options)
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/auth/email/index.d.mts

@@ -1,22 +1,19 @@
 import * as next_server from 'next/server';
-import { NextRequest } from 'next/server';
-import { Context } from '../../graphql/types.mjs';
 import { InitRoutesOptions } from './types.mjs';
 export { checkAuthStatus } from './token.mjs';
 import '../types.mjs';
 
 declare function getEmailAuthRoutes(options: InitRoutesOptions): {
-    GET: (req: NextRequest) => Promise<next_server.NextResponse<{
+    GET: (req: next_server.NextRequest) => Promise<next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>>;
-    POST: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
-    PUT: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
-    DELETE: (req: NextRequest) => Promise<next_server.NextResponse<{
+    POST: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
+    PUT: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
+    DELETE: (req: next_server.NextRequest) => Promise<next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>>;
-    getContext: (req: NextRequest) => Context;
 };
 
 export { getEmailAuthRoutes };

package/dist/auth/email/index.d.ts

@@ -1,22 +1,19 @@
 import * as next_server from 'next/server';
-import { NextRequest } from 'next/server';
-import { Context } from '../../graphql/types.js';
 import { InitRoutesOptions } from './types.js';
 export { checkAuthStatus } from './token.js';
 import '../types.js';
 
 declare function getEmailAuthRoutes(options: InitRoutesOptions): {
-    GET: (req: NextRequest) => Promise<next_server.NextResponse<{
+    GET: (req: next_server.NextRequest) => Promise<next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>>;
-    POST: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
-    PUT: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
-    DELETE: (req: NextRequest) => Promise<next_server.NextResponse<{
+    POST: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
+    PUT: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
+    DELETE: (req: next_server.NextRequest) => Promise<next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>>;
-    getContext: (req: NextRequest) => Context;
 };
 
 export { getEmailAuthRoutes };

package/dist/auth/email/index.esm.js

@@ -1,6 +1,3 @@
-// src/auth/email/utils.ts
-import { verify as verify2 } from "jsonwebtoken";
-
 // src/auth/email/token.ts
 import { compare } from "bcryptjs";
 import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
@@ -114,6 +111,9 @@ async function checkAuthStatus(redirectUnauthorizedURL) {
   return isAuthorized;
 }
 
+// src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
+
 // src/auth/utils/errors.ts
 import { NextResponse as NextResponse2 } from "next/server";
 function handleError(status, message, onError) {
@@ -276,8 +276,7 @@ function getEmailAuthRoutes(options) {
     GET: getGetRoute(options),
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
-    DELETE: getDeleteRoute(options),
-    getContext
+    DELETE: getDeleteRoute(options)
   };
 }
 export {

package/dist/auth/index.cjs.js

@@ -28,9 +28,6 @@ __export(auth_exports, {
 });
 module.exports = __toCommonJS(auth_exports);
 
-// src/auth/email/utils.ts
-var import_jsonwebtoken2 = require("jsonwebtoken");
-
 // src/auth/email/token.ts
 var import_bcryptjs = require("bcryptjs");
 var import_jsonwebtoken = require("jsonwebtoken");
@@ -156,6 +153,9 @@ async function checkAuthStatus(redirectUnauthorizedURL) {
   return isAuthorized;
 }
 
+// src/auth/email/utils.ts
+var import_jsonwebtoken2 = require("jsonwebtoken");
+
 // src/auth/utils/errors.ts
 var import_server2 = require("next/server");
 function handleError(status, message, onError) {
@@ -318,8 +318,7 @@ function getEmailAuthRoutes(options) {
     GET: getGetRoute(options),
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
-    DELETE: getDeleteRoute(options),
-    getContext
+    DELETE: getDeleteRoute(options)
   };
 }
 

package/dist/auth/index.d.mts

@@ -4,7 +4,6 @@ export { initInstagramAuth } from './instagram/index.mjs';
 export { getRefreshToken } from './utils/token.mjs';
 export { checkAuthStatus } from './email/token.mjs';
 import 'next/server';
-import '../graphql/types.mjs';
 import './email/types.mjs';
 import './types.mjs';
 import 'googleapis';

package/dist/auth/index.d.ts

@@ -4,7 +4,6 @@ export { initInstagramAuth } from './instagram/index.js';
 export { getRefreshToken } from './utils/token.js';
 export { checkAuthStatus } from './email/token.js';
 import 'next/server';
-import '../graphql/types.js';
 import './email/types.js';
 import './types.js';
 import 'googleapis';

package/dist/auth/index.esm.js

@@ -1,6 +1,3 @@
-// src/auth/email/utils.ts
-import { verify as verify2 } from "jsonwebtoken";
-
 // src/auth/email/token.ts
 import { compare } from "bcryptjs";
 import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
@@ -126,6 +123,9 @@ async function checkAuthStatus(redirectUnauthorizedURL) {
   return isAuthorized;
 }
 
+// src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
+
 // src/auth/utils/errors.ts
 import { NextResponse as NextResponse2 } from "next/server";
 function handleError(status, message, onError) {
@@ -288,8 +288,7 @@ function getEmailAuthRoutes(options) {
     GET: getGetRoute(options),
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
-    DELETE: getDeleteRoute(options),
-    getContext
+    DELETE: getDeleteRoute(options)
   };
 }
 

package/dist/graphql/index.cjs.js

@@ -571,7 +571,7 @@ function GQLError(status, message) {
 
 // src/graphql/init.ts
 var import_reflect_metadata = require("reflect-metadata");
-var import_server = require("@apollo/server");
+var import_server3 = require("@apollo/server");
 var import_default = require("@apollo/server/plugin/landingPage/default");
 var import_next = require("@as-integrations/next");
 var import_type_graphql = require("type-graphql");
@@ -625,19 +625,71 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
+// src/auth/email/utils.ts
+var import_jsonwebtoken2 = require("jsonwebtoken");
+
+// src/auth/email/token.ts
+var import_bcryptjs = require("bcryptjs");
+var import_jsonwebtoken = require("jsonwebtoken");
+var import_headers = require("next/headers");
+var import_navigation = require("next/navigation");
+var import_server = require("next/server");
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
+function getUserIdFromRefreshToken(refreshToken) {
+  if (refreshToken)
+    try {
+      const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
+      if (typeof decoded !== "string" && typeof decoded.id === "number")
+        return decoded.id;
+    } catch (e) {
+      if (!(e instanceof import_jsonwebtoken.JsonWebTokenError)) console.error(e, "errors");
+      return null;
+    }
+  return null;
+}
+
+// src/auth/utils/errors.ts
+var import_server2 = require("next/server");
+
+// src/auth/email/utils.ts
+var getContext = (req) => {
+  const bearer = req.headers.get("authorization");
+  if (!bearer) {
+    const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
+    const userId = getUserIdFromRefreshToken(refresh);
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = (0, import_jsonwebtoken2.verify)(token, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
+    if (typeof res === "string") {
+      return { userId: null };
+    }
+    return {
+      userId: res.id
+    };
+  } catch {
+  }
+  return { userId: null };
+};
+
 // src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
-  plugins,
-  getContext
+  plugins
 }) {
   const { typeDefs, resolvers: builtResolvers } = await (0, import_type_graphql.buildTypeDefsAndResolvers)({
     validate: true,
     authChecker: authChecker || (({ context }) => !!context.userId),
     resolvers
   });
-  const server = new import_server.ApolloServer({
+  const server = new import_server3.ApolloServer({
     typeDefs,
     resolvers: builtResolvers,
     plugins: [
@@ -666,30 +718,6 @@ async function initGraphQLServer({
 var import_headers2 = require("next/headers");
 var import_react = require("react");
 var import_type_graphql2 = require("type-graphql");
-
-// src/auth/constants.ts
-var REFRESH_COOKIE_NAME = "refresh";
-
-// src/auth/email/token.ts
-var import_bcryptjs = require("bcryptjs");
-var import_jsonwebtoken = require("jsonwebtoken");
-var import_headers = require("next/headers");
-var import_navigation = require("next/navigation");
-var import_server2 = require("next/server");
-function getUserIdFromRefreshToken(refreshToken) {
-  if (refreshToken)
-    try {
-      const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
-      if (typeof decoded !== "string" && typeof decoded.id === "number")
-        return decoded.id;
-    } catch (e) {
-      if (!(e instanceof import_jsonwebtoken.JsonWebTokenError)) console.error(e, "errors");
-      return null;
-    }
-  return null;
-}
-
-// src/graphql/utils.ts
 function query(fn, options) {
   return {
     ...options,

package/dist/graphql/index.esm.js

@@ -612,12 +612,64 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
+// src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
+
+// src/auth/email/token.ts
+import { compare } from "bcryptjs";
+import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
+import { cookies } from "next/headers";
+import { redirect } from "next/navigation";
+import { NextResponse } from "next/server";
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
+function getUserIdFromRefreshToken(refreshToken) {
+  if (refreshToken)
+    try {
+      const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
+      if (typeof decoded !== "string" && typeof decoded.id === "number")
+        return decoded.id;
+    } catch (e) {
+      if (!(e instanceof JsonWebTokenError)) console.error(e, "errors");
+      return null;
+    }
+  return null;
+}
+
+// src/auth/utils/errors.ts
+import { NextResponse as NextResponse2 } from "next/server";
+
+// src/auth/email/utils.ts
+var getContext = (req) => {
+  const bearer = req.headers.get("authorization");
+  if (!bearer) {
+    const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
+    const userId = getUserIdFromRefreshToken(refresh);
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = verify2(token, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
+    if (typeof res === "string") {
+      return { userId: null };
+    }
+    return {
+      userId: res.id
+    };
+  } catch {
+  }
+  return { userId: null };
+};
+
 // src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
-  plugins,
-  getContext
+  plugins
 }) {
   const { typeDefs, resolvers: builtResolvers } = await buildTypeDefsAndResolvers({
     validate: true,
@@ -662,30 +714,6 @@ import {
   Resolver,
   Root
 } from "type-graphql";
-
-// src/auth/constants.ts
-var REFRESH_COOKIE_NAME = "refresh";
-
-// src/auth/email/token.ts
-import { compare } from "bcryptjs";
-import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
-import { cookies } from "next/headers";
-import { redirect } from "next/navigation";
-import { NextResponse } from "next/server";
-function getUserIdFromRefreshToken(refreshToken) {
-  if (refreshToken)
-    try {
-      const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
-      if (typeof decoded !== "string" && typeof decoded.id === "number")
-        return decoded.id;
-    } catch (e) {
-      if (!(e instanceof JsonWebTokenError)) console.error(e, "errors");
-      return null;
-    }
-  return null;
-}
-
-// src/graphql/utils.ts
 function query(fn, options) {
   return {
     ...options,

package/dist/graphql/init.cjs.js

@@ -24,7 +24,7 @@ __export(init_exports, {
 });
 module.exports = __toCommonJS(init_exports);
 var import_reflect_metadata = require("reflect-metadata");
-var import_server = require("@apollo/server");
+var import_server3 = require("@apollo/server");
 var import_default = require("@apollo/server/plugin/landingPage/default");
 var import_next = require("@as-integrations/next");
 var import_type_graphql = require("type-graphql");
@@ -78,19 +78,71 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
+// src/auth/email/utils.ts
+var import_jsonwebtoken2 = require("jsonwebtoken");
+
+// src/auth/email/token.ts
+var import_bcryptjs = require("bcryptjs");
+var import_jsonwebtoken = require("jsonwebtoken");
+var import_headers = require("next/headers");
+var import_navigation = require("next/navigation");
+var import_server = require("next/server");
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
+function getUserIdFromRefreshToken(refreshToken) {
+  if (refreshToken)
+    try {
+      const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
+      if (typeof decoded !== "string" && typeof decoded.id === "number")
+        return decoded.id;
+    } catch (e) {
+      if (!(e instanceof import_jsonwebtoken.JsonWebTokenError)) console.error(e, "errors");
+      return null;
+    }
+  return null;
+}
+
+// src/auth/utils/errors.ts
+var import_server2 = require("next/server");
+
+// src/auth/email/utils.ts
+var getContext = (req) => {
+  const bearer = req.headers.get("authorization");
+  if (!bearer) {
+    const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
+    const userId = getUserIdFromRefreshToken(refresh);
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = (0, import_jsonwebtoken2.verify)(token, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
+    if (typeof res === "string") {
+      return { userId: null };
+    }
+    return {
+      userId: res.id
+    };
+  } catch {
+  }
+  return { userId: null };
+};
+
 // src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
-  plugins,
-  getContext
+  plugins
 }) {
   const { typeDefs, resolvers: builtResolvers } = await (0, import_type_graphql.buildTypeDefsAndResolvers)({
     validate: true,
     authChecker: authChecker || (({ context }) => !!context.userId),
     resolvers
   });
-  const server = new import_server.ApolloServer({
+  const server = new import_server3.ApolloServer({
     typeDefs,
     resolvers: builtResolvers,
     plugins: [

package/dist/graphql/init.d.mts

@@ -2,11 +2,10 @@ import { ApolloServerPlugin } from '@apollo/server';
 import { NextRequest } from 'next/server';
 import { AuthChecker, NonEmptyArray } from 'type-graphql';
 
-declare function initGraphQLServer({ authChecker, resolvers, plugins, getContext, }: {
+declare function initGraphQLServer({ authChecker, resolvers, plugins, }: {
     authChecker?: AuthChecker<any>;
     resolvers: NonEmptyArray<Function>;
     plugins?: ApolloServerPlugin[];
-    getContext?: (req: NextRequest) => Promise<any> | any;
 }): Promise<{
     GET: (request: NextRequest) => Promise<Response>;
     POST: (request: NextRequest) => Promise<Response>;

package/dist/graphql/init.d.ts

@@ -2,11 +2,10 @@ import { ApolloServerPlugin } from '@apollo/server';
 import { NextRequest } from 'next/server';
 import { AuthChecker, NonEmptyArray } from 'type-graphql';
 
-declare function initGraphQLServer({ authChecker, resolvers, plugins, getContext, }: {
+declare function initGraphQLServer({ authChecker, resolvers, plugins, }: {
     authChecker?: AuthChecker<any>;
     resolvers: NonEmptyArray<Function>;
     plugins?: ApolloServerPlugin[];
-    getContext?: (req: NextRequest) => Promise<any> | any;
 }): Promise<{
     GET: (request: NextRequest) => Promise<Response>;
     POST: (request: NextRequest) => Promise<Response>;

package/dist/graphql/init.esm.js

@@ -59,12 +59,64 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
+// src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
+
+// src/auth/email/token.ts
+import { compare } from "bcryptjs";
+import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
+import { cookies } from "next/headers";
+import { redirect } from "next/navigation";
+import { NextResponse } from "next/server";
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
+function getUserIdFromRefreshToken(refreshToken) {
+  if (refreshToken)
+    try {
+      const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
+      if (typeof decoded !== "string" && typeof decoded.id === "number")
+        return decoded.id;
+    } catch (e) {
+      if (!(e instanceof JsonWebTokenError)) console.error(e, "errors");
+      return null;
+    }
+  return null;
+}
+
+// src/auth/utils/errors.ts
+import { NextResponse as NextResponse2 } from "next/server";
+
+// src/auth/email/utils.ts
+var getContext = (req) => {
+  const bearer = req.headers.get("authorization");
+  if (!bearer) {
+    const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
+    const userId = getUserIdFromRefreshToken(refresh);
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = verify2(token, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
+    if (typeof res === "string") {
+      return { userId: null };
+    }
+    return {
+      userId: res.id
+    };
+  } catch {
+  }
+  return { userId: null };
+};
+
 // src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
-  plugins,
-  getContext
+  plugins
 }) {
   const { typeDefs, resolvers: builtResolvers } = await buildTypeDefsAndResolvers({
     validate: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naystack",
-  "version": "1.4.34",
+  "version": "1.4.35",
   "description": "A stack built with Next + GraphQL + S3 + Auth",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",