Refactor auth methods, remove i18n, and update UI

This commit covers a variety of actions that includes the refactoring of the authentication components to accept paths and invite tokens as props instead of a singular callback prop, thereby improving the component's flexibility. This refactor process removes 'withI18n' calls as i18n functionalities are no longer used. The commit also contains several adjustments to the UI components, including the authorization layout, pricing table, and sign-up page. It also includes minor changes to error messages, specifically those related to password resetting. Lastly, several peer dependencies are removed in the 'package.json' files and changes made to the 'browser.client.ts' file providing a significant code cleanup.
2024-03-27 01:19:20 +08:00
parent cabdd832df
commit 8a614bd6fc
29 changed files with 215 additions and 204 deletions
--- a/packages/billing-gateway/package.json
+++ b/packages/billing-gateway/package.json
@@ -14,8 +14,6 @@
    "./components": "./src/components/index.ts"
  },
  "peerDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
    "zod": "^3.22.4",
    "@kit/ui": "0.1.0",
    "@kit/stripe": "0.1.0",
--- a/packages/billing/package.json
+++ b/packages/billing/package.json
@@ -15,8 +15,6 @@
    "./schema": "./src/schema/index.ts"
  },
  "peerDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
    "zod": "^3.22.4",
    "@kit/ui": "0.1.0",
    "@kit/supabase": "0.1.0",
--- a/packages/billing/src/components/pricing-table.tsx
+++ b/packages/billing/src/components/pricing-table.tsx
@@ -53,7 +53,7 @@ export function PricingTable({
      <div
        className={
          'flex flex-col items-start space-y-6 lg:space-y-0' +
-          ' justify-center lg:flex-row lg:space-x-4'
+          ' justify-center space-x-2 lg:flex-row'
        }
      >
        {config.products.map((product) => {
@@ -107,6 +107,7 @@ function PricingItem(

    product: {
      name: string;
+      currency: string;
      description: string;
      badge?: string;
      highlighted?: boolean;
@@ -122,12 +123,8 @@ function PricingItem(
      className={cn(
        `
         relative flex w-full flex-col justify-between space-y-6 rounded-lg
-         p-6 lg:w-4/12 xl:max-w-xs xl:p-8 2xl:w-3/12
+         border p-6 lg:w-4/12 xl:max-w-xs xl:p-8 2xl:w-3/12
      `,
-        {
-          ['dark:border-dark-900 border border-gray-100']: !highlighted,
-          ['border-primary border-2']: highlighted,
-        },
      )}
    >
      <div className={'flex flex-col space-y-2.5'}>
@@ -142,7 +139,7 @@ function PricingItem(
                `flex space-x-1 rounded-md px-2 py-1 text-xs font-medium`,
                {
                  ['text-primary-foreground bg-primary']: highlighted,
-                  ['bg-gray-50 text-gray-500 dark:text-gray-800']: !highlighted,
+                  ['text-muted-foreground bg-gray-50']: !highlighted,
                },
              )}
            >
@@ -161,7 +158,10 @@ function PricingItem(
      </div>

      <div className={'flex items-center space-x-1'}>
-        <Price>{props.plan.price}</Price>
+        <Price>
+          <span className={'text-base'}>{props.product.currency}</span>
+          {props.plan.price}
+        </Price>

        <If condition={props.plan.name}>
          <span className={cn(`text-muted-foreground text-base lowercase`)}>
@@ -223,10 +223,12 @@ function Price({ children }: React.PropsWithChildren) {
  return (
    <div
      key={key}
-      className={`animate-in slide-in-from-left-4 fade-in duration-500`}
+      className={`animate-in slide-in-from-left-4 fade-in items-center duration-500`}
    >
      <span
-        className={'text-2xl font-bold lg:text-3xl xl:text-4xl 2xl:text-5xl'}
+        className={
+          'flex items-center text-2xl font-bold lg:text-3xl xl:text-4xl 2xl:text-5xl'
+        }
      >
        {children}
      </span>
--- a/packages/features/accounts/package.json
+++ b/packages/features/accounts/package.json
@@ -21,8 +21,6 @@
    "@kit/tsconfig": "0.1.0"
  },
  "peerDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
    "@kit/supabase": "0.1.0",
    "@kit/ui": "0.1.0",
    "@kit/shared": "0.1.0",
--- a/packages/features/auth/src/components/auth-layout.tsx
+++ b/packages/features/auth/src/components/auth-layout.tsx
@@ -9,7 +9,7 @@ export function AuthLayoutShell({
      className={
        'flex h-screen flex-col items-center justify-center space-y-4' +
        ' dark:lg:bg-background md:space-y-8 lg:space-y-12 lg:bg-gray-50' +
-        ' animate-in fade-in slide-in-from-top-8 duration-1000'
+        ' animate-in fade-in slide-in-from-top-8 zoom-in-95 duration-1000'
      }
    >
      {Logo && <Logo />}
--- a/packages/features/auth/src/components/magic-link-auth-container.tsx
+++ b/packages/features/auth/src/components/magic-link-auth-container.tsx
@@ -1,98 +1,132 @@
 'use client';

-import type { FormEventHandler } from 'react';
-import { useCallback } from 'react';
-
+import { zodResolver } from '@hookform/resolvers/zod';
+import { CheckIcon } from '@radix-ui/react-icons';
+import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { toast } from 'sonner';
+import { z } from 'zod';

 import { useSignInWithOtp } from '@kit/supabase/hooks/use-sign-in-with-otp';
-import { Alert, AlertDescription } from '@kit/ui/alert';
+import { Alert, AlertDescription, AlertTitle } from '@kit/ui/alert';
 import { Button } from '@kit/ui/button';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@kit/ui/form';
 import { If } from '@kit/ui/if';
 import { Input } from '@kit/ui/input';
-import { Label } from '@kit/ui/label';
 import { Trans } from '@kit/ui/trans';

 export function MagicLinkAuthContainer({
-  inviteCode,
+  inviteToken,
  redirectUrl,
 }: {
-  inviteCode?: string;
+  inviteToken?: string;
  redirectUrl: string;
 }) {
  const { t } = useTranslation();
  const signInWithOtpMutation = useSignInWithOtp();

-  const onSubmit: FormEventHandler<HTMLFormElement> = useCallback(
-    (event) => {
-      event.preventDefault();
+  const form = useForm({
+    resolver: zodResolver(
+      z.object({
+        email: z.string().email(),
+      }),
+    ),
+    defaultValues: {
+      email: '',
+    },
+  });

-      const target = event.currentTarget;
-      const data = new FormData(target);
-      const email = data.get('email') as string;
-      const queryParams = inviteCode ? `?inviteCode=${inviteCode}` : '';
+  const onSubmit = ({ email }: { email: string }) => {
+    const queryParams = inviteToken ? `?invite_token=${inviteToken}` : '';
+    const emailRedirectTo = [redirectUrl, queryParams].join('');

-      const emailRedirectTo = [redirectUrl, queryParams].join('');
-
-      const promise = signInWithOtpMutation.mutateAsync({
+    const promise = () =>
+      signInWithOtpMutation.mutateAsync({
        email,
        options: {
          emailRedirectTo,
        },
      });

-      toast.promise(promise, {
-        loading: t('auth:sendingEmailLink'),
-        success: t(`auth:sendLinkSuccessToast`),
-        error: t(`auth:errors.link`),
-      });
-    },
-    [inviteCode, redirectUrl, signInWithOtpMutation, t],
-  );
+    toast.promise(promise, {
+      loading: t('auth:sendingEmailLink'),
+      success: t(`auth:sendLinkSuccessToast`),
+      error: t(`auth:errors.link`),
+    });
+  };

  if (signInWithOtpMutation.data) {
    return (
      <Alert variant={'success'}>
-        <AlertDescription>
+        <CheckIcon className={'h-4'} />
+
+        <AlertTitle>
          <Trans i18nKey={'auth:sendLinkSuccess'} />
+        </AlertTitle>
+
+        <AlertDescription>
+          <Trans i18nKey={'auth:sendLinkSuccessDescription'} />
        </AlertDescription>
      </Alert>
    );
  }

  return (
-    <form className={'w-full'} onSubmit={onSubmit}>
-      <If condition={signInWithOtpMutation.error}>
-        <Alert variant={'destructive'}>
-          <AlertDescription>
-            <Trans i18nKey={'auth:errors.link'} />
-          </AlertDescription>
-        </Alert>
-      </If>
+    <Form {...form}>
+      <form className={'w-full'} onSubmit={form.handleSubmit(onSubmit)}>
+        <If condition={signInWithOtpMutation.error}>
+          <Alert variant={'destructive'}>
+            <AlertTitle>
+              <Trans i18nKey={'auth:errors.generic'} />
+            </AlertTitle>

-      <div className={'flex flex-col space-y-4'}>
-        <Label>
-          <Trans i18nKey={'common:emailAddress'} />
+            <AlertDescription>
+              <Trans i18nKey={'auth:errors.link'} />
+            </AlertDescription>
+          </Alert>
+        </If>

-          <Input
-            data-test={'email-input'}
-            required
-            type="email"
-            placeholder={t('auth:emailPlaceholder')}
+        <div className={'flex flex-col space-y-4'}>
+          <FormField
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <Trans i18nKey={'common:emailAddress'} />
+                </FormLabel>
+
+                <FormControl>
+                  <Input
+                    data-test={'email-input'}
+                    required
+                    type="email"
+                    placeholder={t('auth:emailPlaceholder')}
+                    {...field}
+                  />
+                </FormControl>
+
+                <FormMessage />
+              </FormItem>
+            )}
            name={'email'}
          />
-        </Label>

-        <Button disabled={signInWithOtpMutation.isPending}>
-          <If
-            condition={signInWithOtpMutation.isPending}
-            fallback={<Trans i18nKey={'auth:sendEmailLink'} />}
-          >
-            <Trans i18nKey={'auth:sendingEmailLink'} />
-          </If>
-        </Button>
-      </div>
-    </form>
+          <Button disabled={signInWithOtpMutation.isPending}>
+            <If
+              condition={signInWithOtpMutation.isPending}
+              fallback={<Trans i18nKey={'auth:sendEmailLink'} />}
+            >
+              <Trans i18nKey={'auth:sendingEmailLink'} />
+            </If>
+          </Button>
+        </div>
+      </form>
+    </Form>
  );
 }
--- a/packages/features/auth/src/components/oauth-providers.tsx
+++ b/packages/features/auth/src/components/oauth-providers.tsx
@@ -13,10 +13,13 @@ import { AuthErrorAlert } from './auth-error-alert';
 import { AuthProviderButton } from './auth-provider-button';

 export const OauthProviders: React.FC<{
-  returnUrl?: string;
-  inviteCode?: string;
+  inviteToken?: string;
  enabledProviders: Provider[];
-  redirectUrl: string;
+
+  paths: {
+    callback: string;
+    returnPath: string;
+  };
 }> = (props) => {
  const signInWithProviderMutation = useSignInWithProvider();

@@ -57,16 +60,16 @@ export const OauthProviders: React.FC<{
                  const origin = window.location.origin;
                  const queryParams = new URLSearchParams();

-                  if (props.returnUrl) {
-                    queryParams.set('next', props.returnUrl);
+                  if (props.paths.returnPath) {
+                    queryParams.set('next', props.paths.returnPath);
                  }

-                  if (props.inviteCode) {
-                    queryParams.set('inviteCode', props.inviteCode);
+                  if (props.inviteToken) {
+                    queryParams.set('invite_token', props.inviteToken);
                  }

                  const redirectPath = [
-                    props.redirectUrl,
+                    props.paths.callback,
                    queryParams.toString(),
                  ].join('?');

--- a/packages/features/auth/src/components/password-reset-form.tsx
+++ b/packages/features/auth/src/components/password-reset-form.tsx
@@ -3,6 +3,11 @@
 import Link from 'next/link';

 import { zodResolver } from '@hookform/resolvers/zod';
+import {
+  ArrowLeftIcon,
+  CheckIcon,
+  ExclamationTriangleIcon,
+} from '@radix-ui/react-icons';
 import { useForm } from 'react-hook-form';
 import type { z } from 'zod';

@@ -112,7 +117,9 @@ export function PasswordResetForm(params: { redirectTo: string }) {
 function SuccessState() {
  return (
    <div className={'flex flex-col space-y-4'}>
-      <Alert variant={'destructive'}>
+      <Alert variant={'success'}>
+        <CheckIcon className={'s-6'} />
+
        <AlertTitle>
          <Trans i18nKey={'account:updatePasswordSuccess'} />
        </AlertTitle>
@@ -123,8 +130,12 @@ function SuccessState() {
      </Alert>

      <Link href={'/'}>
-        <Button variant={'outline'}>
-          <Trans i18nKey={'common:backToHomePage'} />
+        <Button variant={'outline'} className={'w-full'}>
+          <ArrowLeftIcon className={'mr-2 h-4'} />
+
+          <span>
+            <Trans i18nKey={'common:backToHomePage'} />
+          </span>
        </Button>
      </Link>
    </div>
@@ -135,12 +146,14 @@ function ErrorState(props: { onRetry: () => void }) {
  return (
    <div className={'flex flex-col space-y-4'}>
      <Alert variant={'destructive'}>
+        <ExclamationTriangleIcon className={'s-6'} />
+
        <AlertTitle>
-          <Trans i18nKey={'auth:resetPasswordError'} />
+          <Trans i18nKey={'common:genericError'} />
        </AlertTitle>

        <AlertDescription>
-          <Trans i18nKey={'common:genericError'} />
+          <Trans i18nKey={'auth:resetPasswordError'} />
        </AlertDescription>
      </Alert>

--- a/packages/features/auth/src/components/password-reset-request-container.tsx
+++ b/packages/features/auth/src/components/password-reset-request-container.tsx
@@ -26,7 +26,9 @@ const PasswordResetSchema = z.object({
  email: z.string().email(),
 });

-export function PasswordResetRequestContainer(params: { redirectTo: string }) {
+export function PasswordResetRequestContainer(params: {
+  redirectPath: string;
+}) {
  const { t } = useTranslation('auth');
  const resetPasswordMutation = useRequestResetPassword();
  const error = resetPasswordMutation.error;
@@ -55,7 +57,8 @@ export function PasswordResetRequestContainer(params: { redirectTo: string }) {
            onSubmit={form.handleSubmit(({ email }) => {
              return resetPasswordMutation.mutateAsync({
                email,
-                redirectTo: params.redirectTo,
+                redirectTo: new URL(params.redirectPath, window.location.origin)
+                  .href,
              });
            })}
            className={'w-full'}
--- a/packages/features/auth/src/components/sign-in-methods-container.tsx
+++ b/packages/features/auth/src/components/sign-in-methods-container.tsx
@@ -9,7 +9,6 @@ import { isBrowser } from '@supabase/ssr';
 import { Divider } from '@kit/ui/divider';
 import { If } from '@kit/ui/if';

-import { EmailOtpContainer } from './email-otp-container';
 import { MagicLinkAuthContainer } from './magic-link-auth-container';
 import { OauthProviders } from './oauth-providers';
 import { PasswordSignInContainer } from './password-sign-in-container';
@@ -23,7 +22,6 @@ export function SignInMethodsContainer(props: {
  providers: {
    password: boolean;
    magicLink: boolean;
-    otp: boolean;
    oAuth: Provider[];
  };
 }) {
@@ -48,20 +46,15 @@ export function SignInMethodsContainer(props: {
        <MagicLinkAuthContainer redirectUrl={redirectUrl} />
      </If>

-      <If condition={props.providers.otp}>
-        <EmailOtpContainer
-          onSignIn={onSignIn}
-          redirectUrl={redirectUrl}
-          shouldCreateUser={false}
-        />
-      </If>
-
      <If condition={props.providers.oAuth.length}>
        <Divider />

        <OauthProviders
          enabledProviders={props.providers.oAuth}
-          redirectUrl={redirectUrl}
+          paths={{
+            callback: props.paths.callback,
+            returnPath: props.paths.home,
+          }}
        />
      </If>
    </>
--- a/packages/features/auth/src/components/sign-up-methods-container.tsx
+++ b/packages/features/auth/src/components/sign-up-methods-container.tsx
@@ -7,27 +7,27 @@ import { isBrowser } from '@supabase/ssr';
 import { Divider } from '@kit/ui/divider';
 import { If } from '@kit/ui/if';

-import { EmailOtpContainer } from './email-otp-container';
 import { MagicLinkAuthContainer } from './magic-link-auth-container';
 import { OauthProviders } from './oauth-providers';
 import { EmailPasswordSignUpContainer } from './password-sign-up-container';

 export function SignUpMethodsContainer(props: {
-  callbackPath: string;
+  paths: {
+    callback: string;
+    appHome: string;
+  };

  providers: {
    password: boolean;
    magicLink: boolean;
-    otp: boolean;
    oAuth: Provider[];
  };

-  inviteCode?: string;
+  inviteToken?: string;
 }) {
-  const redirectUrl = new URL(
-    props.callbackPath,
-    isBrowser() ? window?.location.origin : '',
-  ).toString();
+  const redirectUrl = isBrowser()
+    ? new URL(props.paths.callback, window?.location.origin).toString()
+    : '';

  return (
    <>
@@ -37,26 +37,21 @@ export function SignUpMethodsContainer(props: {

      <If condition={props.providers.magicLink}>
        <MagicLinkAuthContainer
-          inviteCode={props.inviteCode}
+          inviteToken={props.inviteToken}
          redirectUrl={redirectUrl}
        />
      </If>

-      <If condition={props.providers.otp}>
-        <EmailOtpContainer
-          redirectUrl={redirectUrl}
-          shouldCreateUser={true}
-          inviteCode={props.inviteCode}
-        />
-      </If>
-
      <If condition={props.providers.oAuth.length}>
        <Divider />

        <OauthProviders
          enabledProviders={props.providers.oAuth}
-          redirectUrl={redirectUrl}
-          inviteCode={props.inviteCode}
+          inviteToken={props.inviteToken}
+          paths={{
+            callback: props.paths.callback,
+            returnPath: props.paths.appHome,
+          }}
        />
      </If>
    </>
--- a/packages/features/team-accounts/package.json
+++ b/packages/features/team-accounts/package.json
@@ -18,8 +18,6 @@
    "@kit/tsconfig": "0.1.0"
  },
  "peerDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
    "@kit/supabase": "0.1.0",
    "@kit/ui": "0.1.0",
    "@kit/shared": "0.1.0",
--- a/packages/features/team-accounts/src/schema/update-invitation-schema.ts
+++ b/packages/features/team-accounts/src/schema/update-invitation-schema.ts
@@ -5,6 +5,6 @@ import { Database } from '@kit/supabase/database';
 type Role = Database['public']['Enums']['account_role'];

 export const UpdateInvitationSchema = z.object({
-  id: z.bigint(),
+  invitationId: z.number(),
  role: z.custom<Role>(() => z.string().min(1)),
 });
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -16,9 +16,6 @@
    "./cookies/*": "./src/cookies/*.ts",
    "./utils": "./src/utils.ts"
  },
-  "peerDependencies": {
-    "react": "^18.2.0"
-  },
  "dependencies": {
    "pino": "^8.19.0"
  },
--- a/packages/supabase/src/clients/browser.client.ts
+++ b/packages/supabase/src/clients/browser.client.ts
@@ -1,11 +1,13 @@
+import { SupabaseClient } from '@supabase/supabase-js';
+
 import { invariant } from '@epic-web/invariant';
 import { createBrowserClient } from '@supabase/ssr';

 import { Database } from '../database.types';

-let client: ReturnType<typeof createBrowserClient<Database>>;
+let client: SupabaseClient<Database>;

-export function getSupabaseBrowserClient<GenericSchema = Database>() {
+export function getSupabaseBrowserClient() {
  const SUPABASE_URL = process.env.NEXT_PUBLIC_SUPABASE_URL;
  const SUPABASE_ANON_KEY = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;

@@ -16,7 +18,7 @@ export function getSupabaseBrowserClient<GenericSchema = Database>() {
    return client;
  }

-  client = createBrowserClient<GenericSchema>(SUPABASE_URL, SUPABASE_ANON_KEY);
+  client = createBrowserClient<Database>(SUPABASE_URL, SUPABASE_ANON_KEY);

  return client;
 }
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -40,8 +40,6 @@
    "lucide-react": "0.307.0",
    "class-variance-authority": "^0.7.0",
    "date-fns": "^3.2.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
    "react-hook-form": "^7.49.2"
  },
  "devDependencies": {
--- a/packages/ui/src/makerkit/global-loader.tsx
+++ b/packages/ui/src/makerkit/global-loader.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import { LoadingOverlay } from './loading-overlay';
 import { TopLoadingBarIndicator } from './top-loading-bar-indicator';
 import { Trans } from './trans';