Improve repositores code

Signed-off-by: Michael Sverdlov <[email protected]>

Author: sverdlov93

artifactory/commands/buildtoollogin/buildtoollogin_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
+	"github.com/jfrog/jfrog-client-go/auth"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"path/filepath"
@@ -119,7 +120,7 @@ func TestBuildToolLoginCommand_Yarn(t *testing.T) {
 	}{
 		{
 			name:        "Token Authentication",
-			accessToken: "test-token",
+			accessToken: dummyToken,
 		},
 		{
 			name:     "Basic Authentication",
@@ -201,7 +202,7 @@ func TestBuildToolLoginCommand_Pip(t *testing.T) {
 	}{
 		{
 			name:        "Token Authentication",
-			accessToken: "test-token",
+			accessToken: dummyToken,
 		},
 		{
 			name:     "Basic Authentication",
@@ -233,15 +234,16 @@ func TestBuildToolLoginCommand_Pip(t *testing.T) {
 			assert.NoError(t, err)
 			pipConfigContent := string(pipConfigContentBytes)
 
-			// Validate that the index URL was set correctly in pip.conf.
-			assert.Contains(t, pipConfigContent, fmt.Sprintf("index-url = https://%s:%[email protected]/artifactory/api/pypi/test-repo/simple", testCase.user, testCase.password))
-
-			// Validate token-based authentication.
-			if testCase.accessToken != "" {
-				assert.Contains(t, pipConfigContent, fmt.Sprintf("index-url = https://%[email protected]/artifactory/api/pypi/test-repo/simple", "test-token"))
-			} else if testCase.user != "" && testCase.password != "" {
+			switch {
+			case testCase.accessToken != "":
+				// Validate token-based authentication.
+				assert.Contains(t, pipConfigContent, fmt.Sprintf("index-url = https://%s:%[email protected]/artifactory/api/pypi/test-repo/simple", auth.ExtractUsernameFromAccessToken(testCase.accessToken), testCase.accessToken))
+			case testCase.user != "" && testCase.password != "":
 				// Validate basic authentication with user and password.
 				assert.Contains(t, pipConfigContent, fmt.Sprintf("index-url = https://%s:%[email protected]/artifactory/api/pypi/test-repo/simple", "myUser", "myPassword"))
+			default:
+				// Validate anonymous access.
+				assert.Contains(t, pipConfigContent, "index-url = https://acme.jfrog.io/artifactory/api/pypi/test-repo/simple")
 			}
 		})
 	}

artifactory/commands/python/utils.go

@@ -52,7 +52,7 @@ func GetPypiRemoteRegistryFlag(tool pythonutils.PythonTool) string {
 	return pipenvRemoteRegistryFlag
 }
 
-// Get the pypi repository embedded credentials URL (https://<user>:<token>@<your-artifactory-url>/artifactory/api/pypi/<repo-name>/simple)
+// Get the pypi repository embedded credentials URL (https://<user>:<password/token>@<your-artifactory-url>/artifactory/api/pypi/<repo-name>/simple)
 func GetPypiRepoUrl(serverDetails *config.ServerDetails, repository string, isCurationCmd bool) (string, error) {
 	rtUrl, username, password, err := GetPypiRepoUrlWithCredentials(serverDetails, repository, isCurationCmd)
 	if err != nil {