(fix) The constructed server urls were pointing to authorization server, rather than their own JIRA server

Author: christianarty

api/client.go

@@ -6,6 +6,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/zalando/go-keyring"
 
+	"github.com/ankitpokhrel/jira-cli/internal/cmdutil"
 	"github.com/ankitpokhrel/jira-cli/pkg/jira"
 	"github.com/ankitpokhrel/jira-cli/pkg/jira/filter"
 	"github.com/ankitpokhrel/jira-cli/pkg/netrc"
@@ -60,7 +61,14 @@ func Client(config jira.Config) *jira.Client {
 	}
 
 	if config.Server == "" {
-		config.Server = viper.GetString("server")
+		apiServer := viper.GetString("api_server")
+		if apiServer != "" {
+			config.Server = apiServer
+		} else {
+			// Fallback to server URL if api_server is not set
+			cmdutil.Warn("api_server key is not set, falling back to server URL")
+			config.Server = viper.GetString("server")
+		}
 	}
 	if config.Login == "" {
 		config.Login = viper.GetString("login")

internal/config/generator.go

@@ -30,6 +30,7 @@ const (
 	optionBack   = "Go-back"
 	optionNone   = "None"
 	lineBreak    = "----------"
+	apiServer    = "https://api.atlassian.com/ex/jira"
 )
 
 var (
@@ -81,7 +82,9 @@ type JiraCLIConfigGenerator struct {
 	value  struct {
 		installation string
 		server       string
-		version      struct {
+		// API server is the server URL for the Jira API. Should be the same as the server URL if not oAuth.
+		apiServer string
+		version   struct {
 			major, minor, patch int
 		}
 		login        string
@@ -368,10 +371,6 @@ func (c *JiraCLIConfigGenerator) configureOAuth() error {
 func (c *JiraCLIConfigGenerator) configureServerAndLoginDetails() error {
 	var qs []*survey.Question
 
-	if c.value.authType == jira.AuthTypeOAuth {
-		// Set server URL using the cloud ID from OAuth configuration
-		c.usrCfg.Server = fmt.Sprintf("https://api.atlassian.com/ex/jira/%s", c.value.oauth.cloudId)
-	}
 	c.value.server = c.usrCfg.Server
 	c.value.login = c.usrCfg.Login
 
@@ -469,18 +468,26 @@ func (c *JiraCLIConfigGenerator) configureServerAndLoginDetails() error {
 
 		if ans.Server != "" {
 			c.value.server = ans.Server
+
 		}
 		if ans.Login != "" {
 			c.value.login = ans.Login
 		}
+
+		if c.value.authType == jira.AuthTypeOAuth {
+			// Set server URL using the cloud ID from OAuth configuration
+			c.value.apiServer = fmt.Sprintf("%s/%s", apiServer, c.value.oauth.cloudId)
+		} else {
+			c.value.apiServer = c.value.server
+		}
 	}
 	// Trim trailing slash from server URL
 	c.value.server = strings.TrimRight(c.value.server, "/")
 	return c.verifyLoginDetails()
 }
 func (c *JiraCLIConfigGenerator) generateJiraConfig() jira.Config {
 	config := jira.Config{
-		Server:   c.value.server,
+		Server:   c.value.apiServer,
 		Login:    c.value.login,
 		Insecure: &c.usrCfg.Insecure,
 		AuthType: &c.value.authType,
@@ -819,6 +826,7 @@ func (c *JiraCLIConfigGenerator) write(path string) (string, error) {
 
 	config.Set("installation", c.value.installation)
 	config.Set("server", c.value.server)
+	config.Set("api_server", c.value.apiServer)
 	config.Set("login", c.value.login)
 	config.Set("project", c.value.project)
 	config.Set("epic", c.value.epic)