awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: addressed eslint issue regarding configurationType

Browse Source
This commit is contained in:
Sheen Capadngan
2024-06-19 22:41:33 +08:00
parent 6a83b58de4
commit 6457c34712
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/ee/routes/v1/oidc-router.ts
View File

@@ -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,

6
backend/src/ee/services/oidc/oidc-config-types.ts
View File

@@ -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;

2
frontend/src/hooks/api/oidcConfig/mutations.tsx
View File

@@ -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", {

7
frontend/src/views/Settings/OrgSettingsPage/components/OrgAuthTab/OIDCModal.tsx
View File

@@ -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({