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: added proper error handling

Browse Source
This commit is contained in:
Sheen Capadngan
2024-07-08 21:31:11 +08:00
parent d4a2f4590b
commit a37987b508
4 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/hooks/api/ldapConfig/queries.tsx
View File

@@ -13,9 +13,15 @@ export const useGetLDAPConfig = (organizationId: string) => {
return useQuery({
queryKey: ldapConfigKeys.getLDAPConfig(organizationId),
queryFn: async () => {
const { data } = await apiRequest.get(`/api/v1/ldap/config?organizationId=${organizationId}`);
try {
const { data } = await apiRequest.get(
`/api/v1/ldap/config?organizationId=${organizationId}`
);
return data;
return data;
} catch (err) {
return null;
}
},
enabled: true
});

12
frontend/src/hooks/api/oidcConfig/queries.tsx
View File

@@ -12,11 +12,15 @@ export const useGetOIDCConfig = (orgSlug: string) => {
return useQuery({
queryKey: oidcConfigKeys.getOIDCConfig(orgSlug),
queryFn: async () => {
const { data } = await apiRequest.get<OIDCConfigData>(
`/api/v1/sso/oidc/config?orgSlug=${orgSlug}`
);
try {
const { data } = await apiRequest.get<OIDCConfigData>(
`/api/v1/sso/oidc/config?orgSlug=${orgSlug}`
);
return data;
return data;
} catch (err) {
return null;
}
},
enabled: true
});

10
frontend/src/hooks/api/ssoConfig/queries.tsx
View File

@@ -11,9 +11,15 @@ export const useGetSSOConfig = (organizationId: string) => {
return useQuery({
queryKey: ssoConfigKeys.getSSOConfig(organizationId),
queryFn: async () => {
const { data } = await apiRequest.get(`/api/v1/sso/config?organizationId=${organizationId}`);
try {
const { data } = await apiRequest.get(
`/api/v1/sso/config?organizationId=${organizationId}`
);
return data;
return data;
} catch (err) {
return null;
}
},
enabled: true
});

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

@@ -43,8 +43,10 @@ export const OrgAuthTab = withPermission(
const { data: samlConfig, isLoading: isLoadingSamlConfig } = useGetSSOConfig(
currentOrg?.id ?? ""
);
const { data: ldapConfig, isLoading: isLdapConfig } = useGetLDAPConfig(currentOrg?.id ?? "");
const areConfigsLoading = isLoadingOidcConfig || isLoadingSamlConfig || isLdapConfig;
const { data: ldapConfig, isLoading: isLoadingLdapConfig } = useGetLDAPConfig(
currentOrg?.id ?? ""
);
const areConfigsLoading = isLoadingOidcConfig || isLoadingSamlConfig || isLoadingLdapConfig;
const shouldDisplaySection = (method: LoginMethod) =>
!enabledLoginMethods || enabledLoginMethods.includes(method);