Merge pull request #32 from kmarkela/bearer

Bearer
kmarkela · Nov 17, 2024 · cede56b · cede56b
2 parents 691e84b + b3d66af
commit cede56b
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 16 deletions.
diff --git a/bin/duffman_darwin_arm64 b/bin/duffman_darwin_arm64
diff --git a/bin/duffman_linux_amd64 b/bin/duffman_linux_amd64
diff --git a/cmd/root.go b/cmd/root.go
@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const version = "v1.2.0-alpha"
+const version = "v1.2.0"
 
 var rootCmd = &cobra.Command{
 	Use:   "DuffMan",

diff --git a/internal/auth/auth.go b/internal/auth/auth.go
@@ -11,12 +11,12 @@ import (
 
 func Do(req *http.Request, auth *Auth) error {
 
-	switch auth.Type {
+	switch strings.ToLower(auth.Type) {
 
-	case "Oauth2":
+	case "oauth2":
 		doOauth2(req, auth.Details)
-	case "Bearer":
-		doBearer(req, auth.Details["bearer"])
+	case "bearer":
+		doBearer(req, auth.Details["token"])
 	}
 
 	return nil
@@ -59,7 +59,7 @@ func doOauth2(req *http.Request, det map[string]string) error {
 	}
 	accessToken, ok := tokenResponse["access_token"].(string)
 	if !ok {
-		return fmt.Errorf("auth error. %s", err.Error())
+		return fmt.Errorf("auth error. No Tocken in responce")
 	}
 
 	doBearer(req, accessToken)

diff --git a/internal/auth/jsonUnmarshal.go b/internal/auth/jsonUnmarshal.go
@@ -41,6 +41,18 @@ func (at AuthType) String() string {
 
 func (a *Auth) UnmarshalJSON(data []byte) error {
 
+	// check if alredy in custom format
+	var tempPrFormat struct {
+		Type    string            `json:"Type"`
+		Details map[string]string `json:"Details"`
+	}
+
+	json.Unmarshal(data, &tempPrFormat)
+	if tempPrFormat.Details != nil {
+		*a = Auth{Type: tempPrFormat.Type, Details: tempPrFormat.Details}
+		return nil
+	}
+
 	var temp struct {
 		Type   string `json:"type"`
 		Oauth2 []KVT  `json:"oauth2"`
@@ -68,6 +80,11 @@ func (a *Auth) UnmarshalJSON(data []byte) error {
 
 }
 
+// func (a Auth) MarshalJSON() ([]byte, error) {
+// 	type Alias Auth
+// 	return json.Marshal(Alias(a))
+// }
+
 func getDet(k []KVT) map[string]string {
 
 	result := map[string]string{}

diff --git a/internal/client/editor.go b/internal/client/editor.go
@@ -124,7 +124,7 @@ func newModel(i item, ml *model) modelEditor {
 	me.inputs[0].MaxHeight = len(strings.Split(req, "\n"))
 	me.inputs[0].SetValue(req)
 
-	vars := buildVarStr(*ml.col, *i.Req)
+	vars := buildVarStr(*ml.col)
 	me.inputs[1].CharLimit = 2 * len(vars)
 	me.inputs[1].MaxHeight = len(strings.Split(vars, "\n"))
 	me.inputs[1].SetValue(vars)

diff --git a/internal/client/eout.go b/internal/client/eout.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 
-	"github.com/kmarkela/duffman/internal/auth"
 	"github.com/kmarkela/duffman/internal/internalTypes"
 	"github.com/kmarkela/duffman/internal/pcollection"
 	"github.com/kmarkela/duffman/internal/req"
@@ -13,13 +12,12 @@ import (
 type varOut struct {
 	Variables []internalTypes.KeyValue `json:"Variables,omitempty"`
 	Env       []internalTypes.KeyValue `json:"Environment,omitempty"`
-	Auth      *auth.Auth               `json:"Auth,omitempty"`
+	// Auth      *auth.Auth               `json:"Auth,omitempty"`
 }
 
 func buildReqStr(rp pcollection.Req, env, vars []internalTypes.KeyValue) string {
 
 	r := req.DeepCopyReq(&rp)
-
 	req.ResolveVars(env, vars, r)
 	r.URL = req.CreateEndpoint(r.URL, r.Parameters.Get, r.Parameters.Path)
 	var buf bytes.Buffer
@@ -33,18 +31,18 @@ func buildReqStr(rp pcollection.Req, env, vars []internalTypes.KeyValue) string
 
 }
 
-func buildVarStr(col pcollection.Collection, rp pcollection.Req) string {
+func buildVarStr(col pcollection.Collection) string {
 
 	var vo varOut
 
 	vo.Variables = col.Variables
 	vo.Env = col.Env
 
-	if rp.Auth != nil {
-		auth := auth.ResolveVars(col.Env, col.Variables, rp.Auth)
-		vo.Auth = &auth
+	// if rp.Auth != nil {
+	// 	auth := auth.ResolveVars(col.Env, col.Variables, rp.Auth)
+	// 	vo.Auth = &auth
 
-	}
+	// }
 
 	marshaled, err := json.MarshalIndent(vo, "", "   ")
 	if err != nil {

diff --git a/internal/pcollection/collection.go b/internal/pcollection/collection.go
@@ -20,7 +20,7 @@ type Req struct {
 	Body        string            `json:"Body,omitempty"`
 	ContentType string            `json:"ContentType,omitempty"`
 	Parameters  Parameters        `json:"-"`
-	Auth        *auth.Auth        `json:"-"`
+	Auth        *auth.Auth        `json:"Auth"`
 }
 
 type Parameters struct {

diff --git a/internal/req/req.go b/internal/req/req.go
@@ -32,6 +32,12 @@ func ResolveVars(env, vars []internalTypes.KeyValue, req *pcollection.Req) {
 
 	allVars := append(vars, env...)
 
+	if req.Auth != nil {
+		// TODO: refactor
+		auth := auth.ResolveVars(env, vars, req.Auth)
+		req.Auth = &auth
+	}
+
 	for _, v := range allVars {
 
 		vk := fmt.Sprintf("{{%s}}", v.Key)
@@ -75,6 +81,7 @@ func DeepCopyReq(original *pcollection.Req) *pcollection.Req {
 			Post: make(map[string]string),
 			Path: make(map[string]string),
 		},
+		Auth: original.Auth,
 	}
 
 	// Copy map values for Headers