Backup and restore

command/auth/login/command.go

@@ -1,6 +1,7 @@
 package login
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"time"
@@ -23,6 +24,8 @@ var Command = &cli.Command{
 	},
 	Action: func(c *cli.Context) (err error) {
 
+		ctx := context.Background()
+
 		defer func() {
 			if err != nil {
 				err = cli.Exit(fmt.Errorf("while logging in: %w", err), 1)
@@ -36,7 +39,7 @@ var Command = &cli.Command{
 		serverURL := c.Args().First()
 
 		loginStartResponse := &server.LoginStartResponse{}
-		err = client.CallAPI(serverURL, "POST", "auth/login", nil, nil, client.JSONDecoder(loginStartResponse), 200)
+		err = client.CallAPI(ctx, serverURL, "", "POST", "auth/login", nil, nil, client.JSONDecoder(loginStartResponse), 200)
 		if err != nil {
 			return fmt.Errorf("while starting login process: %w", err)
 		}
@@ -60,7 +63,9 @@ var Command = &cli.Command{
 
 			var tr server.AccessTokenResponse
 			err = client.CallAPI(
+				ctx,
 				serverURL,
+				"",
 				"POST", "auth/access_token",
 				nil,
 				client.JSONEncoder(

command/clone/command.go

@@ -2,6 +2,7 @@ package clone
 
 import (
 	"archive/tar"
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -11,6 +12,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/draganm/kartusche/common/auth"
 	"github.com/draganm/kartusche/common/client"
 	"github.com/draganm/kartusche/config"
 	"github.com/urfave/cli/v2"
@@ -28,6 +30,8 @@ var Command = &cli.Command{
 			}
 		}()
 
+		ctx := context.Background()
+
 		if c.NArg() != 1 {
 			return errors.New("kartusche url must be provided")
 		}
@@ -108,7 +112,12 @@ var Command = &cli.Command{
 
 		}
 
-		err = client.CallAPI(baseURL.String(), "GET", u.Path, nil, nil, dumpWriter, 200)
+		tkn, err := auth.GetTokenForServer(baseURL.String())
+		if err != nil {
+			return fmt.Errorf("could not get token for server: %w", err)
+		}
+
+		err = client.CallAPI(ctx, baseURL.String(), tkn, "GET", u.Path, nil, nil, dumpWriter, 200)
 		if err != nil {
 			return err
 		}

command/info/dbstats/command.go

@@ -1,11 +1,13 @@
 package dbstats
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
 	"path"
 
+	"github.com/draganm/kartusche/common/auth"
 	"github.com/draganm/kartusche/common/client"
 	"github.com/draganm/kartusche/common/serverurl"
 	"github.com/draganm/kartusche/runtime"
@@ -24,6 +26,8 @@ var Command = &cli.Command{
 			}
 		}()
 
+		ctx := context.Background()
+
 		serverBaseURL, err := serverurl.BaseServerURL("")
 		if err != nil {
 			return err
@@ -39,8 +43,13 @@ var Command = &cli.Command{
 			return errors.New("name of kartusche must be provided")
 		}
 
+		tkn, err := auth.GetTokenForServer(serverBaseURL)
+		if err != nil {
+			return fmt.Errorf("could not get token for server: %w", err)
+		}
+
 		dbs := &runtime.DBStats{}
-		err = client.CallAPI(serverBaseURL, "GET", path.Join("kartusches", name, "info", "dbstats"), nil, nil, client.JSONDecoder(&dbs), 200)
+		err = client.CallAPI(ctx, serverBaseURL, tkn, "GET", path.Join("kartusches", name, "info", "dbstats"), nil, nil, client.JSONDecoder(&dbs), 200)
 		if err != nil {
 			return fmt.Errorf("while starting login process: %w", err)
 		}

command/info/handlers/command.go

@@ -1,10 +1,12 @@
 package handlers
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"path"
 
+	"github.com/draganm/kartusche/common/auth"
 	"github.com/draganm/kartusche/common/client"
 	"github.com/draganm/kartusche/common/serverurl"
 	"github.com/draganm/kartusche/server"
@@ -37,8 +39,13 @@ var Command = &cli.Command{
 			return errors.New("name of kartusche must be provided")
 		}
 
+		tkn, err := auth.GetTokenForServer(serverBaseURL)
+		if err != nil {
+			return fmt.Errorf("could not get token for server: %w", err)
+		}
+
 		handlers := []server.HandlerInfo{}
-		err = client.CallAPI(serverBaseURL, "GET", path.Join("kartusches", name, "info", "handlers"), nil, nil, client.JSONDecoder(&handlers), 200)
+		err = client.CallAPI(context.Background(), serverBaseURL, tkn, "GET", path.Join("kartusches", name, "info", "handlers"), nil, nil, client.JSONDecoder(&handlers), 200)
 		if err != nil {
 			return fmt.Errorf("while starting login process: %w", err)
 		}

command/ls/command.go

@@ -1,8 +1,10 @@
 package ls
 
 import (
+	"context"
 	"fmt"
 
+	"github.com/draganm/kartusche/common/auth"
 	"github.com/draganm/kartusche/common/client"
 	"github.com/draganm/kartusche/common/serverurl"
 	"github.com/urfave/cli/v2"
@@ -24,8 +26,13 @@ var Command = &cli.Command{
 			return err
 		}
 
+		tkn, err := auth.GetTokenForServer(serverBaseURL)
+		if err != nil {
+			return fmt.Errorf("could not get token for server: %w", err)
+		}
+
 		kl := []string{}
-		err = client.CallAPI(serverBaseURL, "GET", "kartusches", nil, nil, client.JSONDecoder(&kl), 200)
+		err = client.CallAPI(context.Background(), serverBaseURL, tkn, "GET", "kartusches", nil, nil, client.JSONDecoder(&kl), 200)
 		if err != nil {
 			return err
 		}

command/rm/command.go

@@ -1,11 +1,13 @@
 package rm
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"path"
 	"strings"
 
+	"github.com/draganm/kartusche/common/auth"
 	"github.com/draganm/kartusche/common/client"
 	"github.com/draganm/kartusche/common/serverurl"
 	"github.com/urfave/cli/v2"
@@ -43,7 +45,13 @@ var Command = &cli.Command{
 		if err != nil {
 			return err
 		}
-		err = client.CallAPI(serverBaseURL, "DELETE", path.Join("kartusches", name), nil, nil, nil, 204)
+
+		tkn, err := auth.GetTokenForServer(serverBaseURL)
+		if err != nil {
+			return fmt.Errorf("could not get token for server: %w", err)
+		}
+
+		err = client.CallAPI(context.Background(), serverBaseURL, tkn, "DELETE", path.Join("kartusches", name), nil, nil, nil, 204)
 		if err != nil {
 			return err
 		}

command/update/code/command.go

@@ -2,13 +2,15 @@ package code
 
 import (
 	"archive/tar"
+	"context"
 	"fmt"
 	"io"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
 
+	"github.com/draganm/kartusche/common/auth"
 	"github.com/draganm/kartusche/common/client"
 	"github.com/draganm/kartusche/common/paths"
 	"github.com/draganm/kartusche/common/serverurl"
@@ -42,6 +44,11 @@ var Command = &cli.Command{
 			return err
 		}
 
+		tkn, err := auth.GetTokenForServer(serverBaseURL)
+		if err != nil {
+			return fmt.Errorf("could not get token for server: %w", err)
+		}
+
 		tf, err := os.CreateTemp("", "")
 		if err != nil {
 			return fmt.Errorf("while creating temp file: %w", err)
@@ -128,7 +135,7 @@ var Command = &cli.Command{
 			return fmt.Errorf("while seeking tar file to beginning: %w", err)
 		}
 
-		err = client.CallAPI(serverBaseURL, "PATCH", path.Join("kartusches", cfg.Name, "code"), nil, func() (io.Reader, error) { return tf, nil }, nil, 204)
+		err = client.CallAPI(context.Background(), serverBaseURL, tkn, "PATCH", path.Join("kartusches", cfg.Name, "code"), nil, func() (io.Reader, error) { return tf, nil }, nil, 204)
 		if err != nil {
 			return err
 		}

command/upload/command.go

@@ -1,12 +1,14 @@
 package upload
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
 	"path"
 	"path/filepath"
 
+	"github.com/draganm/kartusche/common/auth"
 	"github.com/draganm/kartusche/common/client"
 	"github.com/draganm/kartusche/common/serverurl"
 	"github.com/draganm/kartusche/config"
@@ -58,14 +60,19 @@ var Command = &cli.Command{
 			return err
 		}
 
+		tkn, err := auth.GetTokenForServer(serverBaseURL)
+		if err != nil {
+			return fmt.Errorf("could not get token for server: %w", err)
+		}
+
 		kf, err := os.Open(kartuscheFileName)
 		if err != nil {
 			return err
 		}
 
 		defer kf.Close()
 
-		err = client.CallAPI(serverBaseURL, "PUT", path.Join("kartusches", cfg.Name), nil, func() (io.Reader, error) { return kf, nil }, nil, 204)
+		err = client.CallAPI(context.Background(), serverBaseURL, tkn, "PUT", path.Join("kartusches", cfg.Name), nil, func() (io.Reader, error) { return kf, nil }, nil, 204)
 		if err != nil {
 			return err
 		}

common/client/api_client.go

@@ -1,33 +1,23 @@
 package client
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
 	"path"
-	"strings"
-
-	"github.com/draganm/kartusche/common/auth"
 )
 
 func CallAPI(
-	baseURL, method, pth string,
+	ctx context.Context,
+	baseURL, tkn, method, pth string,
 	q url.Values,
 	bodyEncoder func() (io.Reader, error),
 	responseCallback func(io.Reader) error,
 	expectedStatus int,
 ) error {
 
-	var tkn string
-	if !(strings.HasPrefix(pth, "/auth/") || strings.HasPrefix(pth, "auth/")) {
-		var err error
-		tkn, err = auth.GetTokenForServer(baseURL)
-		if err != nil {
-			return err
-		}
-	}
-
 	bu, err := url.Parse(baseURL)
 	if err != nil {
 		return fmt.Errorf("while parsing server base url: %w", err)
@@ -47,7 +37,7 @@ func CallAPI(
 		}
 	}
 
-	req, err := http.NewRequest(method, bu.String(), body)
+	req, err := http.NewRequestWithContext(ctx, method, bu.String(), body)
 	if err != nil {
 		return fmt.Errorf("while creating request: %w", err)
 	}

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/cbroglie/mustache v1.3.1
 	github.com/dop251/goja v0.0.0-20221229151140-b95230a9dbad
-	github.com/draganm/bolted v0.9.2
+	github.com/draganm/bolted v0.10.1
 	github.com/fsnotify/fsnotify v1.5.4
 	github.com/go-logr/zapr v1.2.3
 	github.com/gorilla/mux v1.8.0

go.sum

@@ -58,8 +58,8 @@ github.com/dop251/goja v0.0.0-20221229151140-b95230a9dbad h1:EikyYzLzjRNW8lz9VAI
 github.com/dop251/goja v0.0.0-20221229151140-b95230a9dbad/go.mod h1:yRkwfj0CBpOGre+TwBsqPV0IH0Pk73e4PXJOeNDboGs=
 github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=
-github.com/draganm/bolted v0.9.2 h1:4T9FjEZFVF1rpcjP4J5TNOAyn8ayFDFHWo9k3TLwXfM=
-github.com/draganm/bolted v0.9.2/go.mod h1:JzpeZ2BmuDuMggRz3gVL+1qX2C6b8+6pTgILbrZPztw=
+github.com/draganm/bolted v0.10.1 h1:SzG/e88ElhABlfrqxzDB9e+qt6Ql+TMIwLDxPR5cC1M=
+github.com/draganm/bolted v0.10.1/go.mod h1:JzpeZ2BmuDuMggRz3gVL+1qX2C6b8+6pTgILbrZPztw=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=