fix prefixing bearer token twice

lib/client/client.go

@@ -19,10 +19,12 @@ package client
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/SENERGY-Platform/import-deploy/lib/model"
-	"github.com/SENERGY-Platform/service-commons/pkg/jwt"
 	"io"
 	"net/http"
+	"strings"
+
+	"github.com/SENERGY-Platform/import-deploy/lib/model"
+	"github.com/SENERGY-Platform/service-commons/pkg/jwt"
 )
 
 type Interface interface {
@@ -59,3 +61,11 @@ func do[T any](req *http.Request) (result T, err error, code int) {
 	}
 	return
 }
+
+func prefixTokenIfNeeded(jwt jwt.Token) string {
+	s := jwt.Jwt()
+	if !strings.HasPrefix(strings.ToLower(s), "bearer ") {
+		s = "Bearer " + s
+	}
+	return s
+}

lib/client/instances.go

@@ -43,7 +43,7 @@ func (c *Client) ListInstances(jwt jwt.Token, limit int64, offset int64, sort st
 	if err != nil {
 		return results, err, http.StatusBadRequest
 	}
-	req.Header.Set("Authorization", "Bearer "+jwt.Jwt())
+	req.Header.Set("Authorization", prefixTokenIfNeeded(jwt))
 	return do[[]model.Instance](req)
 }
 
@@ -52,7 +52,7 @@ func (c *Client) ReadInstance(id string, jwt jwt.Token, forUser string) (result
 	if err != nil {
 		return result, err, http.StatusBadRequest
 	}
-	req.Header.Set("Authorization", "Bearer "+jwt.Jwt())
+	req.Header.Set("Authorization", prefixTokenIfNeeded(jwt))
 	return do[model.Instance](req)
 }
 
@@ -65,7 +65,7 @@ func (c *Client) CreateInstance(instance model.Instance, jwt jwt.Token) (result
 	if err != nil {
 		return result, err, http.StatusInternalServerError
 	}
-	req.Header.Set("Authorization", "Bearer "+jwt.Jwt())
+	req.Header.Set("Authorization", prefixTokenIfNeeded(jwt))
 	return do[model.Instance](req)
 }
 
@@ -78,7 +78,7 @@ func (c *Client) SetInstance(importType model.Instance, jwt jwt.Token) (err erro
 	if err != nil {
 		return err, http.StatusInternalServerError
 	}
-	req.Header.Set("Authorization", "Bearer "+jwt.Jwt())
+	req.Header.Set("Authorization", prefixTokenIfNeeded(jwt))
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return err, http.StatusInternalServerError
@@ -91,7 +91,7 @@ func (c *Client) DeleteInstance(id string, jwt jwt.Token, forUser string) (err e
 	if err != nil {
 		return err, http.StatusBadRequest
 	}
-	req.Header.Set("Authorization", "Bearer "+jwt.Jwt())
+	req.Header.Set("Authorization", prefixTokenIfNeeded(jwt))
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return err, http.StatusInternalServerError
@@ -107,6 +107,6 @@ func (c *Client) CountInstances(jwt jwt.Token, search string, includeGenerated b
 	if err != nil {
 		return 0, err, http.StatusBadRequest
 	}
-	req.Header.Set("Authorization", "Bearer "+jwt.Jwt())
+	req.Header.Set("Authorization", prefixTokenIfNeeded(jwt))
 	return do[int64](req)
 }