Skip to content

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

fixed session bug

Daniel22d8178c88fb
diff --git a/components/Modal/UserSettings.tsx b/components/Modal/UserSettings.tsx
index a7310ab9..077e9c40 100644
--- a/components/Modal/UserSettings.tsx
+++ b/components/Modal/UserSettings.tsx
@@ -9,12 +9,14 @@ import { faCircleUser, faClose } from "@fortawesome/free-solid-svg-icons";
import Checkbox from "../Checkbox";
import useAccountStore from "@/store/account";
import { AccountSettings } from "@/types/global";
+import { useSession } from "next-auth/react";
type Props = {
toggleSettingsModal: Function;
};
export default function UserSettings({ toggleSettingsModal }: Props) {
+ const { update } = useSession();
const { account, updateAccount } = useAccountStore();
let initialUser = {
@@ -37,7 +39,7 @@ export default function UserSettings({ toggleSettingsModal }: Props) {
};
const submit = async () => {
- updateAccount(user);
+ await updateAccount(user);
initialUser = {
name: account.name,
@@ -45,6 +47,11 @@ export default function UserSettings({ toggleSettingsModal }: Props) {
collectionProtection: account.collectionProtection,
whitelistedUsers: account.whitelistedUsers,
};
+
+ console.log({ email: user.email, name: user.name });
+
+ if (user.email !== initialUser.email || user.name !== initialUser.name)
+ update({ email: user.email, name: user.name });
};
return (
@@ -53,6 +60,13 @@ export default function UserSettings({ toggleSettingsModal }: Props) {
<p className="text-sky-600">Profile Settings</p>
+ {user.email !== initialUser.email || user.name !== initialUser.name ? (
+ <p className="text-gray-500 text-sm">
+ Note: The page will be refreshed to apply the changes of "Email" or
+ "Display Name".
+ </p>
+ ) : null}
+
<div className="grid sm:grid-cols-2 gap-3 auto-rows-auto">
<div className="flex flex-col gap-3">
<div>
@@ -67,11 +81,6 @@ export default function UserSettings({ toggleSettingsModal }: Props) {
<div>
<p className="text-sm font-bold text-sky-300 mb-2">Email</p>
- {user.email !== initialUser.email ? (
- <p className="text-gray-500 text-sm mb-3">
- Please log back in if you change the Email.
- </p>
- ) : null}
<input
type="text"
value={user.email}
@@ -155,6 +164,7 @@ export default function UserSettings({ toggleSettingsModal }: Props) {
you to additional collections in the box below, separated by spaces.
</p>
<textarea
+ autoFocus
className="w-full resize-none border rounded-md duration-100 bg-white p-2 outline-none border-sky-100 focus:border-sky-500"
placeholder="No one can add you to any collections right now..."
></textarea>
diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts
index 1b475f55..4fa11f77 100644
--- a/pages/api/auth/[...nextauth].ts
+++ b/pages/api/auth/[...nextauth].ts
@@ -57,6 +57,15 @@ export const authOptions: AuthOptions = {
return session;
},
+ // Using the `...rest` parameter to be able to narrow down the type based on `trigger`
+ jwt({ token, trigger, session }) {
+ if (trigger === "update" && session?.name && session?.email) {
+ // Note, that `session` can be any arbitrary object, remember to validate it!
+ token.name = session.name;
+ token.email = session.email;
+ }
+ return token;
+ },
},
};
diff --git a/pages/api/routes/users/index.ts b/pages/api/routes/users/index.ts
index 9ee8bdc6..75ca851f 100644
--- a/pages/api/routes/users/index.ts
+++ b/pages/api/routes/users/index.ts
@@ -19,11 +19,6 @@ export default async function (req: NextApiRequest, res: NextApiResponse) {
const lookupEmail = req.query.email as string;
const isSelf = session.user.email === lookupEmail ? true : false;
- // const lookup =
- // req.query.email == req.query.id
- // ? { id: req.query.id }
- // : { email: req.query.email };
-
if (req.method === "GET") {
const users = await getUsers(lookupEmail, isSelf);
return res.status(users.status).json({ response: users.response });
diff --git a/store/account.ts b/store/account.ts
index 03f31394..5a0e3bbe 100644
--- a/store/account.ts
+++ b/store/account.ts
@@ -6,12 +6,11 @@
import { create } from "zustand";
import { User } from "@prisma/client";
import { AccountSettings } from "@/types/global";
-import { useSession } from "next-auth/react";
type AccountStore = {
account: User;
setAccount: (email: string) => void;
- updateAccount: (user: AccountSettings) => void;
+ updateAccount: (user: AccountSettings) => Promise<boolean>;
};
const useAccountStore = create<AccountStore>()((set) => ({
@@ -39,6 +38,8 @@ const useAccountStore = create<AccountStore>()((set) => ({
console.log(data);
if (response.ok) set({ account: data.response });
+
+ return response.ok;
},
}));