Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

finished access token creation feature

daniel31x1305563134b4b7
diff --git a/components/ModalContent/NewKeyModal.tsx b/components/ModalContent/NewKeyModal.tsx
index e36f7249..e0585611 100644
--- a/components/ModalContent/NewKeyModal.tsx
+++ b/components/ModalContent/NewKeyModal.tsx
@@ -12,6 +12,8 @@ type Props = {
export default function NewKeyModal({ onClose }: Props) {
const { data } = useSession();
+ const [newToken, setNewToken] = useState("");
+
const initial = {
name: "",
expires: 0 as KeyExpiry,
@@ -43,7 +45,7 @@ export default function NewKeyModal({ onClose }: Props) {
if (response.ok) {
toast.success(`Created!`);
- onClose();
+ setNewToken(data.response);
} else toast.error(data.response as string);
setSubmitLoader(false);
@@ -54,146 +56,173 @@ export default function NewKeyModal({ onClose }: Props) {
return (
<Modal toggleModal={onClose}>
- <p className="text-xl font-thin">Create an Access Token</p>
-
- <div className="divider mb-3 mt-1"></div>
-
- <div className="flex gap-2 items-center">
- <div className="w-full">
- <p className="mb-2">Name</p>
-
+ {newToken ? (
+ <div className="flex flex-col justify-center space-y-4">
+ <p className="text-xl font-thin">Access Token Created</p>
+ <p>
+ Your new token has been created. Please copy it and store it
+ somewhere safe. You will not be able to see it again.
+ </p>
<TextInput
- value={key.name}
- onChange={(e) => setKey({ ...key, name: e.target.value })}
- placeholder="e.g. For the Mobile App"
- className="bg-base-200"
+ spellCheck={false}
+ value={newToken}
+ onChange={() => {}}
+ className="w-full"
/>
+ <button
+ onClick={() => {
+ navigator.clipboard.writeText(newToken);
+ toast.success("Copied to clipboard!");
+ }}
+ className="btn btn-primary w-fit mx-auto"
+ >
+ Copy to Clipboard
+ </button>
</div>
+ ) : (
+ <>
+ <p className="text-xl font-thin">Create an Access Token</p>
+
+ <div className="divider mb-3 mt-1"></div>
+
+ <div className="flex gap-2 items-center">
+ <div className="w-full">
+ <p className="mb-2">Name</p>
+
+ <TextInput
+ value={key.name}
+ onChange={(e) => setKey({ ...key, name: e.target.value })}
+ placeholder="e.g. For the iOS shortcut"
+ className="bg-base-200"
+ />
+ </div>
- <div>
- <p className="mb-2">Date of Expiry</p>
+ <div>
+ <p className="mb-2">Expires in</p>
- <div className="dropdown dropdown-bottom dropdown-end">
- <div
- tabIndex={0}
- role="button"
- className="btn btn-outline w-36 flex items-center btn-sm h-10"
- >
- {key.expires === KeyExpiry.sevenDays && "7 Days"}
- {key.expires === KeyExpiry.oneMonth && "30 Days"}
- {key.expires === KeyExpiry.twoMonths && "60 Days"}
- {key.expires === KeyExpiry.threeMonths && "90 Days"}
- {key.expires === KeyExpiry.never && "No Expiration"}
- </div>
- <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-xl w-52 mt-1">
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={key.expires === KeyExpiry.sevenDays}
- onChange={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setKey({ ...key, expires: KeyExpiry.sevenDays });
- }}
- />
- <span className="label-text">7 Days</span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={key.expires === KeyExpiry.oneMonth}
- onChange={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setKey({ ...key, expires: KeyExpiry.oneMonth });
- }}
- />
- <span className="label-text">30 Days</span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={key.expires === KeyExpiry.twoMonths}
- onChange={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setKey({ ...key, expires: KeyExpiry.twoMonths });
- }}
- />
- <span className="label-text">60 Days</span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
- tabIndex={0}
- role="button"
- >
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={key.expires === KeyExpiry.threeMonths}
- onChange={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setKey({ ...key, expires: KeyExpiry.threeMonths });
- }}
- />
- <span className="label-text">90 Days</span>
- </label>
- </li>
- <li>
- <label
- className="label cursor-pointer flex justify-start"
+ <div className="dropdown dropdown-bottom dropdown-end">
+ <div
tabIndex={0}
role="button"
+ className="btn btn-outline w-36 flex items-center btn-sm h-10"
>
- <input
- type="radio"
- name="sort-radio"
- className="radio checked:bg-primary"
- checked={key.expires === KeyExpiry.never}
- onChange={() => {
- (document?.activeElement as HTMLElement)?.blur();
- setKey({ ...key, expires: KeyExpiry.never });
- }}
- />
- <span className="label-text">No Expiration</span>
- </label>
- </li>
- </ul>
+ {key.expires === KeyExpiry.sevenDays && "7 Days"}
+ {key.expires === KeyExpiry.oneMonth && "30 Days"}
+ {key.expires === KeyExpiry.twoMonths && "60 Days"}
+ {key.expires === KeyExpiry.threeMonths && "90 Days"}
+ {key.expires === KeyExpiry.never && "No Expiration"}
+ </div>
+ <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-xl w-52 mt-1">
+ <li>
+ <label
+ className="label cursor-pointer flex justify-start"
+ tabIndex={0}
+ role="button"
+ >
+ <input
+ type="radio"
+ name="sort-radio"
+ className="radio checked:bg-primary"
+ checked={key.expires === KeyExpiry.sevenDays}
+ onChange={() => {
+ (document?.activeElement as HTMLElement)?.blur();
+ setKey({ ...key, expires: KeyExpiry.sevenDays });
+ }}
+ />
+ <span className="label-text">7 Days</span>
+ </label>
+ </li>
+ <li>
+ <label
+ className="label cursor-pointer flex justify-start"
+ tabIndex={0}
+ role="button"
+ >
+ <input
+ type="radio"
+ name="sort-radio"
+ className="radio checked:bg-primary"
+ checked={key.expires === KeyExpiry.oneMonth}
+ onChange={() => {
+ (document?.activeElement as HTMLElement)?.blur();
+ setKey({ ...key, expires: KeyExpiry.oneMonth });
+ }}
+ />
+ <span className="label-text">30 Days</span>
+ </label>
+ </li>
+ <li>
+ <label
+ className="label cursor-pointer flex justify-start"
+ tabIndex={0}
+ role="button"
+ >
+ <input
+ type="radio"
+ name="sort-radio"
+ className="radio checked:bg-primary"
+ checked={key.expires === KeyExpiry.twoMonths}
+ onChange={() => {
+ (document?.activeElement as HTMLElement)?.blur();
+ setKey({ ...key, expires: KeyExpiry.twoMonths });
+ }}
+ />
+ <span className="label-text">60 Days</span>
+ </label>
+ </li>
+ <li>
+ <label
+ className="label cursor-pointer flex justify-start"
+ tabIndex={0}
+ role="button"
+ >
+ <input
+ type="radio"
+ name="sort-radio"
+ className="radio checked:bg-primary"
+ checked={key.expires === KeyExpiry.threeMonths}
+ onChange={() => {
+ (document?.activeElement as HTMLElement)?.blur();
+ setKey({ ...key, expires: KeyExpiry.threeMonths });
+ }}
+ />
+ <span className="label-text">90 Days</span>
+ </label>
+ </li>
+ <li>
+ <label
+ className="label cursor-pointer flex justify-start"
+ tabIndex={0}
+ role="button"
+ >
+ <input
+ type="radio"
+ name="sort-radio"
+ className="radio checked:bg-primary"
+ checked={key.expires === KeyExpiry.never}
+ onChange={() => {
+ (document?.activeElement as HTMLElement)?.blur();
+ setKey({ ...key, expires: KeyExpiry.never });
+ }}
+ />
+ <span className="label-text">No Expiration</span>
+ </label>
+ </li>
+ </ul>
+ </div>
+ </div>
</div>
- </div>
- </div>
-
- <div className="flex justify-between items-center mt-5">
- <button
- className="btn btn-accent dark:border-violet-400 text-white"
- onClick={submit}
- >
- Create Access Token
- </button>
- </div>
+
+ <div className="flex justify-between items-center mt-5">
+ <button
+ className="btn btn-accent dark:border-violet-400 text-white"
+ onClick={submit}
+ >
+ Create Access Token
+ </button>
+ </div>
+ </>
+ )}
</Modal>
);
}
diff --git a/components/TextInput.tsx b/components/TextInput.tsx
index 146a15cc..c8099d0e 100644
--- a/components/TextInput.tsx
+++ b/components/TextInput.tsx
@@ -8,6 +8,7 @@ type Props = {
onChange: ChangeEventHandler<HTMLInputElement>;
onKeyDown?: KeyboardEventHandler<HTMLInputElement> | undefined;
className?: string;
+ spellCheck?: boolean;
};
export default function TextInput({
@@ -18,9 +19,11 @@ export default function TextInput({
onChange,
onKeyDown,
className,
+ spellCheck,
}: Props) {
return (
<input
+ spellCheck={spellCheck}
autoFocus={autoFocus}
type={type ? type : "text"}
placeholder={placeholder}
diff --git a/lib/api/controllers/tokens/postToken.ts b/lib/api/controllers/tokens/postToken.ts
index 24a8cba9..b6fb1c16 100644
--- a/lib/api/controllers/tokens/postToken.ts
+++ b/lib/api/controllers/tokens/postToken.ts
@@ -1,7 +1,7 @@
import { prisma } from "@/lib/api/db";
import { KeyExpiry } from "@/types/global";
-import bcrypt from "bcrypt";
import crypto from "crypto";
+import { decode, encode, getToken } from "next-auth/jwt";
export default async function postToken(
body: {
@@ -34,44 +34,55 @@ export default async function postToken(
};
}
+ const now = Date.now();
let expiryDate = new Date();
+ const oneDayInSeconds = 86400;
+ let expiryDateSecond = 7 * oneDayInSeconds;
- switch (body.expires) {
- case KeyExpiry.sevenDays:
- expiryDate.setDate(expiryDate.getDate() + 7);
- break;
- case KeyExpiry.oneMonth:
- expiryDate.setDate(expiryDate.getDate() + 30);
- break;
- case KeyExpiry.twoMonths:
- expiryDate.setDate(expiryDate.getDate() + 60);
- break;
- case KeyExpiry.threeMonths:
- expiryDate.setDate(expiryDate.getDate() + 90);
- break;
- case KeyExpiry.never:
- expiryDate.setDate(expiryDate.getDate() + 73000); // 200 years (not really never)
- break;
- default:
- expiryDate.setDate(expiryDate.getDate() + 7);
- break;
+ if (body.expires === KeyExpiry.oneMonth) {
+ expiryDate.setDate(expiryDate.getDate() + 30);
+ expiryDateSecond = 30 * oneDayInSeconds;
+ } else if (body.expires === KeyExpiry.twoMonths) {
+ expiryDate.setDate(expiryDate.getDate() + 60);
+ expiryDateSecond = 60 * oneDayInSeconds;
+ } else if (body.expires === KeyExpiry.threeMonths) {
+ expiryDate.setDate(expiryDate.getDate() + 90);
+ expiryDateSecond = 90 * oneDayInSeconds;
+ } else if (body.expires === KeyExpiry.never) {
+ expiryDate.setDate(expiryDate.getDate() + 73000); // 200 years (not really never)
+ expiryDateSecond = 73050 * oneDayInSeconds;
+ } else {
+ expiryDate.setDate(expiryDate.getDate() + 7);
+ expiryDateSecond = 7 * oneDayInSeconds;
}
- const saltRounds = 10;
+ const token = await encode({
+ token: {
+ id: userId,
+ iat: now / 1000,
+ exp: (expiryDate as any) / 1000,
+ jti: crypto.randomUUID(),
+ },
+ maxAge: expiryDateSecond || 604800,
+ secret: process.env.NEXTAUTH_SECRET,
+ });
- const hashedKey = bcrypt.hashSync(crypto.randomUUID(), saltRounds);
+ const tokenBody = await decode({
+ token,
+ secret: process.env.NEXTAUTH_SECRET,
+ });
const createToken = await prisma.apiKey.create({
data: {
name: body.name,
userId,
- token: hashedKey,
+ token: tokenBody?.jti as string,
expires: expiryDate,
},
});
return {
- response: createToken.token,
+ response: token,
status: 200,
};
}
diff --git a/lib/api/verifyUser.ts b/lib/api/verifyUser.ts
index db59e6e8..8c58143a 100644
--- a/lib/api/verifyUser.ts
+++ b/lib/api/verifyUser.ts
@@ -23,6 +23,13 @@ export default async function verifyUser({
return null;
}
+ if (token.exp < Date.now() / 1000) {
+ res
+ .status(401)
+ .json({ response: "Your session has expired, please log in again." });
+ return null;
+ }
+
const user = await prisma.user.findUnique({
where: {
id: userId,
diff --git a/pages/api/v1/auth/[...nextauth].ts b/pages/api/v1/auth/[...nextauth].ts
index d7549de8..c72d60d6 100644
--- a/pages/api/v1/auth/[...nextauth].ts
+++ b/pages/api/v1/auth/[...nextauth].ts
@@ -65,6 +65,7 @@ import ZitadelProvider from "next-auth/providers/zitadel";
import ZohoProvider from "next-auth/providers/zoho";
import ZoomProvider from "next-auth/providers/zoom";
import * as process from "process";
+import type { NextApiRequest, NextApiResponse } from "next";
const emailEnabled =
process.env.EMAIL_FROM && process.env.EMAIL_SERVER ? true : false;
@@ -1059,60 +1060,60 @@ if (process.env.NEXT_PUBLIC_ZOOM_ENABLED_ENABLED === "true") {
};
}
-export const authOptions: AuthOptions = {
- adapter: adapter as Adapter,
- session: {
- strategy: "jwt",
- maxAge: 30 * 24 * 60 * 60, // 30 days
- },
- providers,
- pages: {
- signIn: "/login",
- verifyRequest: "/confirmation",
- },
- callbacks: {
- async signIn({ user, account, profile, email, credentials }) {
- if (account?.provider !== "credentials") {
- // registration via SSO can be separately disabled
- const existingUser = await prisma.account.findFirst({
- where: {
- providerAccountId: account?.providerAccountId,
- },
- });
- if (existingUser && newSsoUsersDisabled) {
- return false;
- }
- }
- return true;
+export default async function auth(req: NextApiRequest, res: NextApiResponse) {
+ return await NextAuth(req, res, {
+ adapter: adapter as Adapter,
+ session: {
+ strategy: "jwt",
+ maxAge: 30 * 24 * 60 * 60, // 30 days
},
- async jwt({ token, trigger, user }) {
- token.sub = token.sub ? Number(token.sub) : undefined;
- if (trigger === "signIn" || trigger === "signUp")
- token.id = user?.id as number;
-
- return token;
+ providers,
+ pages: {
+ signIn: "/login",
+ verifyRequest: "/confirmation",
},
- async session({ session, token }) {
- session.user.id = token.id;
-
- if (STRIPE_SECRET_KEY) {
- const user = await prisma.user.findUnique({
- where: {
- id: token.id,
- },
- include: {
- subscriptions: true,
- },
- });
+ callbacks: {
+ async signIn({ user, account, profile, email, credentials }) {
+ if (account?.provider !== "credentials") {
+ // registration via SSO can be separately disabled
+ const existingUser = await prisma.account.findFirst({
+ where: {
+ providerAccountId: account?.providerAccountId,
+ },
+ });
+ if (existingUser && newSsoUsersDisabled) {
+ return false;
+ }
+ }
+ return true;
+ },
+ async jwt({ token, trigger, user }) {
+ token.sub = token.sub ? Number(token.sub) : undefined;
+ if (trigger === "signIn" || trigger === "signUp")
+ token.id = user?.id as number;
- if (user) {
- const subscribedUser = await verifySubscription(user);
+ return token;
+ },
+ async session({ session, token }) {
+ session.user.id = token.id;
+
+ if (STRIPE_SECRET_KEY) {
+ const user = await prisma.user.findUnique({
+ where: {
+ id: token.id,
+ },
+ include: {
+ subscriptions: true,
+ },
+ });
+
+ if (user) {
+ const subscribedUser = await verifySubscription(user);
+ }
}
- }
- return session;
+ return session;
+ },
},
- },
-};
-
-export default NextAuth(authOptions);
+ });
+}
diff --git a/pages/api/v1/users/[id].ts b/pages/api/v1/users/[id].ts
index 016ef9ab..2dd808a4 100644
--- a/pages/api/v1/users/[id].ts
+++ b/pages/api/v1/users/[id].ts
@@ -16,6 +16,12 @@ export default async function users(req: NextApiRequest, res: NextApiResponse) {
return res.status(401).json({ response: "You must be logged in." });
}
+ if (token.exp < Date.now() / 1000) {
+ return res
+ .status(401)
+ .json({ response: "Your session has expired, please log in again." });
+ }
+
if (userId !== Number(req.query.id))
return res.status(401).json({ response: "Permission denied." });