From bd3ebe75c9fef8a12b066adfebad801c512925b3 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Tue, 29 Apr 2025 02:05:19 +0800
Subject: [PATCH 1/2] feat: add support for eddsa jwt alg for oidc

---
 backend/src/ee/services/oidc/oidc-config-types.ts              | 3 ++-
 frontend/src/hooks/api/oidcConfig/types.ts                     | 3 ++-
 .../SettingsPage/components/OrgAuthTab/OIDCModal.tsx           | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/ee/services/oidc/oidc-config-types.ts b/backend/src/ee/services/oidc/oidc-config-types.ts
index 3b2194375..c56427e63 100644
--- a/backend/src/ee/services/oidc/oidc-config-types.ts
+++ b/backend/src/ee/services/oidc/oidc-config-types.ts
@@ -8,7 +8,8 @@ export enum OIDCConfigurationType {
 export enum OIDCJWTSignatureAlgorithm {
   RS256 = "RS256",
   HS256 = "HS256",
-  RS512 = "RS512"
+  RS512 = "RS512",
+  EDDSA = "EdDSA"
 }
 
 export type TOidcLoginDTO = {
diff --git a/frontend/src/hooks/api/oidcConfig/types.ts b/frontend/src/hooks/api/oidcConfig/types.ts
index 7c41d3400..a814947c7 100644
--- a/frontend/src/hooks/api/oidcConfig/types.ts
+++ b/frontend/src/hooks/api/oidcConfig/types.ts
@@ -19,5 +19,6 @@ export type OIDCConfigData = {
 export enum OIDCJWTSignatureAlgorithm {
   RS256 = "RS256",
   HS256 = "HS256",
-  RS512 = "RS512"
+  RS512 = "RS512",
+  EDDSA = "EdDSA"
 }
diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OIDCModal.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OIDCModal.tsx
index 4fff131a7..5f8830636 100644
--- a/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OIDCModal.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OIDCModal.tsx
@@ -387,6 +387,7 @@ export const OIDCModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele
                     <SelectItem value={OIDCJWTSignatureAlgorithm.RS256}>RS256</SelectItem>
                     <SelectItem value={OIDCJWTSignatureAlgorithm.RS512}>RS512</SelectItem>
                     <SelectItem value={OIDCJWTSignatureAlgorithm.HS256}>HS256</SelectItem>
+                    <SelectItem value={OIDCJWTSignatureAlgorithm.EDDSA}>EDDSA</SelectItem>
                   </Select>
                 </FormControl>
               )}

From 1b798bd5d51387c301e4ea44583cda1045424901 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Tue, 29 Apr 2025 02:08:13 +0800
Subject: [PATCH 2/2] misc: fixed casing

---
 .../SettingsPage/components/OrgAuthTab/OIDCModal.tsx            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OIDCModal.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OIDCModal.tsx
index 5f8830636..241348b0d 100644
--- a/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OIDCModal.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/OrgAuthTab/OIDCModal.tsx
@@ -387,7 +387,7 @@ export const OIDCModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele
                     <SelectItem value={OIDCJWTSignatureAlgorithm.RS256}>RS256</SelectItem>
                     <SelectItem value={OIDCJWTSignatureAlgorithm.RS512}>RS512</SelectItem>
                     <SelectItem value={OIDCJWTSignatureAlgorithm.HS256}>HS256</SelectItem>
-                    <SelectItem value={OIDCJWTSignatureAlgorithm.EDDSA}>EDDSA</SelectItem>
+                    <SelectItem value={OIDCJWTSignatureAlgorithm.EDDSA}>EdDSA</SelectItem>
                   </Select>
                 </FormControl>
               )}