From b6fea0c8562abf912daa7d72958ceb2e93575d31 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 15 Dec 2025 00:19:55 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20oidc=E6=94=AF=E6=8C=81=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=AC=AC=E4=B8=89=E6=96=B9=E6=98=B5=E7=A7=B0=E6=88=96?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=BD=9C=E4=B8=BAcertd=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certd-server/src/controller/basic/login/oauth-controller.ts | 2 +-
 .../certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts b/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
index 6a9bd418f..fba4d5144 100644
--- a/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
+++ b/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
@@ -169,7 +169,7 @@ export class ConnectController extends BaseController {
     const userInfo = validationValue.userInfo;
     const oauthType = validationValue.type;
     let newUser = new UserEntity()
-    newUser.username = `${oauthType}_${userInfo.nickName}_${simpleNanoId(6)}`;
+    newUser.username = `${userInfo.nickName}_${simpleNanoId(6)}_${oauthType}`;
     newUser.avatar = userInfo.avatar;
     newUser.nickName = userInfo.nickName || simpleNanoId(6);
 
diff --git a/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts b/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts
index b07392a57..dbbc7b35a 100644
--- a/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts
@@ -127,7 +127,7 @@ export class OidcOauthProvider extends BaseAddon implements IOauthProvider {
       },
       userInfo: {
         openId: claims.sub,
-        nickName: claims.nickname || claims.preferred_username || "",
+        nickName: claims.nickname || claims.name || claims.username || claims.preferred_username || "",
         avatar: claims.picture,
       },
     }