jira/gitlab: fix a bad login handling in the configurator

Michael Muré created 5 years ago

Change summary

bridge/gitlab/config.go | 12 +++++++-----
bridge/jira/config.go   | 12 +++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)

Detailed changes

bridge/gitlab/config.go

@@ -88,13 +88,15 @@ func (g *Gitlab) Configure(repo *cache.RepoCache, params core.BridgeParams) (cor
 		token.SetMetadata(auth.MetaKeyBaseURL, baseUrl)
 		cred = token
 	default:
-		login := params.Login
-		if login == "" {
+		if params.Login == "" {
 			// TODO: validate username
 			login, err = input.Prompt("Gitlab login", "login", input.Required)
-			if err != nil {
-				return nil, err
-			}
+		} else {
+			// TODO: validate username
+			login = params.Login
+		}
+		if err != nil {
+			return nil, err
 		}
 		cred, err = promptTokenOptions(repo, login, baseUrl)
 		if err != nil {

bridge/jira/config.go

@@ -79,13 +79,15 @@ func (j *Jira) Configure(repo *cache.RepoCache, params core.BridgeParams) (core.
 		}
 		login = l
 	default:
-		login = params.Login
-		if login == "" {
+		if params.Login == "" {
 			// TODO: validate username
 			login, err = input.Prompt("JIRA login", "login", input.Required)
-			if err != nil {
-				return nil, err
-			}
+		} else {
+			// TODO: validate username
+			login = params.Login
+		}
+		if err != nil {
+			return nil, err
 		}
 		cred, err = promptCredOptions(repo, login, baseURL)
 		if err != nil {