fix: link social, admin delete account,update

src/components/wrappers/auth/auth-layout.tsx

@@ -0,0 +1,37 @@
+"use client";
+
+import React, { useEffect } from "react";
+import { useSearchParams } from "next/navigation";
+import { toast } from "sonner";
+
+export const AuthLayout = ({ children }: { children: React.ReactNode }) => {
+  const url = useSearchParams();
+
+  useEffect(() => {
+    const error = url.get("error");
+
+    if (!error) return;
+
+    const errorMessages: Record<string, string> = {
+      pending: "Your account is not active.",
+      invalid_or_expired_token: "Password reset invalid token.",
+    };
+
+    const match = Object.entries(errorMessages).find(([key]) =>
+      error.includes(key),
+    );
+
+    if (!match) return;
+
+    toast.error(match[1]);
+
+    const params = new URLSearchParams(url.toString());
+    params.delete("error");
+    const newUrl =
+      window.location.pathname + (params.toString() ? `?${params.toString()}` : "");
+
+    window.history.replaceState({}, document.title, newUrl);
+  }, [url]);
+
+  return <>{children}</>;
+};

src/components/wrappers/auth/login/login-form/login-form.tsx

@@ -1,123 +1,133 @@
 "use client";
 
-import {useEffect, useState} from "react";
-import {useMutation} from "@tanstack/react-query";
-import {toast} from "sonner";
-import {FormControl, FormField, FormItem, FormLabel, FormMessage, useZodForm} from "@/components/ui/form";
-import {Input} from "@/components/ui/input";
-import {Form} from "@/components/ui/form";
-import {LoginSchema, LoginType} from "@/components/wrappers/auth/login/login-form/login-form.schema";
-import {signIn} from "@/lib/auth/auth-client";
-import {ButtonWithLoading} from "@/components/wrappers/common/button/button-with-loading";
+import { useMutation } from "@tanstack/react-query";
 import Link from "next/link";
-import {useRouter} from "next/navigation";
-import {PasswordInput} from "@/components/ui/password-input";
+import { useRouter, useSearchParams } from "next/navigation";
+import { useEffect } from "react";
+import { toast } from "sonner";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useZodForm,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { PasswordInput } from "@/components/ui/password-input";
+import {
+  LoginSchema,
+  type LoginType,
+} from "@/components/wrappers/auth/login/login-form/login-form.schema";
+import { ButtonWithLoading } from "@/components/wrappers/common/button/button-with-loading";
+import { signIn } from "@/lib/auth/auth-client";
 
 export type loginFormProps = {
-    defaultValues?: LoginType;
-    isPasskeyEnabled?: boolean;
+  defaultValues?: LoginType;
+  isPasskeyEnabled?: boolean;
 };
 
 export const LoginForm = (props: loginFormProps) => {
-    const {isPasskeyEnabled = false} = props;
+  const { isPasskeyEnabled = false } = props;
 
+  const url = useSearchParams();
 
-    const [urlParams, setUrlParams] = useState<URLSearchParams>();
+  const form = useZodForm({
+    schema: LoginSchema,
+  });
 
-    useEffect(() => {
-        const urlParams = new URLSearchParams(window.location.search);
-        setUrlParams(urlParams);
-        const error = urlParams.get("error");
-        if (error?.includes("pending")) {
-            toast.error("Your account is not active.");
-            urlParams.delete("error");
-            window.history.replaceState({}, document.title, window.location.pathname + "?" + urlParams.toString());
-        }
-        if (error?.includes("invalid_or_expired_token")) {
-            toast.error("Password reset invalid token.");
-            urlParams.delete("error");
-            window.history.replaceState({}, document.title, window.location.pathname + "?" + urlParams.toString());
-        }
-    }, []);
+  const router = useRouter();
 
-    const form = useZodForm({
-        schema: LoginSchema,
-    });
-
-    const router = useRouter();
-
-    const mutation = useMutation({
-        mutationFn: async (values: LoginType) => {
-            await signIn.email(
-                {
-                    password: values.password,
-                    email: values.email,
-                    callbackURL: urlParams?.get("redirect") ?? "/dashboard",
-                },
-                {
-                    onSuccess: (context) => {
-                        if (context.data.twoFactorRedirect) {
-                            //@ts-ignore
-                            router.push("/guard?redirect=" + encodeURIComponent(context.data.callbackURL || "/dashboard"));
-                        }
-
-                        toast.success("Login success");
-                    },
-                    onError: (error) => {
-                        toast.error(error.error.message);
-                    },
-                }
-            );
+  const mutation = useMutation({
+    mutationFn: async (values: LoginType) => {
+      await signIn.email(
+        {
+          password: values.password,
+          email: values.email,
+          callbackURL: url?.get("redirect") ?? "/dashboard",
         },
-    });
+        {
+          onSuccess: (context) => {
+            if (context.data.twoFactorRedirect) {
+              router.push(
+                "/guard?redirect=" +
+                  encodeURIComponent(context.data.callbackURL || "/dashboard"),
+              );
+            }
 
-    return (
-        <Form
-            form={form}
-            className="flex flex-col gap-4 mb-1"
-            onSubmit={async (values) => {
-                await mutation.mutateAsync(values);
-            }}
-        >
-            <FormField
-                control={form.control}
-                name="email"
-                defaultValue=""
-                render={({field}) => (
-                    <FormItem>
-                        <FormLabel>Email Address</FormLabel>
-                        <FormControl>
-                            <Input autoComplete="email" autoFocus placeholder="example@portabase.io" {...field} />
-                        </FormControl>
-                        <FormMessage/>
-                    </FormItem>
-                )}
-            />
-            <FormField
-                control={form.control}
-                name="password"
-                defaultValue=""
-                render={({field}) => (
-                    <FormItem>
-                        <div className="flex items-center justify-between">
-                            <FormLabel>Password</FormLabel>
-                            <div className="text-center text-sm">
-                                <Link href={"/forgot-password"} className="hover:underline ml-1">
-                                    Forgot your password ?
-                                </Link>
-                            </div>
-                        </div>
-                        <FormControl>
-                            <PasswordInput autoComplete={isPasskeyEnabled ? "current-password webauthn" : "current-password"}
-                                           placeholder={"Enter your password"} {...field} />
-                        </FormControl>
-                        <FormMessage/>
-                    </FormItem>
-                )}
-            />
-            <ButtonWithLoading className="mt-2 h-11" isPending={mutation.isPending}>
-                Login
-            </ButtonWithLoading>
-        </Form>
-    );
+            toast.success("Login success");
+          },
+          onError: (error) => {
+            toast.error(error.error.message);
+          },
+        },
+      );
+    },
+  });
+
+  return (
+    <Form
+      form={form}
+      className="flex flex-col gap-4 mb-1"
+      onSubmit={async (values) => {
+        await mutation.mutateAsync(values);
+      }}
+    >
+      <FormField
+        control={form.control}
+        name="email"
+        defaultValue=""
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>Email Address</FormLabel>
+            <FormControl>
+              <Input
+                autoComplete="email"
+                autoFocus
+                placeholder="example@portabase.io"
+                {...field}
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+      <FormField
+        control={form.control}
+        name="password"
+        defaultValue=""
+        render={({ field }) => (
+          <FormItem>
+            <div className="flex items-center justify-between">
+              <FormLabel>Password</FormLabel>
+              <div className="text-center text-sm">
+                <Link
+                  href={"/forgot-password"}
+                  className="hover:underline ml-1"
+                >
+                  Forgot your password ?
+                </Link>
+              </div>
+            </div>
+            <FormControl>
+              <PasswordInput
+                autoComplete={
+                  isPasskeyEnabled
+                    ? "current-password webauthn"
+                    : "current-password"
+                }
+                placeholder={"Enter your password"}
+                {...field}
+              />
+            </FormControl>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+      <ButtonWithLoading className="mt-2 h-11" isPending={mutation.isPending}>
+        Login
+      </ButtonWithLoading>
+    </Form>
+  );
 };

src/components/wrappers/dashboard/admin/users/admin-user-delete-modal.tsx

@@ -1,75 +1,86 @@
 "use client";
 
-import {useMutation} from "@tanstack/react-query";
-import {User} from "@/db/schema/02_user";
-import {ButtonWithLoading} from "@/components/wrappers/common/button/button-with-loading";
-import {useRouter} from "next/navigation";
+import { useMutation } from "@tanstack/react-query";
+import { User } from "@/db/schema/02_user";
+import { ButtonWithLoading } from "@/components/wrappers/common/button/button-with-loading";
+import { useRouter } from "next/navigation";
 import {
-    AlertDialog,
-    AlertDialogCancel,
-    AlertDialogContent,
-    AlertDialogDescription,
-    AlertDialogFooter,
-    AlertDialogHeader,
-    AlertDialogTitle,
+  AlertDialog,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
 } from "@/components/ui/alert-dialog";
-import {authClient} from "@/lib/auth/auth-client";
-import {toast} from "sonner";
-import {setSuperAdminOwnerOfOrganizationsOwnedByUser} from "@/components/wrappers/dashboard/admin/users/user.action";
+import { authClient } from "@/lib/auth/auth-client";
+import { toast } from "sonner";
+import { setSuperAdminOwnerOfOrganizationsOwnedByUser } from "@/components/wrappers/dashboard/admin/users/user.action";
 
 type AdminDeleteUserModalProps = {
-    open: boolean;
-    user: User;
-    onOpenChange: (open: boolean) => void;
+  open: boolean;
+  user: User;
+  onOpenChange: (open: boolean) => void;
 };
 
-export const AdminDeleteUserModal = ({user, open, onOpenChange}: AdminDeleteUserModalProps) => {
-    const router = useRouter();
+export const AdminDeleteUserModal = ({
+  user,
+  open,
+  onOpenChange,
+}: AdminDeleteUserModalProps) => {
+  const router = useRouter();
 
-    const mutation = useMutation({
-        mutationFn: async () => {
-            const res = await setSuperAdminOwnerOfOrganizationsOwnedByUser({userId: user.id});
-            const result = res?.data;
-            if (result?.success) {
-                await authClient.admin.removeUser(
-                    {
-                        userId: user.id,
-                    },
-                    {
-                        onSuccess: async (response) => {
-                            toast.success(`User ${user.name} successfully deleted`);
-                            onOpenChange(false);
-                            router.refresh();
-                        },
-                        onError: async (error) => {
-                            toast.error("An error has occurred while deleting user");
-                            onOpenChange(false);
-                        },
-                    }
-                );
-            } else {
-                toast.error("An error has occurred while deleting user");
-            }
-        },
-        onError: (error) => {
-            toast.error(error.message);
-        },
-    });
+  const mutation = useMutation({
+    mutationFn: async () => {
+      const res = await setSuperAdminOwnerOfOrganizationsOwnedByUser({
+        userId: user.id,
+      });
+      const result = res?.data;
+      if (result?.success) {
+        await authClient.admin.removeUser(
+          {
+            userId: user.id,
+          },
+          {
+            onSuccess: async () => {
+              toast.success(`User ${user.name} successfully deleted`);
+              onOpenChange(false);
+              router.refresh();
+            },
+            onError: async (error) => {
+              toast.error("An error has occurred while deleting user");
+              onOpenChange(false);
+            },
+          },
+        );
+      } else {
+        toast.error("An error has occurred while deleting user");
+      }
+    },
+    onError: (error) => {
+      toast.error(error.message);
+    },
+  });
 
-    return (
-        <AlertDialog open={open} onOpenChange={onOpenChange}>
-            <AlertDialogContent>
-                <AlertDialogHeader>
-                    <AlertDialogTitle>Are you sure you want to delete {user.name} ?</AlertDialogTitle>
-                    <AlertDialogDescription>This action is irreversible: it will lead to the deletion of the user's
-                        data.</AlertDialogDescription>
-                </AlertDialogHeader>
-                <AlertDialogFooter>
-                    <AlertDialogCancel>Cancel</AlertDialogCancel>
-                    <ButtonWithLoading
-                        onClick={async () => await mutation.mutateAsync()}>Confirm</ButtonWithLoading>
-                </AlertDialogFooter>
-            </AlertDialogContent>
-        </AlertDialog>
-    );
+  return (
+    <AlertDialog open={open} onOpenChange={onOpenChange}>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>
+            Are you sure you want to delete {user.name} ?
+          </AlertDialogTitle>
+          <AlertDialogDescription>
+            This action is irreversible: it will lead to the deletion of the
+            user's data.
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter>
+          <AlertDialogCancel>Cancel</AlertDialogCancel>
+          <ButtonWithLoading onClick={async () => await mutation.mutateAsync()}>
+            Confirm
+          </ButtonWithLoading>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+  );
 };

src/components/wrappers/dashboard/profile/profile-providers.tsx

@@ -63,7 +63,7 @@ export function ProfileProviders({
           callbackURL: "/dashboard",
         });
       } else {
-        result = await authClient.signIn.social({
+        result = await authClient.linkSocial({
           provider: provider.id as any,
           callbackURL: "/dashboard",
         });

src/lib/auth/auth.ts

@@ -134,7 +134,7 @@ export const auth = betterAuth({
       trustedProviders: [
         "credential",
         ...getOAuthProviders().map((p) => p.id),
-        ...oidcProviders.map((p) => p.id),
+        ...oidcProviders.map((p) => p.id)
       ],
       allowDifferentEmails: true,
     },
@@ -338,18 +338,6 @@ export const auth = betterAuth({
           }
         },
       },
-      delete: {
-        before: async (account) => {
-          const provider = SUPPORTED_PROVIDERS.find(
-            (p) => p.id === account.providerId,
-          );
-          if (provider && provider.allowUnlinking === false) {
-            throw new APIError("FORBIDDEN", {
-              message: "Unlinking is disabled for this provider.",
-            });
-          }
-        },
-      },
     },
     user: {
       update: {

src/lib/auth/oauth.ts

@@ -85,7 +85,8 @@ export function getOAuthProviders(): OAuthProvider[] {
     const client = process.env[`AUTH_SOCIAL_${prefix}_CLIENT`];
     if (!client) return;
 
-    const providerId = prefix.toLowerCase();
+    const providerId =
+      prefix.toLowerCase() === "x" ? "twitter" : prefix.toLowerCase();
 
     const envTitle = process.env[`AUTH_SOCIAL_${prefix}_TITLE`];
     const envDesc = process.env[`AUTH_SOCIAL_${prefix}_DESC`];

src/lib/auth/permissions.ts

@@ -1,76 +1,72 @@
-import {createAccessControl} from "better-auth/plugins/access";
-import {defaultStatements, adminAc} from "better-auth/plugins/admin/access";
+import { createAccessControl } from "better-auth/plugins/access";
+import { defaultStatements, adminAc } from "better-auth/plugins/admin/access";
 import {
-    defaultStatements as orgDefaultStatements,
-    adminAc as orgAdminAc,
-    ownerAc as orgOwnerAc,
-    memberAc as orgMemberAc
+  defaultStatements as orgDefaultStatements,
+  adminAc as orgAdminAc,
+  ownerAc as orgOwnerAc,
+  memberAc as orgMemberAc,
 } from "better-auth/plugins/organization/access";
 
 const statement = {
-    ...defaultStatements,
-    ...orgDefaultStatements,
-    project: ["create", "list", "update", "delete"],
-    database: ["create", "list", "update", "delete", "backup"],
-    agent: ["create", "list", "update", "delete"],
-
+  ...defaultStatements,
+  ...orgDefaultStatements,
+  project: ["create", "list", "update", "delete"],
+  database: ["create", "list", "update", "delete", "backup"],
+  agent: ["create", "list", "update", "delete"],
 } as const;
 
 const ac = createAccessControl(statement);
 
-
 const superadmin = ac.newRole({
-    project: ["create", "list", "update", "delete"],
-    database: ["create", "list", "update", "delete"],
-    agent: ["create", "list", "update", "delete"],
-    ...adminAc.statements,
-    ...orgMemberAc.statements,
-    ...orgAdminAc.statements,
-    ...orgOwnerAc.statements,
+  project: ["create", "list", "update", "delete"],
+  database: ["create", "list", "update", "delete"],
+  agent: ["create", "list", "update", "delete"],
+  ...adminAc.statements,
+  ...orgMemberAc.statements,
+  ...orgAdminAc.statements,
+  ...orgOwnerAc.statements,
 });
 
 const admin = ac.newRole({
-    project: ["create", "list", "update", "delete"],
-    database: ["create", "list", "update", "delete"],
-    agent: ["create", "list", "update", "delete"],
-    ...adminAc.statements,
-    ...orgMemberAc.statements,
-    ...orgAdminAc.statements,
+  project: ["create", "list", "update", "delete"],
+  database: ["create", "list", "update", "delete"],
+  agent: ["create", "list", "update", "delete"],
+  ...adminAc.statements,
+  ...orgMemberAc.statements,
+  ...orgAdminAc.statements,
 });
 
 const user = ac.newRole({
-    project: [],
-    database: [],
-    agent: [],
+  project: [],
+  database: [],
+  agent: [],
 });
 
 const pending = ac.newRole({
-    project: [],
-    database: [],
-    agent: [],
+  project: [],
+  database: [],
+  agent: [],
 });
 
 //org
 const orgMember = ac.newRole({
-    project: ["list"],
-    database: ["list"],
-    agent: ["list"],
-    ...orgMemberAc.statements,
+  project: ["list"],
+  database: ["list"],
+  agent: ["list"],
+  ...orgMemberAc.statements,
 });
 
 const orgAdmin = ac.newRole({
-    project: ["create", "update"],
-    ...orgMemberAc.statements,
-    ...orgAdminAc.statements,
+  project: ["create", "update"],
+  ...orgMemberAc.statements,
+  ...orgAdminAc.statements,
 });
 
 const orgOwner = ac.newRole({
-    project: ["create", "update", "delete"],
-    ...orgMemberAc.statements,
-    ...orgAdminAc.statements,
-    ...orgOwnerAc.statements,
-
+  project: ["create", "update", "delete"],
+  ...orgMemberAc.statements,
+  ...orgAdminAc.statements,
+  ...orgOwnerAc.statements,
 });
 
-
-export {ac, admin, superadmin, user, pending, orgAdmin, orgMember, orgOwner};
+export { ac, admin, superadmin, user, pending, orgAdmin, orgMember, orgOwner };