From d51f6ca4fdcc36449ec3c9b665c8f57dc49afa7b Mon Sep 17 00:00:00 2001
From: = <akhilmhdh@gmail.com>
Date: Thu, 19 Jun 2025 16:04:55 +0530
Subject: [PATCH] feat: resolved okta oidc failing

---
 backend/src/ee/services/oidc/oidc-config-service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/ee/services/oidc/oidc-config-service.ts b/backend/src/ee/services/oidc/oidc-config-service.ts
index 5cbfbbc97..cb65c154f 100644
--- a/backend/src/ee/services/oidc/oidc-config-service.ts
+++ b/backend/src/ee/services/oidc/oidc-config-service.ts
@@ -698,7 +698,7 @@ export const oidcConfigServiceFactory = ({
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (_req: any, tokenSet: TokenSet, cb: any) => {
         const claims = tokenSet.claims();
-        if (!claims.email || !claims.given_name) {
+        if (!claims.email) {
           throw new BadRequestError({
             message: "Invalid request. Missing email or first name"
           });
@@ -718,7 +718,7 @@ export const oidcConfigServiceFactory = ({
         oidcLogin({
           email: claims.email.toLowerCase(),
           externalId: claims.sub,
-          firstName: claims.given_name ?? "",
+          firstName: claims?.given_name || claims?.name || "",
           lastName: claims.family_name ?? "",
           orgId: org.id,
           groups,