feat: store last locale used

packages/app/prisma/migrations/20231120113500_init/migration.sql → packages/app/prisma/migrations/20231210183722_init/migration.sql

@@ -27,6 +27,7 @@ CREATE TABLE "User" (
     "role" TEXT NOT NULL DEFAULT 'user',
     "password" TEXT,
     "hasPassword" BOOLEAN NOT NULL DEFAULT false,
+    "lastLocale" TEXT,
     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updatedAt" TIMESTAMP(3) NOT NULL,
 

packages/app/prisma/schema.prisma

@@ -45,6 +45,7 @@ model User {
   hasPassword                Boolean                     @default(false)
   resetPasswordToken         ResetPassordToken?
   userEmailVerificationToken UserEmailVerificationToken?
+  lastLocale               String?
 
   // Timestamps
   createdAt DateTime @default(now())

packages/app/src/api/auth/mutations.ts

@@ -5,6 +5,7 @@ import { hash } from "@/lib/bcrypt"
 import { logger } from "@/lib/logger"
 import { sendMail } from "@/lib/mailer"
 import { prisma } from "@/lib/prisma"
+import { redis } from "@/lib/redis"
 import { signUpSchema } from "@/lib/schemas/auth"
 import { html, plainText, subject } from "@/lib/templates/mail/verify-email"
 import { ApiError, handleApiError, throwableErrorsMessages } from "@/lib/utils/server-utils"
@@ -25,8 +26,10 @@ export const register = async ({ input }: apiInputFromSchema<typeof signUpSchema
         email: email.toLowerCase(),
         username,
         password: hashedPassword,
+        lastLocale: input.locale,
       },
     })
+    await redis.set(`lastLocale:${user.id}`, input.locale)
 
     //* Send verification email
     if (env.ENABLE_MAILING_SERVICE === true) {

packages/app/src/api/me/email/mutation.ts

@@ -20,6 +20,7 @@ export const sendVerificationEmail = async ({ input }: apiInputFromSchema<typeof
         email: email.toLowerCase(),
       },
     })
+
     if (!user) {
       logger.debug("User not found")
       return { email }

packages/app/src/app/[lang]/(protected)/layout.tsx

@@ -3,6 +3,8 @@ import { Locale } from "i18n-config"
 import requireAuth from "@/components/auth/require-auth"
 import LocaleSwitcher from "@/components/locale-switcher"
 import { ThemeSwitch } from "@/components/theme/theme-switch"
+import { prisma } from "@/lib/prisma"
+import { redis } from "@/lib/redis"
 
 export default async function ProtectedLayout({
   children,
@@ -13,7 +15,38 @@ export default async function ProtectedLayout({
     lang: Locale
   }
 }) {
-  await requireAuth()
+  const session = await requireAuth()
+
+  //* Set last locale
+  // Get last locale from redis or db
+  const getLastLocale = async () => {
+    const lastLocale = await redis.get(`lastLocale:${session.user.id}`)
+    if (lastLocale) {
+      return lastLocale
+    }
+    const lastLocaleFromDb = await prisma.user.findUnique({
+      where: { id: session.user.id },
+      select: { lastLocale: true },
+    })
+    if (lastLocaleFromDb && lastLocaleFromDb.lastLocale) {
+      await redis.set(`lastLocale:${session.user.id}`, lastLocaleFromDb.lastLocale)
+      return lastLocaleFromDb.lastLocale
+    }
+    return null
+  }
+  // Set last locale in redis and db
+  const setLastLocale = async (locale: Locale) => {
+    await redis.set(`lastLocale:${session.user.id}`, locale)
+    await prisma.user.update({
+      where: { id: session.user.id },
+      data: { lastLocale: locale },
+    })
+  }
+
+  const lastLocale = await getLastLocale()
+  if (lastLocale !== lang) {
+    await setLastLocale(lang)
+  }
 
   return (
     <>

packages/app/src/app/[lang]/(sys-auth)/sign-up/credentials/page.tsx

@@ -37,7 +37,7 @@ export default async function SignupByCredentials({
           <CardTitle>{dictionary.signUpPage.createAnAccount}</CardTitle>
         </CardHeader>
         <CardBody>
-          <RegisterUserAuthForm className="gap-3" searchParams={searchParams} dictionary={dictionary} />
+          <RegisterUserAuthForm className="gap-3" searchParams={searchParams} dictionary={dictionary} locale={lang} />
         </CardBody>
       </Card>
     </main>

packages/app/src/app/[lang]/(sys-auth)/sign-up/page.tsx

@@ -39,7 +39,7 @@ export default async function SignUpPage({
             <p className="text-muted-foreground text-sm">{dictionary.signUpPage.enterEmail}</p>
           </div>
           <div className="grid gap-6">
-            <RegisterUserAuthForm isMinimized searchParams={searchParams} dictionary={dictionary} />
+            <RegisterUserAuthForm isMinimized searchParams={searchParams} dictionary={dictionary} locale={lang} />
             <div className="relative">
               <div className="absolute inset-0 flex items-center">
                 <span className="w-full border-t" />

packages/app/src/components/auth/register-user-auth-form.tsx

@@ -23,6 +23,7 @@ type UserAuthFormProps = React.HTMLAttributes<HTMLFormElement> & {
   dictionary: TDictionary
   isMinimized?: boolean
   searchParams?: { [key: string]: string | string[] | undefined }
+  locale: string
 }
 
 export const formSchema = (dictionary: TDictionary) =>
@@ -52,7 +53,7 @@ export const getFormSchema = ({ dictionary, isMinimized }: { dictionary: TDictio
 export type IForm = z.infer<ReturnType<typeof formSchema>>
 export type IFormMinimized = z.infer<ReturnType<typeof formMinizedSchema>>
 
-export function RegisterUserAuthForm({ dictionary, isMinimized, searchParams, ...props }: UserAuthFormProps) {
+export function RegisterUserAuthForm({ dictionary, isMinimized, searchParams, locale, ...props }: UserAuthFormProps) {
   const router = useRouter()
 
   const registerMutation = trpc.auth.register.useMutation({
@@ -102,6 +103,7 @@ export function RegisterUserAuthForm({ dictionary, isMinimized, searchParams, ..
       username: "",
       password: "",
       confirmPassword: "",
+      locale,
     },
   })
 

packages/app/src/lib/schemas/auth.ts

@@ -43,6 +43,7 @@ export const signUpSchema = (dictionary?: TDictionary) =>
   signInSchema(dictionary).extend({
     username: usernameSchema(dictionary),
     password: passwordSchemaWithRegex(dictionary),
+    locale: z.string(),
   })
 
 export const signUpResponseSchema = (dictionary?: TDictionary) =>