Update .env.sample

bug fix

.env.sample

@@ -1,11 +1,12 @@
-NEXTAUTH_SECRET=very_sensitive_secret
 NEXTAUTH_URL=http://localhost:3000/api/v1/auth
+NEXTAUTH_SECRET=
 
 # Manual installation database settings
-DATABASE_URL=postgresql://user:password@localhost:5432/linkwarden
+# Example: DATABASE_URL=postgresql://user:password@localhost:5432/linkwarden
+DATABASE_URL=
 
 # Docker installation database settings
-POSTGRES_PASSWORD=super_secret_password
+POSTGRES_PASSWORD=
 
 # Additional Optional Settings
 PAGINATION_TAKE_COUNT=

components/FilterSearchDropdown.tsx

@@ -1,6 +1,8 @@
 import { dropdownTriggerer } from "@/lib/client/utils";
-import React from "react";
+import React, { useEffect } from "react";
 import { useTranslation } from "next-i18next";
+import { resetInfiniteQueryPagination } from "@/hooks/store/links";
+import { useQueryClient } from "@tanstack/react-query";
 
 type Props = {
   setSearchFilter: Function;
@@ -18,6 +20,7 @@ export default function FilterSearchDropdown({
   searchFilter,
 }: Props) {
   const { t } = useTranslation();
+  const queryClient = useQueryClient();
 
   return (
     <div className="dropdown dropdown-bottom dropdown-end">
@@ -41,9 +44,10 @@ export default function FilterSearchDropdown({
               name="search-filter-checkbox"
               className="checkbox checkbox-primary"
               checked={searchFilter.name}
-              onChange={() =>
+              onChange={() => {
-                setSearchFilter({ ...searchFilter, name: !searchFilter.name })
+                resetInfiniteQueryPagination(queryClient, ["links"]);
-              }
+                setSearchFilter({ ...searchFilter, name: !searchFilter.name });
+              }}
             />
             <span className="label-text whitespace-nowrap">{t("name")}</span>
           </label>
@@ -59,9 +63,10 @@ export default function FilterSearchDropdown({
               name="search-filter-checkbox"
               className="checkbox checkbox-primary"
               checked={searchFilter.url}
-              onChange={() =>
+              onChange={() => {
-                setSearchFilter({ ...searchFilter, url: !searchFilter.url })
+                resetInfiniteQueryPagination(queryClient, ["links"]);
-              }
+                setSearchFilter({ ...searchFilter, url: !searchFilter.url });
+              }}
             />
             <span className="label-text whitespace-nowrap">{t("link")}</span>
           </label>
@@ -77,12 +82,13 @@ export default function FilterSearchDropdown({
               name="search-filter-checkbox"
               className="checkbox checkbox-primary"
               checked={searchFilter.description}
-              onChange={() =>
+              onChange={() => {
+                resetInfiniteQueryPagination(queryClient, ["links"]);
                 setSearchFilter({
                   ...searchFilter,
                   description: !searchFilter.description,
-                })
+                });
-              }
+              }}
             />
             <span className="label-text whitespace-nowrap">
               {t("description")}
@@ -100,9 +106,10 @@ export default function FilterSearchDropdown({
               name="search-filter-checkbox"
               className="checkbox checkbox-primary"
               checked={searchFilter.tags}
-              onChange={() =>
+              onChange={() => {
-                setSearchFilter({ ...searchFilter, tags: !searchFilter.tags })
+                resetInfiniteQueryPagination(queryClient, ["links"]);
-              }
+                setSearchFilter({ ...searchFilter, tags: !searchFilter.tags });
+              }}
             />
             <span className="label-text whitespace-nowrap">{t("tags")}</span>
           </label>
@@ -118,12 +125,13 @@ export default function FilterSearchDropdown({
               name="search-filter-checkbox"
               className="checkbox checkbox-primary"
               checked={searchFilter.textContent}
-              onChange={() =>
+              onChange={() => {
+                resetInfiniteQueryPagination(queryClient, ["links"]);
                 setSearchFilter({
                   ...searchFilter,
                   textContent: !searchFilter.textContent,
-                })
+                });
-              }
+              }}
             />
             <span className="label-text whitespace-nowrap">
               {t("full_content")}

components/InstallApp.tsx

@@ -8,7 +8,7 @@ const InstallApp = (props: Props) => {
   const [isOpen, setIsOpen] = useState(true);
 
   return isOpen && !isPWA() ? (
-    <div className="fixed left-0 right-0 bottom-10 w-full p-5">
+    <div className="fixed left-0 right-0 bottom-10 w-full">
       <div className="mx-auto w-fit p-2 flex justify-between gap-2 items-center border border-neutral-content rounded-xl bg-base-300 backdrop-blur-md bg-opacity-80 max-w-md">
         <svg
           xmlns="http://www.w3.org/2000/svg"

components/SortDropdown.tsx

@@ -3,6 +3,8 @@ import { Sort } from "@/types/global";
 import { dropdownTriggerer } from "@/lib/client/utils";
 import { TFunction } from "i18next";
 import useLocalSettingsStore from "@/store/localSettings";
+import { resetInfiniteQueryPagination } from "@/hooks/store/links";
+import { useQueryClient } from "@tanstack/react-query";
 
 type Props = {
   sortBy: Sort;
@@ -12,6 +14,7 @@ type Props = {
 
 export default function SortDropdown({ sortBy, setSort, t }: Props) {
   const { updateSettings } = useLocalSettingsStore();
+  const queryClient = useQueryClient();
 
   useEffect(() => {
     updateSettings({ sortBy });
@@ -39,7 +42,10 @@ export default function SortDropdown({ sortBy, setSort, t }: Props) {
               name="sort-radio"
               className="radio checked:bg-primary"
               checked={sortBy === Sort.DateNewestFirst}
-              onChange={() => setSort(Sort.DateNewestFirst)}
+              onChange={() => {
+                resetInfiniteQueryPagination(queryClient, ["links"]);
+                setSort(Sort.DateNewestFirst);
+              }}
             />
             <span className="label-text whitespace-nowrap">
               {t("date_newest_first")}
@@ -57,7 +63,10 @@ export default function SortDropdown({ sortBy, setSort, t }: Props) {
               name="sort-radio"
               className="radio checked:bg-primary"
               checked={sortBy === Sort.DateOldestFirst}
-              onChange={() => setSort(Sort.DateOldestFirst)}
+              onChange={() => {
+                resetInfiniteQueryPagination(queryClient, ["links"]);
+                setSort(Sort.DateOldestFirst);
+              }}
             />
             <span className="label-text whitespace-nowrap">
               {t("date_oldest_first")}
@@ -75,7 +84,10 @@ export default function SortDropdown({ sortBy, setSort, t }: Props) {
               name="sort-radio"
               className="radio checked:bg-primary"
               checked={sortBy === Sort.NameAZ}
-              onChange={() => setSort(Sort.NameAZ)}
+              onChange={() => {
+                resetInfiniteQueryPagination(queryClient, ["links"]);
+                setSort(Sort.NameAZ);
+              }}
             />
             <span className="label-text whitespace-nowrap">{t("name_az")}</span>
           </label>
@@ -91,7 +103,10 @@ export default function SortDropdown({ sortBy, setSort, t }: Props) {
               name="sort-radio"
               className="radio checked:bg-primary"
               checked={sortBy === Sort.NameZA}
-              onChange={() => setSort(Sort.NameZA)}
+              onChange={() => {
+                resetInfiniteQueryPagination(queryClient, ["links"]);
+                setSort(Sort.NameZA);
+              }}
             />
             <span className="label-text whitespace-nowrap">{t("name_za")}</span>
           </label>
@@ -107,7 +122,10 @@ export default function SortDropdown({ sortBy, setSort, t }: Props) {
               name="sort-radio"
               className="radio checked:bg-primary"
               checked={sortBy === Sort.DescriptionAZ}
-              onChange={() => setSort(Sort.DescriptionAZ)}
+              onChange={() => {
+                resetInfiniteQueryPagination(queryClient, ["links"]);
+                setSort(Sort.DescriptionAZ);
+              }}
             />
             <span className="label-text whitespace-nowrap">
               {t("description_az")}
@@ -125,7 +143,10 @@ export default function SortDropdown({ sortBy, setSort, t }: Props) {
               name="sort-radio"
               className="radio checked:bg-primary"
               checked={sortBy === Sort.DescriptionZA}
-              onChange={() => setSort(Sort.DescriptionZA)}
+              onChange={() => {
+                resetInfiniteQueryPagination(queryClient, ["links"]);
+                setSort(Sort.DescriptionZA);
+              }}
             />
             <span className="label-text whitespace-nowrap">
               {t("description_za")}

hooks/store/links.tsx

@@ -159,20 +159,23 @@ const useUpdateLink = () => {
       return data.response;
     },
     onSuccess: (data) => {
-      queryClient.setQueryData(["dashboardData"], (oldData: any) => {
+      // queryClient.setQueryData(["dashboardData"], (oldData: any) => {
-        if (!oldData) return undefined;
+      //   if (!oldData) return undefined;
-        return oldData.map((e: any) => (e.id === data.id ? data : e));
+      //   return oldData.map((e: any) => (e.id === data.id ? data : e));
-      });
+      // });
 
-      queryClient.setQueriesData({ queryKey: ["links"] }, (oldData: any) => {
+      // queryClient.setQueriesData({ queryKey: ["links"] }, (oldData: any) => {
-        if (!oldData) return undefined;
+      //   if (!oldData) return undefined;
-        return {
+      //   return {
-          pages: oldData.pages.map((page: any) =>
+      //     pages: oldData.pages.map((page: any) =>
-            page.map((item: any) => (item.id === data.id ? data : item))
+      //       page.map((item: any) => (item.id === data.id ? data : item))
-          ),
+      //     ),
-          pageParams: oldData.pageParams,
+      //     pageParams: oldData.pageParams,
-        };
+      //   };
-      });
+      // });
+
+      queryClient.invalidateQueries({ queryKey: ["links"] }); // Temporary workaround
+      queryClient.invalidateQueries({ queryKey: ["dashboardData"] }); // Temporary workaround
 
       queryClient.invalidateQueries({ queryKey: ["collections"] });
       queryClient.invalidateQueries({ queryKey: ["tags"] });
@@ -425,6 +428,22 @@ const useBulkEditLinks = () => {
   });
 };
 
+const resetInfiniteQueryPagination = async (
+  queryClient: any,
+  queryKey: any
+) => {
+  queryClient.setQueriesData({ queryKey }, (oldData: any) => {
+    if (!oldData) return undefined;
+
+    return {
+      pages: oldData.pages.slice(0, 1),
+      pageParams: oldData.pageParams.slice(0, 1),
+    };
+  });
+
+  await queryClient.invalidateQueries(queryKey);
+};
+
 export {
   useLinks,
   useAddLink,
@@ -434,4 +453,5 @@ export {
   useUploadFile,
   useGetLink,
   useBulkEditLinks,
+  resetInfiniteQueryPagination,
 };

lib/api/controllers/collections/collectionId/deleteCollectionById.ts

@@ -57,8 +57,8 @@ export default async function deleteCollection(
       },
     });
 
-    await removeFolder({ filePath: `archives/${collectionId}` });
+    removeFolder({ filePath: `archives/${collectionId}` });
-    await removeFolder({ filePath: `archives/preview/${collectionId}` });
+    removeFolder({ filePath: `archives/preview/${collectionId}` });
 
     await removeFromOrders(userId, collectionId);
 
@@ -100,8 +100,8 @@ async function deleteSubCollections(collectionId: number) {
       where: { id: subCollection.id },
     });
 
-    await removeFolder({ filePath: `archives/${subCollection.id}` });
+    removeFolder({ filePath: `archives/${subCollection.id}` });
-    await removeFolder({ filePath: `archives/preview/${subCollection.id}` });
+    removeFolder({ filePath: `archives/preview/${subCollection.id}` });
   }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkwarden",
-  "version": "v2.7.0",
+  "version": "v2.7.1",
   "main": "index.js",
   "repository": "https://github.com/linkwarden/linkwarden.git",
   "author": "Daniel31X13 <daniel31x13@gmail.com>",

pages/api/v1/auth/[...nextauth].ts

@@ -1186,10 +1186,42 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
               providerAccountId: account?.providerAccountId,
             },
           });
+
           if (!existingUser && newSsoUsersDisabled) {
             return false;
           }
+
+          // If user is already registered, link the provider
+          if (user.email && account) {
+            const findUser = await prisma.user.findFirst({
+              where: {
+                email: user.email,
+              },
+              include: {
+                accounts: true,
+              },
+            });
+
+            if (findUser && findUser.accounts.length === 0) {
+              await prisma.account.create({
+                data: {
+                  userId: findUser.id,
+                  type: account.type,
+                  provider: account.provider,
+                  providerAccountId: account.providerAccountId,
+                  id_token: account.id_token,
+                  access_token: account.access_token,
+                  refresh_token: account.refresh_token,
+                  expires_at: account.expires_at,
+                  token_type: account.token_type,
+                  scope: account.scope,
+                  session_state: account.session_state,
+                },
+              });
+            }
+          }
         }
+
         return true;
       },
       async jwt({ token, trigger, user }) {
@@ -1198,13 +1230,28 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
           token.id = user?.id as number;
 
         if (trigger === "signUp") {
-          const checkIfUserExists = await prisma.user.findUnique({
+          const userExists = await prisma.user.findUnique({
             where: {
               id: token.id,
             },
+            include: {
+              accounts: true,
+            },
           });
 
-          if (checkIfUserExists && !checkIfUserExists.username) {
+          // Verify SSO user email
+          if (userExists && userExists.accounts.length > 0) {
+            await prisma.user.update({
+              where: {
+                id: userExists.id,
+              },
+              data: {
+                emailVerified: new Date(),
+              },
+            });
+          }
+
+          if (userExists && !userExists.username) {
             const autoGeneratedUsername =
               "user" + Math.round(Math.random() * 1000000000);
 
@@ -1217,6 +1264,22 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
               },
             });
           }
+        } else if (trigger === "signIn") {
+          const user = await prisma.user.findUnique({
+            where: {
+              id: token.id,
+            },
+          });
+
+          if (user && !user.username) {
+            const autoGeneratedUsername =
+              "user" + Math.round(Math.random() * 1000000000);
+
+            await prisma.user.update({
+              where: { id: user.id },
+              data: { username: autoGeneratedUsername },
+            });
+          }
         }
 
         return token;
@@ -1224,6 +1287,8 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
       async session({ session, token }) {
         session.user.id = token.id;
 
+        console.log("session", session);
+
         if (STRIPE_SECRET_KEY) {
           const user = await prisma.user.findUnique({
             where: {
@@ -1235,6 +1300,7 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
           });
 
           if (user) {
+            //
             const subscribedUser = await verifySubscription(user);
           }
         }