replaced username with user_id (#163)

COSSAS · May 21, 2024 · 6b413ec · 6b413ec
1 parent 1d96431
commit 6b413ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/test/integration/capability/http/http_integration_test.go b/test/integration/capability/http/http_integration_test.go
@@ -96,9 +96,9 @@ func TestHttpOAuth2(t *testing.T) {
 func TestHttpBasicAuth(t *testing.T) {
 	request := httpUtil.HttpRequest{}
 	httpCapability := http.New(&request)
-	username := "test"
+	user_id := "test"
 	password := "password"
-	url := fmt.Sprintf("https://httpbin.org/basic-auth/%s/%s", username, password)
+	url := fmt.Sprintf("https://httpbin.org/basic-auth/%s/%s", user_id, password)
 
 	target := cacao.AgentTarget{
 		Address: map[cacao.NetAddressType][]string{
@@ -109,7 +109,7 @@ func TestHttpBasicAuth(t *testing.T) {
 
 	auth := cacao.AuthenticationInformation{
 		Type:     cacao.AuthInfoHTTPBasicType,
-		Username: username,
+		UserId:   user_id,
 		Password: password,
 		ID:       "d0c7e6a0-f7fe-464e-9935-e6b3443f5b91",
 	}

diff --git a/test/unittest/utils/http/http_test.go b/test/unittest/utils/http/http_test.go
@@ -214,9 +214,9 @@ func TestHttpBearerToken(t *testing.T) {
 }
 
 func TestHttpBasicAuth(t *testing.T) {
-	username := "test"
+	user_id := "test"
 	password := "password"
-	url := fmt.Sprintf("https://httpbin.org/basic-auth/%s/%s", username, password)
+	url := fmt.Sprintf("https://httpbin.org/basic-auth/%s/%s", user_id, password)
 	httpRequest := http.HttpRequest{}
 
 	target := cacao.AgentTarget{
@@ -228,7 +228,7 @@ func TestHttpBasicAuth(t *testing.T) {
 
 	auth := cacao.AuthenticationInformation{
 		Type:     cacao.AuthInfoHTTPBasicType,
-		Username: username,
+		UserId:   user_id,
 		Password: password,
 		ID:       "d0c7e6a0-f7fe-464e-9935-e6b3443f5b91",
 	}
@@ -258,7 +258,7 @@ func TestHttpBasicAuth(t *testing.T) {
 	}
 
 	assert.Equal(t, authResponse.Authenticated, true)
-	assert.Equal(t, authResponse.User, username)
+	assert.Equal(t, authResponse.User, user_id)
 }
 
 func TestHttpPostWithContentConnection(t *testing.T) {

diff --git a/utils/http/http.go b/utils/http/http.go
@@ -170,7 +170,7 @@ func (httpOptions *HttpOptions) addAuthTo(request *http.Request) error {
 
 	switch authInfoType {
 	case cacao.AuthInfoHTTPBasicType:
-		request.SetBasicAuth(httpOptions.Auth.Username, httpOptions.Auth.Password)
+		request.SetBasicAuth(httpOptions.Auth.UserId, httpOptions.Auth.Password)
 	case cacao.AuthInfoOAuth2Type:
 		bearer := fmt.Sprintf("Bearer %s", httpOptions.Auth.Token)
 		request.Header.Add("Authorization", bearer)