Merge pull request #2119 from ccojocar/fix-git-provider-auth

test(git provider): add tests for git providers creation from URL

pkg/auth/server.go

@@ -50,3 +50,16 @@ func (s *AuthServer) GetUsernames() []string {
 	sort.Strings(answer)
 	return answer
 }
+
+func (s *AuthServer) HasUserAuths() bool {
+	return len(s.Users) > 0
+}
+
+func (s *AuthServer) CurrentAuth() *UserAuth {
+	for _, user := range s.Users {
+		if user.Username == s.CurrentUser {
+			return user
+		}
+	}
+	return nil
+}

pkg/gits/provider.go

@@ -322,12 +322,18 @@ func (i *GitRepositoryInfo) CreateProvider(authConfigSvc auth.AuthConfigService,
 func CreateProviderForURL(authConfigSvc auth.AuthConfigService, gitKind string, hostUrl string, git Gitter, batchMode bool, in terminal.FileReader, out terminal.FileWriter, errOut io.Writer) (GitProvider, error) {
 	config := authConfigSvc.Config()
 	server := config.GetOrCreateServer(hostUrl)
-	url := server.URL
 	if gitKind != "" {
 		server.Kind = gitKind
 	}
-	userAuths := authConfigSvc.Config().FindUserAuths(url)
-	if len(userAuths) == 0 {
+
+	var userAuth *auth.UserAuth
+	if server != nil {
+		userAuth = server.CurrentAuth()
+	}
+
+	if userAuth != nil && !userAuth.IsInvalid() {
+		return CreateProvider(server, userAuth, git)
+	} else {
 		kind := server.Kind
 		if kind != "" {
 			userAuth := auth.CreateAuthUserFromEnvironment(strings.ToUpper(kind))
@@ -340,16 +346,11 @@ func CreateProviderForURL(authConfigSvc auth.AuthConfigService, gitKind string,
 			return CreateProvider(server, &userAuth, git)
 		}
 	}
-	if len(userAuths) > 0 {
-		// TODO use default user???
-		auth := userAuths[0]
-		return CreateProvider(server, auth, git)
-	}
-	auth, err := createUserForServer(batchMode, authConfigSvc, server, git, in, out, errOut)
+	userAuth, err := createUserForServer(batchMode, authConfigSvc, server, git, in, out, errOut)
 	if err != nil {
 		return nil, err
 	}
-	return CreateProvider(server, auth, git)
+	return CreateProvider(server, userAuth, git)
 }
 
 func createUserForServer(batchMode bool, authConfigSvc auth.AuthConfigService, server *auth.AuthServer,
@@ -361,7 +362,6 @@ func createUserForServer(batchMode bool, authConfigSvc auth.AuthConfigService, s
 		return nil
 	}
 
-	// TODO could we guess this based on the users ~/.git for github?
 	defaultUserName := ""
 	err := authConfigSvc.Config().EditUserAuth(server.Label(), userAuth, defaultUserName, false, batchMode, f, in, out, errOut)
 	if err != nil {