BED-5066: resolve TS errors

Raise name error on duplicate SSO slug
SpecterOps · Dec 20, 2024 · dbbc6f6 · dbbc6f6
1 parent c4947e5
commit dbbc6f6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/cmd/api/src/database/sso_providers.go b/cmd/api/src/database/sso_providers.go
@@ -65,6 +65,8 @@ func (s *BloodhoundDB) CreateSSOProvider(ctx context.Context, name string, authP
 		if result.Error != nil {
 			if strings.Contains(result.Error.Error(), "duplicate key value violates unique constraint \"sso_providers_name_key\"") {
 				return fmt.Errorf("%w: %v", ErrDuplicateSSOProviderName, tx.Error)
+			} else if strings.Contains(result.Error.Error(), "duplicate key value violates unique constraint \"sso_providers_slug_key\"") {
+				return fmt.Errorf("%w: %v", ErrDuplicateSSOProviderName, tx.Error)
 			}
 		}
 

diff --git a/packages/javascript/bh-shared-ui/src/components/CreateUserForm/CreateUserForm.tsx b/packages/javascript/bh-shared-ui/src/components/CreateUserForm/CreateUserForm.tsx
@@ -75,10 +75,13 @@ const CreateUserForm: React.FC<{
                 if (error.response?.data?.errors[0]?.message.toLowerCase().includes('principal name')) {
                     setError('principal', { type: 'custom', message: 'Principal name is already in use.' });
                 } else {
-                    setError('generic', { type: 'custom', message: `A conflict has occured.` });
+                    setError('root.generic', { type: 'custom', message: `A conflict has occured.` });
                 }
             } else {
-                setError('generic', { type: 'custom', message: 'An unexpected error occurred. Please try again.' });
+                setError('root.generic', {
+                    type: 'custom',
+                    message: 'An unexpected error occurred. Please try again.',
+                });
             }
         }
     }, [authenticationMethod, setValue, error, setError]);
@@ -349,9 +352,9 @@ const CreateUserForm: React.FC<{
                                     )}
                                 />
                             </Grid>
-                            {!!errors.generic && (
+                            {!!errors.root?.generic && (
                                 <Grid item xs={12}>
-                                    <Alert severity='error'>{errors.generic.message}</Alert>
+                                    <Alert severity='error'>{errors.root.generic.message}</Alert>
                                 </Grid>
                             )}
                         </Grid>

diff --git a/packages/javascript/bh-shared-ui/src/components/UpdateUserForm/UpdateUserForm.tsx b/packages/javascript/bh-shared-ui/src/components/UpdateUserForm/UpdateUserForm.tsx
@@ -162,10 +162,13 @@ const UpdateUserFormInner: React.FC<{
                 if (error.response?.data?.errors[0]?.message.toLowerCase().includes('principal name')) {
                     setError('principal', { type: 'custom', message: 'Principal name is already in use.' });
                 } else {
-                    setError('generic', { type: 'custom', message: `A conflict has occured.` });
+                    setError('root.generic', { type: 'custom', message: `A conflict has occured.` });
                 }
             } else {
-                setError('generic', { type: 'custom', message: 'An unexpected error occurred. Please try again.' });
+                setError('root.generic', {
+                    type: 'custom',
+                    message: 'An unexpected error occurred. Please try again.',
+                });
             }
         }
     }, [authenticationMethod, setValue, error, setError]);
@@ -372,9 +375,9 @@ const UpdateUserFormInner: React.FC<{
                             )}
                         />
                     </Grid>
-                    {!!errors.generic && (
+                    {!!errors.root?.generic && (
                         <Grid item xs={12}>
-                            <Alert severity='error'>{errors.generic.message}</Alert>
+                            <Alert severity='error'>{errors.root.generic.message}</Alert>
                         </Grid>
                     )}
                 </Grid>

diff --git a/packages/javascript/bh-shared-ui/src/components/UpsertOIDCProviderForm.tsx b/packages/javascript/bh-shared-ui/src/components/UpsertOIDCProviderForm.tsx
@@ -46,13 +46,13 @@ const UpsertOIDCProviderForm: FC<{
                 if (error.response?.data?.errors[0]?.message.toLowerCase().includes('sso provider name')) {
                     setError('name', { type: 'custom', message: 'SSO Provider Name is already in use.' });
                 } else {
-                    setError('generic', {
+                    setError('root.generic', {
                         type: 'custom',
                         message: 'A conflict has occured.',
                     });
                 }
             } else {
-                setError('generic', {
+                setError('root.generic', {
                     type: 'custom',
                     message: `Unable to ${oldSSOProvider ? 'update' : 'create new'} OIDC Provider configuration. Please try again.`,
                 });
@@ -134,9 +134,9 @@ const UpsertOIDCProviderForm: FC<{
                             )}
                         />
                     </Grid>
-                    {!!errors.generic && (
+                    {!!errors.root?.generic && (
                         <Grid item xs={12}>
-                            <Alert severity='error'>{errors.generic.message}</Alert>
+                            <Alert severity='error'>{errors.root.generic.message}</Alert>
                         </Grid>
                     )}
                 </Grid>

diff --git a/.../javascript/bh-shared-ui/src/components/UpsertSAMLProviderForm/UpsertSAMLProviderForm.tsx b/.../javascript/bh-shared-ui/src/components/UpsertSAMLProviderForm/UpsertSAMLProviderForm.tsx
@@ -57,13 +57,13 @@ const UpsertSAMLProviderForm: FC<{
                 if (error.response?.data?.errors[0]?.message.toLowerCase().includes('sso provider name')) {
                     setError('name', { type: 'custom', message: 'SSO Provider Name is already in use.' });
                 } else {
-                    setError('generic', {
+                    setError('root.generic', {
                         type: 'custom',
                         message: `A conflict has occured.`,
                     });
                 }
             } else {
-                setError('generic', {
+                setError('root.generic', {
                     type: 'custom',
                     message: `Unable to ${oldSSOProvider ? 'update' : 'create new'} SAML Provider configuration. Please try again.`,
                 });
@@ -147,9 +147,9 @@ const UpsertSAMLProviderForm: FC<{
                                 : 'Upload the Metadata file provided by your SAML Provider'}
                         </FormHelperText>
                     </Grid>
-                    {!!errors.generic && (
+                    {!!errors.root?.generic && (
                         <Grid item xs={12}>
-                            <Alert severity='error'>{errors.generic.message}</Alert>
+                            <Alert severity='error'>{errors.root.generic.message}</Alert>
                         </Grid>
                     )}
                 </Grid>