wrap token comparisons in a function, proliferate it virtually everywhere apk-token was, and fix some related tab/space issues

Author: Andrew Somerville

jiracli/cli.go

@@ -55,7 +55,8 @@ const (
 )
 
 type GlobalOptions struct {
-	// AuthenticationMethod is the method we use to authenticate with the jira serivce. Possible values are "api-token" or "session".
+	// AuthenticationMethod is the method we use to authenticate with the jira serivce.
+	// Possible values are "api-token", "bearer-token" or "session".
 	// The default is "api-token" when the service endpoint ends with "atlassian.net", otherwise it "session".  Session authentication
 	// will promt for user password and use the /auth/1/session-login endpoint.
 	AuthenticationMethod figtree.StringOption `yaml:"authentication-method,omitempty" json:"authentication-method,omitempty"`
@@ -154,6 +155,10 @@ func (o *GlobalOptions) AuthMethod() string {
 	return o.AuthenticationMethod.Value
 }
 
+func (o *GlobalOptions) AuthMethodIsToken() bool{
+	return o.AuthMethod() == "api-token" || o.AuthMethod() == "bearer-token";
+}
+
 func register(app *kingpin.Application, o *oreo.Client, fig *figtree.FigTree) {
 	globals := GlobalOptions{
 		User:                 figtree.NewStringOption(os.Getenv("USER")),
@@ -177,7 +182,7 @@ func register(app *kingpin.Application, o *oreo.Client, fig *figtree.FigTree) {
 			token := globals.GetPass()
 			authHeader := fmt.Sprintf("Bearer %s", token)
 			req.Header.Add("Authorization", authHeader)
-                }
+		}
 		return req, nil
 	})
 
@@ -198,7 +203,7 @@ func register(app *kingpin.Application, o *oreo.Client, fig *figtree.FigTree) {
 				// rerun the original request
 				return o.Do(req)
 			}
-		} else if globals.AuthMethod() == "api-token" && resp.StatusCode == 401 {
+		} else if globals.AuthMethodIsToken() && resp.StatusCode == 401 {
 			globals.SetPass("")
 			return o.Do(req)
 		}
@@ -236,7 +241,7 @@ func register(app *kingpin.Application, o *oreo.Client, fig *figtree.FigTree) {
 			} else if globals.SocksProxy.Value != "" {
 				o = o.WithTransport(socksProxy(globals.SocksProxy.Value))
 			}
-			if globals.AuthMethod() == "api-token" {
+			if globals.AuthMethodIsToken() {
 				o = o.WithCookieFile("")
 			}
 			if globals.Login.Value == "" {

jiracli/password.go

@@ -21,7 +21,7 @@ func (o *GlobalOptions) ProvideAuthParams() *jiradata.AuthParams {
 
 func (o *GlobalOptions) keyName() string {
 	user := o.Login.Value
-	if o.AuthMethod() == "api-token" {
+	if o.AuthMethodIsToken() {
 		user = "api-token:" + user
 	}
 
@@ -133,14 +133,14 @@ func (o *GlobalOptions) GetPass() string {
 		return o.cachedPassword
 	}
 
-	if o.cachedPassword = os.Getenv("JIRA_API_TOKEN"); o.cachedPassword != "" && o.AuthMethod() == "api-token" {
+	if o.cachedPassword = os.Getenv("JIRA_API_TOKEN"); o.cachedPassword != "" && o.AuthMethodIsToken() {
 		return o.cachedPassword
 	}
 
 	prompt := fmt.Sprintf("Jira Password [%s]: ", o.Login)
 	help := ""
 
-	if o.AuthMethod() == "api-token" {
+	if o.AuthMethodIsToken() {
 		prompt = fmt.Sprintf("Jira API-Token [%s]: ", o.Login)
 		help = "API Tokens may be required by your Jira service endpoint: https://developer.atlassian.com/cloud/jira/platform/deprecation-notice-basic-auth-and-cookie-based-auth/"
 	}

jiracmd/logout.go

@@ -30,7 +30,7 @@ func CmdLogoutRegistry() *jiracli.CommandRegistryEntry {
 
 // CmdLogout will attempt to terminate an active Jira session
 func CmdLogout(o *oreo.Client, globals *jiracli.GlobalOptions, opts *jiracli.CommonOptions) error {
-	if (globals.AuthMethod() == "api-token" || globals.AuthMethod() == "bearer-token") {
+	if globals.AuthMethodIsToken() {
 		log.Noticef("No need to logout when using api-token or bearer-token authentication method")
 		if globals.GetPass() != "" && terminal.IsTerminal(int(os.Stdin.Fd())) && terminal.IsTerminal(int(os.Stdout.Fd())) {
 			delete := false