From 6b413ec19fc1c4ea671ea46a1b16077545776582 Mon Sep 17 00:00:00 2001 From: Maarten de Kruijf Date: Tue, 21 May 2024 14:47:59 +0200 Subject: [PATCH] replaced username with user_id (#163) --- test/integration/capability/http/http_integration_test.go | 6 +++--- test/unittest/utils/http/http_test.go | 8 ++++---- utils/http/http.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/integration/capability/http/http_integration_test.go b/test/integration/capability/http/http_integration_test.go index 59312508..f009ed8a 100644 --- 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 index 2de434d7..cc0d2a00 100644 --- 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 index 6d9c0337..3dcf0f50 100644 --- 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)