Merge remote-tracking branch 'upstream/main'

bentwnghk · Sep 21, 2024 · f808d5a · f808d5a
2 parents 4922e3d + fc2e760
commit f808d5a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 26 deletions.
diff --git a/next.config.mjs b/next.config.mjs
@@ -107,19 +107,6 @@ const nextConfig = {
         ],
         source: '/apple-touch-icon.png',
       },
-      {
-        headers: [
-          {
-            key: 'Content-Type',
-            value: 'application/javascript; charset=utf-8',
-          },
-          {
-            key: 'Content-Security-Policy',
-            value: "default-src 'self'; script-src 'self'",
-          },
-        ],
-        source: '/sw.js',
-      },
     ];
   },
 

diff --git a/src/app/api/webhooks/casdoor/route.ts b/src/app/api/webhooks/casdoor/route.ts
@@ -23,11 +23,17 @@ export const POST = async (req: Request): Promise<NextResponse> => {
   const nextAuthUserService = new NextAuthUserService();
   switch (action) {
     case 'update-user': {
-      return nextAuthUserService.safeUpdateUser(extendedUser.id, {
-        avatar: extendedUser?.avatar,
-        email: extendedUser?.email,
-        fullName: extendedUser.displayName,
-      });
+      return nextAuthUserService.safeUpdateUser(
+        {
+          provider: 'casdoor',
+          providerAccountId: extendedUser.id,
+        },
+        {
+          avatar: extendedUser?.avatar,
+          email: extendedUser?.email,
+          fullName: extendedUser.displayName,
+        },
+      );
     }
 
     default: {

diff --git a/src/app/api/webhooks/logto/route.ts b/src/app/api/webhooks/logto/route.ts
@@ -23,11 +23,17 @@ export const POST = async (req: Request): Promise<NextResponse> => {
   const nextAuthUserService = new NextAuthUserService();
   switch (event) {
     case 'User.Data.Updated': {
-      return nextAuthUserService.safeUpdateUser(data.id, {
-        avatar: data?.avatar,
-        email: data?.primaryEmail,
-        fullName: data?.name,
-      });
+      return nextAuthUserService.safeUpdateUser(
+        {
+          provider: 'logto',
+          providerAccountId: data.id,
+        },
+        {
+          avatar: data?.avatar,
+          email: data?.primaryEmail,
+          fullName: data?.name,
+        },
+      );
     }
 
     default: {

diff --git a/src/server/services/nextAuthUser/index.ts b/src/server/services/nextAuthUser/index.ts
@@ -15,12 +15,15 @@ export class NextAuthUserService {
     this.adapter = LobeNextAuthDbAdapter(serverDB);
   }
 
-  safeUpdateUser = async (providerAccountId: string, data: Partial<UserItem>) => {
+  safeUpdateUser = async (
+    { providerAccountId, provider }: { provider: string; providerAccountId: string },
+    data: Partial<UserItem>,
+  ) => {
     pino.info('updating user due to webhook');
     // 1. Find User by account
     // @ts-expect-error: Already impl in `LobeNextauthDbAdapter`
     const user = await this.adapter.getUserByAccount({
-      provider: 'logto',
+      provider,
       providerAccountId,
     });
 
@@ -34,7 +37,7 @@ export class NextAuthUserService {
       });
     } else {
       pino.warn(
-        `[logto]: Webhooks handler user update for "${JSON.stringify(data)}", but no user was found by the providerAccountId.`,
+        `[${provider}]: Webhooks handler user update for "${JSON.stringify(data)}", but no user was found by the providerAccountId.`,
       );
     }
     return NextResponse.json({ message: 'user updated', success: true }, { status: 200 });