🐛 fix: fix dayjs error in en-US language (#3604)

* 🐛 fix: fix dayjs issue

* 🐛 fix: fix user auth and password issue

src/layout/GlobalProvider/Locale.tsx

@@ -37,7 +37,17 @@ const Locale = memo<LocaleLayoutProps>(({ children, defaultLang, antdLocale }) =
         if (!lang) return;
 
         // load default lang
-        const dayJSLocale = await import(`dayjs/locale/${lang!.toLowerCase()}.js`);
+        let dayJSLocale;
+        try {
+          // dayjs locale is using `en` instead of `en-US`
+          // refs: https://github.com/lobehub/lobe-chat/issues/3396
+          const locale = lang!.toLowerCase() === 'en-us' ? 'en' : lang!.toLowerCase();
+
+          dayJSLocale = await import(`dayjs/locale/${locale}.js`);
+        } catch {
+          console.warn(`dayjs locale for ${lang} not found, fallback to en`);
+          dayJSLocale = await import(`dayjs/locale/en.js`);
+        }
 
         dayjs.locale(dayJSLocale.default);
       });

src/libs/trpc/index.ts

@@ -8,7 +8,7 @@
  * @link https://trpc.io/docs/v11/procedures
  */
 import { trpc } from './init';
-import { passwordChecker } from './middleware/password';
+import { jwtPayloadChecker } from './middleware/jwtPayload';
 import { userAuth } from './middleware/userAuth';
 
 /**
@@ -27,7 +27,7 @@ export const publicProcedure = trpc.procedure;
 export const authedProcedure = trpc.procedure.use(userAuth);
 
 // procedure that asserts that the user add the password
-export const passwordProcedure = trpc.procedure.use(passwordChecker);
+export const passwordProcedure = trpc.procedure.use(jwtPayloadChecker);
 
 /**
  * Merge multiple routers together

src/libs/trpc/middleware/password.test.ts → src/libs/trpc/middleware/jwtPayload.test.ts

@@ -3,15 +3,14 @@ import { TRPCError } from '@trpc/server';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import * as utils from '@/app/api/middleware/auth/utils';
-import * as appConfig from '@/config/app';
 import { createCallerFactory } from '@/libs/trpc';
 import { trpc } from '@/libs/trpc/init';
 import { AuthContext, createContextInner } from '@/server/context';
 
-import { passwordChecker } from './password';
+import { jwtPayloadChecker } from './jwtPayload';
 
 const appRouter = trpc.router({
-  protectedQuery: trpc.procedure.use(passwordChecker).query(async ({ ctx }) => {
+  protectedQuery: trpc.procedure.use(jwtPayloadChecker).query(async ({ ctx }) => {
     return ctx.jwtPayload;
   }),
 });
@@ -38,23 +37,9 @@ describe('passwordChecker middleware', () => {
     await expect(router.protectedQuery()).rejects.toThrow(new TRPCError({ code: 'UNAUTHORIZED' }));
   });
 
-  it('should throw UNAUTHORIZED error if access code is not correct', async () => {
-    vi.spyOn(appConfig, 'getAppConfig').mockReturnValue({
-      ACCESS_CODES: ['123'],
-    } as any);
-    vi.spyOn(utils, 'getJWTPayload').mockResolvedValue({ accessCode: '456' });
-
-    ctx = await createContextInner({ authorizationHeader: 'Bearer token' });
-    router = createCaller(ctx);
-
-    await expect(router.protectedQuery()).rejects.toThrow(new TRPCError({ code: 'UNAUTHORIZED' }));
-  });
-
   it('should call next with jwtPayload in context if access code is correct', async () => {
     const jwtPayload = { accessCode: '123' };
-    vi.spyOn(appConfig, 'getAppConfig').mockReturnValue({
-      ACCESS_CODES: ['123'],
-    } as any);
+
     vi.spyOn(utils, 'getJWTPayload').mockResolvedValue(jwtPayload);
 
     ctx = await createContextInner({ authorizationHeader: 'Bearer token' });
@@ -67,9 +52,6 @@ describe('passwordChecker middleware', () => {
 
   it('should call next with jwtPayload in context if no access codes are set', async () => {
     const jwtPayload = {};
-    vi.spyOn(appConfig, 'getAppConfig').mockReturnValue({
-      ACCESS_CODES: [],
-    } as any);
     vi.spyOn(utils, 'getJWTPayload').mockResolvedValue(jwtPayload);
 
     ctx = await createContextInner({ authorizationHeader: 'Bearer token' });
@@ -81,7 +63,6 @@ describe('passwordChecker middleware', () => {
   });
   it('should call next with jwtPayload in context if  access codes is undefined', async () => {
     const jwtPayload = {};
-    vi.spyOn(appConfig, 'getAppConfig').mockReturnValue({} as any);
     vi.spyOn(utils, 'getJWTPayload').mockResolvedValue(jwtPayload);
 
     ctx = await createContextInner({ authorizationHeader: 'Bearer token' });

src/libs/trpc/middleware/jwtPayload.ts

@@ -0,0 +1,14 @@
+import { TRPCError } from '@trpc/server';
+
+import { getJWTPayload } from '@/app/api/middleware/auth/utils';
+import { trpc } from '@/libs/trpc/init';
+
+export const jwtPayloadChecker = trpc.middleware(async (opts) => {
+  const { ctx } = opts;
+
+  if (!ctx.authorizationHeader) throw new TRPCError({ code: 'UNAUTHORIZED' });
+
+  const jwtPayload = await getJWTPayload(ctx.authorizationHeader);
+
+  return opts.next({ ctx: { jwtPayload } });
+});