naystack 1.1.12-beta.8 → 1.1.13-beta.1

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

@@ -23,6 +23,7 @@ __export(token_exports, {
   generateAccessToken: () => generateAccessToken,
   generateRefreshToken: () => generateRefreshToken,
   getTokenizedResponse: () => getTokenizedResponse,
+  getUserIdFromAccessToken: () => getUserIdFromAccessToken,
   getUserIdFromRefreshToken: () => getUserIdFromRefreshToken,
   verifyUser: () => verifyUser
 });
@@ -71,6 +72,18 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
     }
   return null;
 }
+function getUserIdFromAccessToken(refreshToken) {
+  if (refreshToken && process.env.SIGNING_KEY)
+    try {
+      const decoded = (0, import_jsonwebtoken.verify)(refreshToken, process.env.SIGNING_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;
+}
 function verifyUser(user, password) {
   if (!user.password) return false;
   return (0, import_bcryptjs.compare)(password, user.password);
@@ -80,6 +93,7 @@ function verifyUser(user, password) {
   generateAccessToken,
   generateRefreshToken,
   getTokenizedResponse,
+  getUserIdFromAccessToken,
   getUserIdFromRefreshToken,
   verifyUser
 });

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

@@ -8,6 +8,7 @@ declare function getTokenizedResponse(accessToken?: string, refreshToken?: strin
     refreshToken: string | undefined;
 }>;
 declare function getUserIdFromRefreshToken(refreshKey: string, refreshToken?: string): number | null;
+declare function getUserIdFromAccessToken(refreshToken?: string): number | null;
 declare function verifyUser(user: UserOutput, password: string): false | Promise<boolean>;
 
-export { generateAccessToken, generateRefreshToken, getTokenizedResponse, getUserIdFromRefreshToken, verifyUser };
+export { generateAccessToken, generateRefreshToken, getTokenizedResponse, getUserIdFromAccessToken, getUserIdFromRefreshToken, verifyUser };

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

@@ -8,6 +8,7 @@ declare function getTokenizedResponse(accessToken?: string, refreshToken?: strin
     refreshToken: string | undefined;
 }>;
 declare function getUserIdFromRefreshToken(refreshKey: string, refreshToken?: string): number | null;
+declare function getUserIdFromAccessToken(refreshToken?: string): number | null;
 declare function verifyUser(user: UserOutput, password: string): false | Promise<boolean>;
 
-export { generateAccessToken, generateRefreshToken, getTokenizedResponse, getUserIdFromRefreshToken, verifyUser };
+export { generateAccessToken, generateRefreshToken, getTokenizedResponse, getUserIdFromAccessToken, getUserIdFromRefreshToken, verifyUser };

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

@@ -43,6 +43,18 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
     }
   return null;
 }
+function getUserIdFromAccessToken(refreshToken) {
+  if (refreshToken && process.env.SIGNING_KEY)
+    try {
+      const decoded = verify(refreshToken, process.env.SIGNING_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;
+}
 function verifyUser(user, password) {
   if (!user.password) return false;
   return compare(password, user.password);
@@ -51,6 +63,7 @@ export {
   generateAccessToken,
   generateRefreshToken,
   getTokenizedResponse,
+  getUserIdFromAccessToken,
   getUserIdFromRefreshToken,
   verifyUser
 };

package/dist/auth/google/get.cjs.js

@@ -0,0 +1,112 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/auth/google/get.ts
+var get_exports = {};
+__export(get_exports, {
+  getGoogleGetRoute: () => getGoogleGetRoute
+});
+module.exports = __toCommonJS(get_exports);
+var import_googleapis = require("googleapis");
+var import_server2 = require("next/server");
+var import_uuid = require("uuid");
+
+// src/auth/email/token.ts
+var import_bcryptjs = require("bcryptjs");
+var import_jsonwebtoken = require("jsonwebtoken");
+var import_server = require("next/server");
+function generateRefreshToken(id, refreshKey) {
+  return (0, import_jsonwebtoken.sign)({ id }, refreshKey);
+}
+
+// src/auth/google/get.ts
+var getGoogleGetRoute = ({
+  getUserIdFromEmail,
+  successRedirectURL,
+  errorRedirectURL,
+  authRoute,
+  clientId,
+  clientSecret,
+  refreshKey
+}) => {
+  const oauth2Client = new import_googleapis.google.auth.OAuth2(
+    clientId,
+    clientSecret,
+    authRoute
+  );
+  return async (req) => {
+    const code = req.nextUrl.searchParams.get("code");
+    const error = req.nextUrl.searchParams.get("error");
+    if (!code && !error) {
+      const state2 = (0, import_uuid.v4)();
+      const authorizationUrl = oauth2Client.generateAuthUrl({
+        scope: [
+          "https://www.googleapis.com/auth/userinfo.profile",
+          "https://www.googleapis.com/auth/userinfo.email"
+        ],
+        state: state2,
+        include_granted_scopes: true,
+        prompt: "consent",
+        redirect_uri: authRoute
+      });
+      const res = import_server2.NextResponse.redirect(authorizationUrl);
+      res.cookies.set("state", state2, {
+        httpOnly: true,
+        secure: true
+      });
+      return res;
+    }
+    if (error) {
+      return import_server2.NextResponse.redirect(errorRedirectURL);
+    }
+    const state = req.nextUrl.searchParams.get("state") || void 0;
+    if (code && state) {
+      const localState = req.cookies.get("state")?.value;
+      if (localState !== state) return import_server2.NextResponse.redirect(errorRedirectURL);
+      const { tokens } = await oauth2Client.getToken(code);
+      oauth2Client.setCredentials(tokens);
+      const userInfoRequest = await import_googleapis.google.oauth2({
+        auth: oauth2Client,
+        version: "v2"
+      }).userinfo.get();
+      const user = userInfoRequest.data;
+      if (user.email) {
+        const id = await getUserIdFromEmail(user);
+        const res = import_server2.NextResponse.redirect(successRedirectURL);
+        if (id) {
+          res.cookies.set("refresh", generateRefreshToken(id, refreshKey), {
+            httpOnly: true,
+            secure: true
+          });
+        }
+        res.cookies.set("state", "", {
+          httpOnly: true,
+          secure: true,
+          maxAge: 0
+        });
+        return res;
+      }
+    }
+    return import_server2.NextResponse.redirect(errorRedirectURL);
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getGoogleGetRoute
+});

package/dist/auth/google/get.d.mts

@@ -0,0 +1,7 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { InitGoogleAuthOptions } from './index.mjs';
+import 'googleapis';
+
+declare const getGoogleGetRoute: ({ getUserIdFromEmail, successRedirectURL, errorRedirectURL, authRoute, clientId, clientSecret, refreshKey, }: InitGoogleAuthOptions) => (req: NextRequest) => Promise<NextResponse<unknown>>;
+
+export { getGoogleGetRoute };

package/dist/auth/google/get.d.ts

@@ -0,0 +1,7 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { InitGoogleAuthOptions } from './index.js';
+import 'googleapis';
+
+declare const getGoogleGetRoute: ({ getUserIdFromEmail, successRedirectURL, errorRedirectURL, authRoute, clientId, clientSecret, refreshKey, }: InitGoogleAuthOptions) => (req: NextRequest) => Promise<NextResponse<unknown>>;
+
+export { getGoogleGetRoute };

package/dist/auth/google/get.esm.js

@@ -0,0 +1,87 @@
+// src/auth/google/get.ts
+import { google } from "googleapis";
+import { NextResponse as NextResponse2 } from "next/server";
+import { v4 } from "uuid";
+
+// src/auth/email/token.ts
+import { compare } from "bcryptjs";
+import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
+import { NextResponse } from "next/server";
+function generateRefreshToken(id, refreshKey) {
+  return sign({ id }, refreshKey);
+}
+
+// src/auth/google/get.ts
+var getGoogleGetRoute = ({
+  getUserIdFromEmail,
+  successRedirectURL,
+  errorRedirectURL,
+  authRoute,
+  clientId,
+  clientSecret,
+  refreshKey
+}) => {
+  const oauth2Client = new google.auth.OAuth2(
+    clientId,
+    clientSecret,
+    authRoute
+  );
+  return async (req) => {
+    const code = req.nextUrl.searchParams.get("code");
+    const error = req.nextUrl.searchParams.get("error");
+    if (!code && !error) {
+      const state2 = v4();
+      const authorizationUrl = oauth2Client.generateAuthUrl({
+        scope: [
+          "https://www.googleapis.com/auth/userinfo.profile",
+          "https://www.googleapis.com/auth/userinfo.email"
+        ],
+        state: state2,
+        include_granted_scopes: true,
+        prompt: "consent",
+        redirect_uri: authRoute
+      });
+      const res = NextResponse2.redirect(authorizationUrl);
+      res.cookies.set("state", state2, {
+        httpOnly: true,
+        secure: true
+      });
+      return res;
+    }
+    if (error) {
+      return NextResponse2.redirect(errorRedirectURL);
+    }
+    const state = req.nextUrl.searchParams.get("state") || void 0;
+    if (code && state) {
+      const localState = req.cookies.get("state")?.value;
+      if (localState !== state) return NextResponse2.redirect(errorRedirectURL);
+      const { tokens } = await oauth2Client.getToken(code);
+      oauth2Client.setCredentials(tokens);
+      const userInfoRequest = await google.oauth2({
+        auth: oauth2Client,
+        version: "v2"
+      }).userinfo.get();
+      const user = userInfoRequest.data;
+      if (user.email) {
+        const id = await getUserIdFromEmail(user);
+        const res = NextResponse2.redirect(successRedirectURL);
+        if (id) {
+          res.cookies.set("refresh", generateRefreshToken(id, refreshKey), {
+            httpOnly: true,
+            secure: true
+          });
+        }
+        res.cookies.set("state", "", {
+          httpOnly: true,
+          secure: true,
+          maxAge: 0
+        });
+        return res;
+      }
+    }
+    return NextResponse2.redirect(errorRedirectURL);
+  };
+};
+export {
+  getGoogleGetRoute
+};

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

@@ -23,7 +23,97 @@ __export(google_exports, {
   initGoogleAuth: () => initGoogleAuth
 });
 module.exports = __toCommonJS(google_exports);
-function initGoogleAuth() {
+
+// src/auth/google/get.ts
+var import_googleapis = require("googleapis");
+var import_server2 = require("next/server");
+var import_uuid = require("uuid");
+
+// src/auth/email/token.ts
+var import_bcryptjs = require("bcryptjs");
+var import_jsonwebtoken = require("jsonwebtoken");
+var import_server = require("next/server");
+function generateRefreshToken(id, refreshKey) {
+  return (0, import_jsonwebtoken.sign)({ id }, refreshKey);
+}
+
+// src/auth/google/get.ts
+var getGoogleGetRoute = ({
+  getUserIdFromEmail,
+  successRedirectURL,
+  errorRedirectURL,
+  authRoute,
+  clientId,
+  clientSecret,
+  refreshKey
+}) => {
+  const oauth2Client = new import_googleapis.google.auth.OAuth2(
+    clientId,
+    clientSecret,
+    authRoute
+  );
+  return async (req) => {
+    const code = req.nextUrl.searchParams.get("code");
+    const error = req.nextUrl.searchParams.get("error");
+    if (!code && !error) {
+      const state2 = (0, import_uuid.v4)();
+      const authorizationUrl = oauth2Client.generateAuthUrl({
+        scope: [
+          "https://www.googleapis.com/auth/userinfo.profile",
+          "https://www.googleapis.com/auth/userinfo.email"
+        ],
+        state: state2,
+        include_granted_scopes: true,
+        prompt: "consent",
+        redirect_uri: authRoute
+      });
+      const res = import_server2.NextResponse.redirect(authorizationUrl);
+      res.cookies.set("state", state2, {
+        httpOnly: true,
+        secure: true
+      });
+      return res;
+    }
+    if (error) {
+      return import_server2.NextResponse.redirect(errorRedirectURL);
+    }
+    const state = req.nextUrl.searchParams.get("state") || void 0;
+    if (code && state) {
+      const localState = req.cookies.get("state")?.value;
+      if (localState !== state) return import_server2.NextResponse.redirect(errorRedirectURL);
+      const { tokens } = await oauth2Client.getToken(code);
+      oauth2Client.setCredentials(tokens);
+      const userInfoRequest = await import_googleapis.google.oauth2({
+        auth: oauth2Client,
+        version: "v2"
+      }).userinfo.get();
+      const user = userInfoRequest.data;
+      if (user.email) {
+        const id = await getUserIdFromEmail(user);
+        const res = import_server2.NextResponse.redirect(successRedirectURL);
+        if (id) {
+          res.cookies.set("refresh", generateRefreshToken(id, refreshKey), {
+            httpOnly: true,
+            secure: true
+          });
+        }
+        res.cookies.set("state", "", {
+          httpOnly: true,
+          secure: true,
+          maxAge: 0
+        });
+        return res;
+      }
+    }
+    return import_server2.NextResponse.redirect(errorRedirectURL);
+  };
+};
+
+// src/auth/google/index.ts
+function initGoogleAuth(props) {
+  return {
+    GET: getGoogleGetRoute(props)
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1,3 +1,18 @@
-declare function initGoogleAuth(): void;
+import * as next_server from 'next/server';
+import { oauth2_v2 } from 'googleapis';
 
-export { initGoogleAuth };
+type Schema$Userinfo = oauth2_v2.Schema$Userinfo;
+interface InitGoogleAuthOptions {
+    getUserIdFromEmail: (email: Schema$Userinfo) => Promise<number | null>;
+    successRedirectURL: string;
+    errorRedirectURL: string;
+    authRoute: string;
+    clientId: string;
+    clientSecret: string;
+    refreshKey: string;
+}
+declare function initGoogleAuth(props: InitGoogleAuthOptions): {
+    GET: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown>>;
+};
+
+export { type InitGoogleAuthOptions, initGoogleAuth };

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

@@ -1,3 +1,18 @@
-declare function initGoogleAuth(): void;
+import * as next_server from 'next/server';
+import { oauth2_v2 } from 'googleapis';
 
-export { initGoogleAuth };
+type Schema$Userinfo = oauth2_v2.Schema$Userinfo;
+interface InitGoogleAuthOptions {
+    getUserIdFromEmail: (email: Schema$Userinfo) => Promise<number | null>;
+    successRedirectURL: string;
+    errorRedirectURL: string;
+    authRoute: string;
+    clientId: string;
+    clientSecret: string;
+    refreshKey: string;
+}
+declare function initGoogleAuth(props: InitGoogleAuthOptions): {
+    GET: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown>>;
+};
+
+export { type InitGoogleAuthOptions, initGoogleAuth };

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

@@ -1,5 +1,93 @@
+// src/auth/google/get.ts
+import { google } from "googleapis";
+import { NextResponse as NextResponse2 } from "next/server";
+import { v4 } from "uuid";
+
+// src/auth/email/token.ts
+import { compare } from "bcryptjs";
+import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
+import { NextResponse } from "next/server";
+function generateRefreshToken(id, refreshKey) {
+  return sign({ id }, refreshKey);
+}
+
+// src/auth/google/get.ts
+var getGoogleGetRoute = ({
+  getUserIdFromEmail,
+  successRedirectURL,
+  errorRedirectURL,
+  authRoute,
+  clientId,
+  clientSecret,
+  refreshKey
+}) => {
+  const oauth2Client = new google.auth.OAuth2(
+    clientId,
+    clientSecret,
+    authRoute
+  );
+  return async (req) => {
+    const code = req.nextUrl.searchParams.get("code");
+    const error = req.nextUrl.searchParams.get("error");
+    if (!code && !error) {
+      const state2 = v4();
+      const authorizationUrl = oauth2Client.generateAuthUrl({
+        scope: [
+          "https://www.googleapis.com/auth/userinfo.profile",
+          "https://www.googleapis.com/auth/userinfo.email"
+        ],
+        state: state2,
+        include_granted_scopes: true,
+        prompt: "consent",
+        redirect_uri: authRoute
+      });
+      const res = NextResponse2.redirect(authorizationUrl);
+      res.cookies.set("state", state2, {
+        httpOnly: true,
+        secure: true
+      });
+      return res;
+    }
+    if (error) {
+      return NextResponse2.redirect(errorRedirectURL);
+    }
+    const state = req.nextUrl.searchParams.get("state") || void 0;
+    if (code && state) {
+      const localState = req.cookies.get("state")?.value;
+      if (localState !== state) return NextResponse2.redirect(errorRedirectURL);
+      const { tokens } = await oauth2Client.getToken(code);
+      oauth2Client.setCredentials(tokens);
+      const userInfoRequest = await google.oauth2({
+        auth: oauth2Client,
+        version: "v2"
+      }).userinfo.get();
+      const user = userInfoRequest.data;
+      if (user.email) {
+        const id = await getUserIdFromEmail(user);
+        const res = NextResponse2.redirect(successRedirectURL);
+        if (id) {
+          res.cookies.set("refresh", generateRefreshToken(id, refreshKey), {
+            httpOnly: true,
+            secure: true
+          });
+        }
+        res.cookies.set("state", "", {
+          httpOnly: true,
+          secure: true,
+          maxAge: 0
+        });
+        return res;
+      }
+    }
+    return NextResponse2.redirect(errorRedirectURL);
+  };
+};
+
 // src/auth/google/index.ts
-function initGoogleAuth() {
+function initGoogleAuth(props) {
+  return {
+    GET: getGoogleGetRoute(props)
+  };
 }
 export {
   initGoogleAuth