Use authorization header instead of X-JFrog-Art-Api

Author: code-asher

README.md

@@ -58,6 +58,9 @@ export ARTIFACTORY_TOKEN="my-token"
 ./code-marketplace [command] --artifactory http://artifactory.server/artifactory --repo extensions
 ```
 
+The token will be used as the `Authorization` header with the value `Bearer
+<TOKEN>`.
+
 ### Exposing the marketplace
 
 The marketplace must be put behind TLS otherwise code-server will reject

fixtures/upload.bash

@@ -4,4 +4,4 @@
 set -Eeuo pipefail
 
 cd ./extensions
-find . -type f -exec curl -H "X-JFrog-Art-Api:$ARTIFACTORY_TOKEN" -T '{}' "$ARTIFACTORY_URI/$ARTIFACTORY_REPO/"'{}' \;
+find . -type f -exec curl -H "Authorization: Bearer $ARTIFACTORY_TOKEN" -T '{}' "$ARTIFACTORY_URI/$ARTIFACTORY_REPO/"'{}' \;

storage/artifactory.go

@@ -138,7 +138,7 @@ func (s *Artifactory) request(ctx context.Context, method, endpoint string, r io
 	if err != nil {
 		return nil, http.StatusInternalServerError, err
 	}
-	req.Header.Add("X-JFrog-Art-Api", s.token)
+	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", s.token))
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, http.StatusInternalServerError, err

storage/artifactory_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"errors"
+	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -176,7 +177,7 @@ func artifactoryFactory(t *testing.T) testStorage {
 			t.Log("Failed to clean up", err)
 			return
 		}
-		req.Header.Add("X-JFrog-Art-Api", token)
+		req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
 		res, err := http.DefaultClient.Do(req)
 		if err != nil {
 			t.Log("Failed to clean up", err)
@@ -192,15 +193,15 @@ func artifactoryFactory(t *testing.T) testStorage {
 		write: func(content []byte, elem ...string) {
 			req, err := http.NewRequest(http.MethodPut, uri+path.Join(repo, path.Join(elem...)), bytes.NewReader(content))
 			require.NoError(t, err)
-			req.Header.Add("X-JFrog-Art-Api", token)
+			req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
 			res, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			defer res.Body.Close()
 		},
 		exists: func(elem ...string) bool {
 			req, err := http.NewRequest(http.MethodGet, uri+path.Join(repo, path.Join(elem...)), nil)
 			require.NoError(t, err)
-			req.Header.Add("X-JFrog-Art-Api", token)
+			req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
 			res, err := http.DefaultClient.Do(req)
 			if err != nil {
 				return false