Merge pull request #226 from ctreminiom/feature/auth-interface-refactor

✨ Added Bearer token support.
ctreminiom · Jul 25, 2023 · 4b192bc · 4b192bc
2 parents b08439e + 873be88
commit 4b192bc
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 0 deletions.
diff --git a/confluence/api_client_impl.go b/confluence/api_client_impl.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
 	"github.com/ctreminiom/go-atlassian/confluence/internal"
 	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/service/common"
@@ -97,6 +98,10 @@ func (c *Client) NewFormRequest(ctx context.Context, method, apiEndpoint, conten
 		request.Header.Set("User-Agent", c.Auth.GetUserAgent())
 	}
 
+	if c.Auth.GetBearerToken() != "" {
+		request.Header.Add("Authorization", fmt.Sprintf("Bearer %v", c.Auth.GetBearerToken()))
+	}
+
 	return request, nil
 }
 

diff --git a/confluence/v2/api_client_impl.go b/confluence/v2/api_client_impl.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
 	"github.com/ctreminiom/go-atlassian/confluence/internal"
 	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/service/common"
@@ -77,6 +78,10 @@ func (c *Client) NewFormRequest(ctx context.Context, method, apiEndpoint, conten
 		request.Header.Set("User-Agent", c.Auth.GetUserAgent())
 	}
 
+	if c.Auth.GetBearerToken() != "" {
+		request.Header.Add("Authorization", fmt.Sprintf("Bearer %v", c.Auth.GetBearerToken()))
+	}
+
 	return request, nil
 }
 

diff --git a/jira/agile/api_client_impl.go b/jira/agile/api_client_impl.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
 	"github.com/ctreminiom/go-atlassian/jira/agile/internal"
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/service/common"
@@ -94,6 +95,10 @@ func (c *Client) NewRequest(ctx context.Context, method, urlStr, type_ string, b
 		req.Header.Set("User-Agent", c.Auth.GetUserAgent())
 	}
 
+	if c.Auth.GetBearerToken() != "" {
+		req.Header.Add("Authorization", fmt.Sprintf("Bearer %v", c.Auth.GetBearerToken()))
+	}
+
 	return req, nil
 }
 

diff --git a/jira/agile/api_client_impl_test.go b/jira/agile/api_client_impl_test.go
@@ -249,6 +249,7 @@ func TestClient_NewRequest(t *testing.T) {
 	authMocked := internal.NewAuthenticationService(nil)
 	authMocked.SetBasicAuth("mail", "token")
 	authMocked.SetUserAgent("firefox")
+	authMocked.SetBearerToken("token_sample")
 
 	siteAsURL, err := url.Parse("https://ctreminiom.atlassian.net")
 	if err != nil {

diff --git a/jira/v2/api_client_impl.go b/jira/v2/api_client_impl.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
 	"github.com/ctreminiom/go-atlassian/jira/internal"
 	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/service/common"
@@ -453,6 +454,10 @@ func (c *Client) NewRequest(ctx context.Context, method, urlStr, type_ string, b
 		req.Header.Set("User-Agent", c.Auth.GetUserAgent())
 	}
 
+	if c.Auth.GetBearerToken() != "" {
+		req.Header.Add("Authorization", fmt.Sprintf("Bearer %v", c.Auth.GetBearerToken()))
+	}
+
 	return req, nil
 }
 func (c *Client) Call(request *http.Request, structure interface{}) (*models.ResponseScheme, error) {

diff --git a/jira/v2/api_client_impl_test.go b/jira/v2/api_client_impl_test.go
@@ -242,6 +242,7 @@ func TestClient_NewRequest(t *testing.T) {
 	authMocked := internal.NewAuthenticationService(nil)
 	authMocked.SetBasicAuth("mail", "token")
 	authMocked.SetUserAgent("firefox")
+	authMocked.SetBearerToken("token_sample")
 
 	siteAsURL, err := url.Parse("https://ctreminiom.atlassian.net")
 	if err != nil {

diff --git a/jira/v3/api_client_impl.go b/jira/v3/api_client_impl.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
 	"github.com/ctreminiom/go-atlassian/jira/internal"
 	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/service/common"
@@ -453,6 +454,10 @@ func (c *Client) NewRequest(ctx context.Context, method, urlStr, type_ string, b
 		req.Header.Set("User-Agent", c.Auth.GetUserAgent())
 	}
 
+	if c.Auth.GetBearerToken() != "" {
+		req.Header.Add("Authorization", fmt.Sprintf("Bearer %v", c.Auth.GetBearerToken()))
+	}
+
 	return req, nil
 }
 

diff --git a/jira/v3/api_client_impl_test.go b/jira/v3/api_client_impl_test.go
@@ -242,6 +242,7 @@ func TestClient_NewRequest(t *testing.T) {
 	authMocked := internal.NewAuthenticationService(nil)
 	authMocked.SetBasicAuth("mail", "token")
 	authMocked.SetUserAgent("firefox")
+	authMocked.SetBearerToken("token_sample")
 
 	siteAsURL, err := url.Parse("https://ctreminiom.atlassian.net")
 	if err != nil {