From 6457c347126b358e9d50e0a904798b9b096974b1 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Wed, 19 Jun 2024 22:41:33 +0800
Subject: [PATCH] misc: addressed eslint issue regarding configurationType

---
 backend/src/ee/routes/v1/oidc-router.ts                    | 3 ++-
 backend/src/ee/services/oidc/oidc-config-types.ts          | 6 +++---
 frontend/src/hooks/api/oidcConfig/mutations.tsx            | 2 +-
 .../OrgSettingsPage/components/OrgAuthTab/OIDCModal.tsx    | 7 ++-----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/backend/src/ee/routes/v1/oidc-router.ts b/backend/src/ee/routes/v1/oidc-router.ts
index 73ce870eb..38c379cbf 100644
--- a/backend/src/ee/routes/v1/oidc-router.ts
+++ b/backend/src/ee/routes/v1/oidc-router.ts
@@ -191,6 +191,7 @@ export const registerOidcRouter = async (server: FastifyZodProvider) => {
                 .join(", ");
             }),
           discoveryURL: z.string().trim().optional().default(""),
+          configurationType: z.nativeEnum(OIDCConfigurationType),
           issuer: z.string().trim().optional().default(""),
           authorizationEndpoint: z.string().trim().optional().default(""),
           jwksUri: z.string().trim().optional().default(""),
@@ -201,7 +202,7 @@ export const registerOidcRouter = async (server: FastifyZodProvider) => {
           isActive: z.boolean()
         })
         .partial()
-        .merge(z.object({ orgSlug: z.string(), configurationType: z.nativeEnum(OIDCConfigurationType) })),
+        .merge(z.object({ orgSlug: z.string() })),
       response: {
         200: OidcConfigsSchema.pick({
           id: true,
diff --git a/backend/src/ee/services/oidc/oidc-config-types.ts b/backend/src/ee/services/oidc/oidc-config-types.ts
index f288ccc2b..6e36b796b 100644
--- a/backend/src/ee/services/oidc/oidc-config-types.ts
+++ b/backend/src/ee/services/oidc/oidc-config-types.ts
@@ -45,12 +45,12 @@ export type TUpdateOidcCfgDTO = Partial<{
   allowedEmailDomains: string;
   discoveryURL: string;
   jwksUri: string;
+  configurationType: OIDCConfigurationType;
   tokenEndpoint: string;
   userinfoEndpoint: string;
   clientId: string;
   clientSecret: string;
   isActive: boolean;
   orgSlug: string;
-}> & {
-  configurationType: OIDCConfigurationType;
-} & TGenericPermission;
+}> &
+  TGenericPermission;
diff --git a/frontend/src/hooks/api/oidcConfig/mutations.tsx b/frontend/src/hooks/api/oidcConfig/mutations.tsx
index d20f4fb3b..4a0d963cc 100644
--- a/frontend/src/hooks/api/oidcConfig/mutations.tsx
+++ b/frontend/src/hooks/api/oidcConfig/mutations.tsx
@@ -31,7 +31,7 @@ export const useUpdateOIDCConfig = () => {
       clientId?: string;
       clientSecret?: string;
       isActive?: boolean;
-      configurationType: string;
+      configurationType?: string;
       orgSlug: string;
     }) => {
       const { data } = await apiRequest.patch("/api/v1/sso/oidc/config", {
diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/OIDCModal.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/OIDCModal.tsx
index 85a01cb9a..ae48ea1dc 100644
--- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/OIDCModal.tsx
+++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/OIDCModal.tsx
@@ -25,11 +25,8 @@ enum ConfigurationType {
 
 type Props = {
   popUp: UsePopUpState<["addOIDC"]>;
-  handlePopUpClose: (popUpName: keyof UsePopUpState<["addOIDC", "loadViaDiscoveryURL"]>) => void;
-  handlePopUpToggle: (
-    popUpName: keyof UsePopUpState<["addOIDC", "loadViaDiscoveryURL"]>,
-    state?: boolean
-  ) => void;
+  handlePopUpClose: (popUpName: keyof UsePopUpState<["addOIDC"]>) => void;
+  handlePopUpToggle: (popUpName: keyof UsePopUpState<["addOIDC"]>, state?: boolean) => void;
 };
 
 const schema = z.object({