From 88eec2cdfb389f05b661518adc679966aa554098 Mon Sep 17 00:00:00 2001
From: forehalo <forehalo@gmail.com>
Date: Fri, 30 May 2025 03:05:38 +0000
Subject: [PATCH] chore(server): disable version check for oauth callback
 (#12640)

<!-- This is an auto-generated comment: release notes by coderabbit.ai -->

## Summary by CodeRabbit

- **Bug Fixes**
  - Improved Apple OAuth login reliability by ensuring client version checks do not block the callback process.

- **New Features**
  - Enhanced OAuth account information by including an optional display name field.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 packages/backend/server/src/plugins/oauth/controller.ts    | 4 +++-
 packages/backend/server/src/plugins/oauth/providers/def.ts | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/backend/server/src/plugins/oauth/controller.ts b/packages/backend/server/src/plugins/oauth/controller.ts
index 69b872614..888390f31 100644
--- a/packages/backend/server/src/plugins/oauth/controller.ts
+++ b/packages/backend/server/src/plugins/oauth/controller.ts
@@ -80,8 +80,10 @@ export class OAuthController {
     };
   }
 
+  // the prerequest `/oauth/prelight` request already checked client version,
+  // let's simply ignore it for callback which will block apple oauth post_form mode
+  // @UseNamedGuard('version')
   @Public()
-  @UseNamedGuard('version')
   @Post('/callback')
   @HttpCode(HttpStatus.OK)
   async callback(
diff --git a/packages/backend/server/src/plugins/oauth/providers/def.ts b/packages/backend/server/src/plugins/oauth/providers/def.ts
index 4bc97abe6..95d9a250c 100644
--- a/packages/backend/server/src/plugins/oauth/providers/def.ts
+++ b/packages/backend/server/src/plugins/oauth/providers/def.ts
@@ -7,6 +7,7 @@ import { OAuthProviderFactory } from '../factory';
 export interface OAuthAccount {
   id: string;
   email: string;
+  name?: string;
   avatarUrl?: string;
 }