feature(auth): replace clerk.com with custom auth (#103)
* feature(auth): replace clerk.com with custom auth * minor fixes * remove notification preferences * decrease live events interval fix(api): cookies.. # Conflicts: # .gitignore # apps/api/src/index.ts # apps/dashboard/src/app/providers.tsx # packages/trpc/src/trpc.ts
This commit is contained in:
committed by
Carl-Gerhard Lindesvärd
parent
f28802b1c2
commit
d31d9924a5
11
apps/dashboard/src/components/auth/or.tsx
Normal file
11
apps/dashboard/src/components/auth/or.tsx
Normal file
@@ -0,0 +1,11 @@
|
||||
import { cn } from '@/utils/cn';
|
||||
|
||||
export function Or({ className }: { className?: string }) {
|
||||
return (
|
||||
<div className={cn('row items-center gap-2', className)}>
|
||||
<div className="h-px w-full bg-border" />
|
||||
<span className="text-muted-foreground">OR</span>
|
||||
<div className="h-px w-full bg-border" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
57
apps/dashboard/src/components/auth/reset-password-form.tsx
Normal file
57
apps/dashboard/src/components/auth/reset-password-form.tsx
Normal file
@@ -0,0 +1,57 @@
|
||||
'use client';
|
||||
|
||||
import { InputWithLabel } from '@/components/forms/input-with-label';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { api } from '@/trpc/client';
|
||||
import { zodResolver } from '@hookform/resolvers/zod';
|
||||
import { zResetPassword } from '@openpanel/validation';
|
||||
import { useRouter, useSearchParams } from 'next/navigation';
|
||||
import { useForm } from 'react-hook-form';
|
||||
import { toast } from 'sonner';
|
||||
import type { z } from 'zod';
|
||||
|
||||
const validator = zResetPassword;
|
||||
type IForm = z.infer<typeof validator>;
|
||||
|
||||
export function ResetPasswordForm() {
|
||||
const searchParams = useSearchParams();
|
||||
const token = searchParams.get('token') ?? null;
|
||||
const router = useRouter();
|
||||
const mutation = api.auth.resetPassword.useMutation({
|
||||
onSuccess() {
|
||||
toast.success('Password reset successfully', {
|
||||
description: 'You can now login with your new password',
|
||||
});
|
||||
router.push('/login');
|
||||
},
|
||||
onError(error) {
|
||||
toast.error(error.message);
|
||||
},
|
||||
});
|
||||
|
||||
const form = useForm<IForm>({
|
||||
resolver: zodResolver(validator),
|
||||
defaultValues: {
|
||||
token: token ?? '',
|
||||
password: '',
|
||||
},
|
||||
});
|
||||
|
||||
const onSubmit = form.handleSubmit(async (data) => {
|
||||
mutation.mutate(data);
|
||||
});
|
||||
|
||||
return (
|
||||
<div className="col gap-8">
|
||||
<form onSubmit={onSubmit}>
|
||||
<InputWithLabel
|
||||
label="New password"
|
||||
placeholder="New password"
|
||||
type="password"
|
||||
{...form.register('password')}
|
||||
/>
|
||||
<Button type="submit">Reset password</Button>
|
||||
</form>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
67
apps/dashboard/src/components/auth/sign-in-email-form.tsx
Normal file
67
apps/dashboard/src/components/auth/sign-in-email-form.tsx
Normal file
@@ -0,0 +1,67 @@
|
||||
'use client';
|
||||
import { pushModal } from '@/modals';
|
||||
import { api } from '@/trpc/client';
|
||||
import { zodResolver } from '@hookform/resolvers/zod';
|
||||
import { zSignInEmail } from '@openpanel/validation';
|
||||
import { useRouter } from 'next/navigation';
|
||||
import { type SubmitHandler, useForm } from 'react-hook-form';
|
||||
import { toast } from 'sonner';
|
||||
import type { z } from 'zod';
|
||||
import { InputWithLabel } from '../forms/input-with-label';
|
||||
import { Button } from '../ui/button';
|
||||
|
||||
const validator = zSignInEmail;
|
||||
type IForm = z.infer<typeof validator>;
|
||||
|
||||
export function SignInEmailForm() {
|
||||
const router = useRouter();
|
||||
const mutation = api.auth.signInEmail.useMutation({
|
||||
onSuccess(res) {
|
||||
toast.success('Successfully signed in');
|
||||
router.push('/');
|
||||
},
|
||||
onError(error) {
|
||||
toast.error(error.message);
|
||||
},
|
||||
});
|
||||
const form = useForm<IForm>({
|
||||
resolver: zodResolver(validator),
|
||||
});
|
||||
const onSubmit: SubmitHandler<IForm> = (values) => {
|
||||
mutation.mutate({
|
||||
...values,
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
<form
|
||||
onSubmit={form.handleSubmit(onSubmit, (err) => console.log(err))}
|
||||
className="col gap-6"
|
||||
>
|
||||
<h3 className="text-2xl font-medium text-left">Sign in with email</h3>
|
||||
<InputWithLabel
|
||||
{...form.register('email')}
|
||||
error={form.formState.errors.email?.message}
|
||||
label="Email"
|
||||
/>
|
||||
<InputWithLabel
|
||||
{...form.register('password')}
|
||||
error={form.formState.errors.password?.message}
|
||||
label="Password"
|
||||
type="password"
|
||||
/>
|
||||
<Button type="submit">Sign in</Button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() =>
|
||||
pushModal('RequestPasswordReset', {
|
||||
email: form.getValues('email'),
|
||||
})
|
||||
}
|
||||
className="text-sm text-muted-foreground hover:underline"
|
||||
>
|
||||
Forgot password?
|
||||
</button>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
45
apps/dashboard/src/components/auth/sign-in-github.tsx
Normal file
45
apps/dashboard/src/components/auth/sign-in-github.tsx
Normal file
@@ -0,0 +1,45 @@
|
||||
'use client';
|
||||
|
||||
import { api } from '@/trpc/client';
|
||||
import { useSearchParams } from 'next/navigation';
|
||||
import { Button } from '../ui/button';
|
||||
|
||||
export function SignInGithub({ type }: { type: 'sign-in' | 'sign-up' }) {
|
||||
const searchParams = useSearchParams();
|
||||
const inviteId = searchParams.get('inviteId');
|
||||
const mutation = api.auth.signInOAuth.useMutation({
|
||||
onSuccess(res) {
|
||||
if (res.url) {
|
||||
window.location.href = res.url;
|
||||
}
|
||||
},
|
||||
});
|
||||
const title = () => {
|
||||
if (type === 'sign-in') return 'Sign in with Github';
|
||||
if (type === 'sign-up') return 'Sign up with Github';
|
||||
};
|
||||
return (
|
||||
<Button
|
||||
className="md:flex-1"
|
||||
size="lg"
|
||||
onClick={() =>
|
||||
mutation.mutate({
|
||||
provider: 'github',
|
||||
inviteId: type === 'sign-up' ? inviteId : undefined,
|
||||
})
|
||||
}
|
||||
>
|
||||
<svg
|
||||
className="size-4 mr-2"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
width="24"
|
||||
height="24"
|
||||
viewBox="0 0 24 24"
|
||||
fill="currentColor"
|
||||
>
|
||||
<path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z" />
|
||||
</svg>
|
||||
{title()}
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
57
apps/dashboard/src/components/auth/sign-in-google.tsx
Normal file
57
apps/dashboard/src/components/auth/sign-in-google.tsx
Normal file
@@ -0,0 +1,57 @@
|
||||
'use client';
|
||||
|
||||
import { api } from '@/trpc/client';
|
||||
import { useSearchParams } from 'next/navigation';
|
||||
import { Button } from '../ui/button';
|
||||
|
||||
export function SignInGoogle({ type }: { type: 'sign-in' | 'sign-up' }) {
|
||||
const searchParams = useSearchParams();
|
||||
const inviteId = searchParams.get('inviteId');
|
||||
const mutation = api.auth.signInOAuth.useMutation({
|
||||
onSuccess(res) {
|
||||
if (res.url) {
|
||||
window.location.href = res.url;
|
||||
}
|
||||
},
|
||||
});
|
||||
const title = () => {
|
||||
if (type === 'sign-in') return 'Sign in with Google';
|
||||
if (type === 'sign-up') return 'Sign up with Google';
|
||||
};
|
||||
return (
|
||||
<Button
|
||||
className="md:flex-1"
|
||||
size="lg"
|
||||
onClick={() =>
|
||||
mutation.mutate({
|
||||
provider: 'google',
|
||||
inviteId: type === 'sign-up' ? inviteId : undefined,
|
||||
})
|
||||
}
|
||||
>
|
||||
<svg
|
||||
className="size-4 mr-2"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
fill="#4285F4"
|
||||
d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
|
||||
/>
|
||||
<path
|
||||
fill="#34A853"
|
||||
d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
|
||||
/>
|
||||
<path
|
||||
fill="#FBBC05"
|
||||
d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
|
||||
/>
|
||||
<path
|
||||
fill="#EA4335"
|
||||
d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
|
||||
/>
|
||||
</svg>
|
||||
{title()}
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
83
apps/dashboard/src/components/auth/sign-up-email-form.tsx
Normal file
83
apps/dashboard/src/components/auth/sign-up-email-form.tsx
Normal file
@@ -0,0 +1,83 @@
|
||||
'use client';
|
||||
|
||||
import { api } from '@/trpc/client';
|
||||
import { zodResolver } from '@hookform/resolvers/zod';
|
||||
import { zSignUpEmail } from '@openpanel/validation';
|
||||
import { useRouter, useSearchParams } from 'next/navigation';
|
||||
import { type SubmitHandler, useForm } from 'react-hook-form';
|
||||
import { toast } from 'sonner';
|
||||
import type { z } from 'zod';
|
||||
import { InputWithLabel } from '../forms/input-with-label';
|
||||
import { Button } from '../ui/button';
|
||||
|
||||
const validator = zSignUpEmail;
|
||||
type IForm = z.infer<typeof validator>;
|
||||
|
||||
export function SignUpEmailForm() {
|
||||
const router = useRouter();
|
||||
const searchParams = useSearchParams();
|
||||
const mutation = api.auth.signUpEmail.useMutation({
|
||||
onSuccess(res) {
|
||||
toast.success('Successfully signed up');
|
||||
router.push('/');
|
||||
},
|
||||
});
|
||||
const form = useForm<IForm>({
|
||||
resolver: zodResolver(validator),
|
||||
});
|
||||
const onSubmit: SubmitHandler<IForm> = (values) => {
|
||||
mutation.mutate({
|
||||
...values,
|
||||
inviteId: searchParams.get('inviteId'),
|
||||
});
|
||||
};
|
||||
return (
|
||||
<form className="col gap-8" onSubmit={form.handleSubmit(onSubmit)}>
|
||||
<div className="row gap-8 w-full flex-1">
|
||||
<InputWithLabel
|
||||
label="First name"
|
||||
className="flex-1"
|
||||
type="text"
|
||||
{...form.register('firstName')}
|
||||
error={form.formState.errors.firstName?.message}
|
||||
/>
|
||||
<InputWithLabel
|
||||
label="Last name"
|
||||
className="flex-1"
|
||||
type="text"
|
||||
{...form.register('lastName')}
|
||||
error={form.formState.errors.lastName?.message}
|
||||
/>
|
||||
</div>
|
||||
<InputWithLabel
|
||||
label="Email"
|
||||
className="w-full"
|
||||
type="email"
|
||||
{...form.register('email')}
|
||||
error={form.formState.errors.email?.message}
|
||||
/>
|
||||
<div className="row gap-8 w-full">
|
||||
<InputWithLabel
|
||||
label="Password"
|
||||
className="flex-1"
|
||||
type="password"
|
||||
{...form.register('password')}
|
||||
error={form.formState.errors.password?.message}
|
||||
/>
|
||||
<InputWithLabel
|
||||
label="Confirm password"
|
||||
className="flex-1"
|
||||
type="password"
|
||||
{...form.register('confirmPassword')}
|
||||
error={form.formState.errors.confirmPassword?.message}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid grid-cols-2 gap-8">
|
||||
<div />
|
||||
<Button type="submit" className="w-full" size="lg">
|
||||
Create account
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
@@ -37,8 +37,13 @@ export const WithLabel = ({
|
||||
)}
|
||||
</Label>
|
||||
{error && (
|
||||
<Tooltiper asChild content={error}>
|
||||
<div className="flex items-center gap-1 leading-none text-destructive">
|
||||
<Tooltiper
|
||||
asChild
|
||||
content={error}
|
||||
tooltipClassName="max-w-80 leading-normal"
|
||||
align="end"
|
||||
>
|
||||
<div className="flex items-center gap-1 leading-none text-destructive">
|
||||
Issues
|
||||
<BanIcon size={14} />
|
||||
</div>
|
||||
|
||||
@@ -18,7 +18,9 @@ import { useTheme } from 'next-themes';
|
||||
import * as React from 'react';
|
||||
|
||||
import { useAppParams } from '@/hooks/useAppParams';
|
||||
import { useAuth } from '@clerk/nextjs';
|
||||
import { useLogout } from '@/hooks/useLogout';
|
||||
import { api } from '@/trpc/client';
|
||||
import { useRouter } from 'next/navigation';
|
||||
import { ProjectLink } from './links';
|
||||
|
||||
interface Props {
|
||||
@@ -26,9 +28,10 @@ interface Props {
|
||||
}
|
||||
|
||||
export default function SettingsToggle({ className }: Props) {
|
||||
const router = useRouter();
|
||||
const { setTheme, theme } = useTheme();
|
||||
const { projectId } = useAppParams();
|
||||
const auth = useAuth();
|
||||
const logout = useLogout();
|
||||
|
||||
return (
|
||||
<DropdownMenu>
|
||||
@@ -101,12 +104,7 @@ export default function SettingsToggle({ className }: Props) {
|
||||
</DropdownMenuSubContent>
|
||||
</DropdownMenuSub>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem
|
||||
className="text-red-600"
|
||||
onClick={() => {
|
||||
auth.signOut();
|
||||
}}
|
||||
>
|
||||
<DropdownMenuItem className="text-red-600" onClick={() => logout()}>
|
||||
Logout
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
|
||||
@@ -44,10 +44,10 @@ export function useColumns(
|
||||
),
|
||||
},
|
||||
{
|
||||
accessorKey: 'access',
|
||||
accessorKey: 'projectAccess',
|
||||
header: 'Access',
|
||||
cell: ({ row }) => {
|
||||
const access = pathOr<string[]>([], ['meta', 'access'], row.original);
|
||||
const access = row.original.projectAccess;
|
||||
return (
|
||||
<>
|
||||
{access.map((id) => {
|
||||
@@ -102,7 +102,7 @@ function ActionCell({ row }: { row: Row<IServiceInvite> }) {
|
||||
<DropdownMenuItem
|
||||
className="text-destructive"
|
||||
onClick={() => {
|
||||
revoke.mutate({ memberId: row.original.id });
|
||||
revoke.mutate({ inviteId: row.original.id });
|
||||
}}
|
||||
>
|
||||
Revoke invite
|
||||
|
||||
@@ -15,6 +15,7 @@ import { useRef, useState } from 'react';
|
||||
import { toast } from 'sonner';
|
||||
|
||||
import { ACTIONS } from '@/components/data-table';
|
||||
import { useAuth } from '@/hooks/useAuth';
|
||||
import type { IServiceMember, IServiceProject } from '@openpanel/db';
|
||||
|
||||
export function useColumns(projects: IServiceProject[]) {
|
||||
@@ -77,6 +78,8 @@ function AccessCell({
|
||||
row: Row<IServiceMember>;
|
||||
projects: IServiceProject[];
|
||||
}) {
|
||||
const auth = useAuth();
|
||||
const currentUserId = auth.data?.userId;
|
||||
const initial = useRef(row.original.access.map((item) => item.projectId));
|
||||
const [access, setAccess] = useState<string[]>(
|
||||
row.original.access.map((item) => item.projectId),
|
||||
@@ -88,6 +91,16 @@ function AccessCell({
|
||||
},
|
||||
});
|
||||
|
||||
if (auth.isLoading) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (currentUserId === row.original.userId) {
|
||||
return (
|
||||
<div className="text-muted-foreground">Can't change your own access</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<ComboboxAdvanced
|
||||
placeholder="Restrict access to projects"
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
'use client';
|
||||
|
||||
import { SignOutButton as ClerkSignOutButton } from '@clerk/nextjs';
|
||||
import { LogOutIcon } from 'lucide-react';
|
||||
|
||||
import { useLogout } from '@/hooks/useLogout';
|
||||
import { Button } from './ui/button';
|
||||
|
||||
const SignOutButton = () => {
|
||||
const logout = useLogout();
|
||||
return (
|
||||
<ClerkSignOutButton>
|
||||
<Button variant={'secondary'} icon={LogOutIcon}>
|
||||
Sign out
|
||||
</Button>
|
||||
</ClerkSignOutButton>
|
||||
<Button variant={'secondary'} icon={LogOutIcon} onClick={() => logout()}>
|
||||
Sign out
|
||||
</Button>
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
@@ -17,23 +17,24 @@ export default function Syntax({ code }: SyntaxProps) {
|
||||
<div className="group relative">
|
||||
<button
|
||||
type="button"
|
||||
className="absolute right-1 top-1 rounded bg-card p-2 opacity-0 transition-opacity group-hover:opacity-100"
|
||||
className="absolute right-1 top-1 rounded bg-card p-2 opacity-0 transition-opacity group-hover:opacity-100 row items-center gap-2"
|
||||
onClick={() => {
|
||||
clipboard(code);
|
||||
}}
|
||||
>
|
||||
<span>Copy</span>
|
||||
<CopyIcon size={12} />
|
||||
</button>
|
||||
<SyntaxHighlighter
|
||||
// wrapLongLines
|
||||
style={docco}
|
||||
language="html"
|
||||
customStyle={{
|
||||
borderRadius: '0.5rem',
|
||||
padding: '1rem',
|
||||
paddingTop: '0.5rem',
|
||||
paddingBottom: '0.5rem',
|
||||
fontSize: 14,
|
||||
lineHeight: 1.3,
|
||||
}}
|
||||
>
|
||||
{code}
|
||||
|
||||
@@ -87,7 +87,7 @@ const SheetHeader = ({
|
||||
}: React.HTMLAttributes<HTMLDivElement>) => (
|
||||
<div
|
||||
className={cn(
|
||||
'relative -m-6 mb-6 flex justify-between rounded-t-lg border-b bg-def-100 p-6',
|
||||
'relative -m-6 mb-0 flex justify-between rounded-t-lg border-b bg-def-100 p-6',
|
||||
className,
|
||||
)}
|
||||
{...props}
|
||||
|
||||
@@ -41,6 +41,7 @@ interface TooltiperProps {
|
||||
tooltipClassName?: string;
|
||||
onClick?: () => void;
|
||||
side?: 'top' | 'right' | 'bottom' | 'left';
|
||||
align?: 'start' | 'center' | 'end';
|
||||
delayDuration?: number;
|
||||
sideOffset?: number;
|
||||
disabled?: boolean;
|
||||
@@ -56,6 +57,7 @@ export function Tooltiper({
|
||||
delayDuration = 0,
|
||||
sideOffset = 10,
|
||||
disabled = false,
|
||||
align,
|
||||
}: TooltiperProps) {
|
||||
if (disabled) return children;
|
||||
return (
|
||||
@@ -68,6 +70,7 @@ export function Tooltiper({
|
||||
sideOffset={sideOffset}
|
||||
side={side}
|
||||
className={tooltipClassName}
|
||||
align={align}
|
||||
>
|
||||
{content}
|
||||
</TooltipContent>
|
||||
|
||||
Reference in New Issue
Block a user