tests and UI clarifications

Signed-off-by: reggie-k <[email protected]>
reggie-k · Feb 10, 2025 · 5659e07 · 5659e07
1 parent d725f5d
commit 5659e07
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/ui/src/app/settings/components/repo-details/repo-details.tsx b/ui/src/app/settings/components/repo-details/repo-details.tsx
@@ -39,7 +39,7 @@ export const RepoDetails = (props: {repo: models.Repository; save?: (params: New
 
         if (repository.type === 'git') {
             items.push({
-                title: 'Bearer token (optional)',
+                title: 'Bearer token (optional, for BitBucket only)',
                 view: repository.bearerToken ? '******' : '',
                 edit: (formApi: FormApi) => <FormField formApi={formApi} field='bearerToken' component={Text} componentProps={{type: 'password'}} />
             });

diff --git a/ui/src/app/settings/components/repos-list/repos-list.tsx b/ui/src/app/settings/components/repos-list/repos-list.tsx
@@ -218,7 +218,7 @@ export class ReposList extends React.Component<
                     password: !httpsValues.password && httpsValues.username && 'Password is required if username is given.',
                     bearerToken:
                         (httpsValues.password && httpsValues.bearerToken && 'Either the password or the bearer token must be set, but not both.') ||
-                        (httpsValues.type != 'git' && 'Bearer token is only supported for Git repositories'),
+                        (httpsValues.type != 'git' && 'Bearer token is only supported for Git BitBucket repositories'),
                     tlsClientCertKey: !httpsValues.tlsClientCertKey && httpsValues.tlsClientCertData && 'TLS client cert key is required if TLS client cert is given.'
                 };
             case ConnectionMethod.GITHUBAPP:
@@ -690,7 +690,7 @@ export class ReposList extends React.Component<
                                                         <div className='argo-form-row'>
                                                             <FormField
                                                                 formApi={formApi}
-                                                                label='Bearer token (optional)'
+                                                                label='Bearer token (optional, for BitBucket only)'
                                                                 field='bearerToken'
                                                                 component={Text}
                                                                 componentProps={{type: 'password'}}

diff --git a/util/git/creds_test.go b/util/git/creds_test.go
@@ -183,8 +183,7 @@ func TestHTTPSCreds_Environ_bearerTokenAuth(t *testing.T) {
 				break
 			}
 		}
-		b64enc := base64.StdEncoding.EncodeToString([]byte("token"))
-		assert.Equal(t, "Authorization: Bearer "+b64enc, header)
+		assert.Equal(t, "Authorization: Bearer token", header)
 	})
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -183,8 +183,7 @@ func TestHTTPSCreds_Environ_bearerTokenAuth(t *testing.T) { @@
     				break
     			}
     		}
-    		b64enc := base64.StdEncoding.EncodeToString([]byte("token"))
-    		assert.Equal(t, "Authorization: Bearer "+b64enc, header)
+    		assert.Equal(t, "Authorization: Bearer token", header)
     	})
     }
@@ Expand Down @@