encrypts integration secrets

db/integrations/komoot/komoot.go

@@ -4,9 +4,11 @@ import (
 	"bytes"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -16,6 +18,7 @@ import (
 	"github.com/pocketbase/pocketbase/forms"
 	"github.com/pocketbase/pocketbase/models"
 	"github.com/pocketbase/pocketbase/tools/filesystem"
+	"github.com/pocketbase/pocketbase/tools/security"
 	"github.com/twpayne/go-gpx"
 )
 
@@ -26,6 +29,11 @@ func SyncKomoot(app *pocketbase.PocketBase) error {
 	}
 
 	for _, i := range integrations {
+		encryptionKey := os.Getenv("POCKETBASE_ENCRYPTION_KEY")
+		if len(encryptionKey) == 0 {
+			return errors.New("POCKETBASE_ENCRYPTION_KEY not set")
+		}
+
 		userId := i.GetString("user")
 		komootString := i.GetString("komoot")
 		var komootIntegration KomootIntegration
@@ -35,7 +43,13 @@ func SyncKomoot(app *pocketbase.PocketBase) error {
 			continue
 		}
 		k := &KomootApi{}
-		err = k.login(komootIntegration.Email, komootIntegration.Password)
+
+		decryptedPassword, err := security.Decrypt(komootIntegration.Password, encryptionKey)
+		if err != nil {
+			return err
+		}
+
+		err = k.Login(komootIntegration.Email, string(decryptedPassword))
 		if err != nil {
 			warning := fmt.Sprintf("komoot login failed: %v\n", err)
 			fmt.Print(warning)
@@ -114,7 +128,7 @@ func sendRequest(url string, auth *BasicAuthToken) ([]byte, error) {
 	return io.ReadAll(resp.Body)
 }
 
-func (k *KomootApi) login(email, password string) error {
+func (k *KomootApi) Login(email, password string) error {
 	url := fmt.Sprintf("https://api.komoot.de/v006/account/email/%s/", email)
 
 	body, err := sendRequest(url, &BasicAuthToken{email, password})
@@ -222,6 +236,11 @@ func createTrailFromTour(app *pocketbase.PocketBase, detailedTour *DetailedKomoo
 		return err
 	}
 
+	diffculty := detailedTour.Difficulty.Grade
+	if diffculty == "" {
+		diffculty = "easy"
+	}
+
 	form.LoadData(map[string]any{
 		"name":              detailedTour.Name,
 		"public":            detailedTour.Status == "public",
@@ -234,7 +253,7 @@ func createTrailFromTour(app *pocketbase.PocketBase, detailedTour *DetailedKomoo
 		"external_id":       strconv.Itoa(detailedTour.ID),
 		"lat":               detailedTour.StartPoint.Lat,
 		"lon":               detailedTour.StartPoint.Lng,
-		"difficulty":        detailedTour.Difficulty.Grade,
+		"difficulty":        diffculty,
 		"category":          categoryId,
 		"waypoints":         wpIds,
 		"author":            user,

db/integrations/strava/models.go

@@ -2,6 +2,13 @@ package strava
 
 import "time"
 
+type TokenRequest struct {
+	ClientID     int32  `json:"client_id"`
+	ClientSecret string `json:"client_secret"`
+	Code         string `json:"code"`
+	GrantType    string `json:"grant_type"`
+}
+
 type RefreshTokenRequest struct {
 	ClientID     int32  `json:"client_id"`
 	ClientSecret string `json:"client_secret"`

db/integrations/strava/strava.go

@@ -3,9 +3,11 @@ package strava
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"strconv"
 	"time"
 
@@ -14,6 +16,7 @@ import (
 	"github.com/pocketbase/pocketbase/forms"
 	"github.com/pocketbase/pocketbase/models"
 	"github.com/pocketbase/pocketbase/tools/filesystem"
+	"github.com/pocketbase/pocketbase/tools/security"
 	"github.com/twpayne/go-gpx"
 	"github.com/twpayne/go-polyline"
 )
@@ -29,16 +32,35 @@ func SyncStrava(app *pocketbase.PocketBase) error {
 	}
 
 	for _, i := range integrations {
+		encryptionKey := os.Getenv("POCKETBASE_ENCRYPTION_KEY")
+		if len(encryptionKey) == 0 {
+			return errors.New("POCKETBASE_ENCRYPTION_KEY not set")
+		}
+
 		userId := i.GetString("user")
 		stravaString := i.GetString("strava")
 		var stravaIntegration StravaIntegration
-		json.Unmarshal([]byte(stravaString), &stravaIntegration)
+		err := json.Unmarshal([]byte(stravaString), &stravaIntegration)
+		if err != nil {
+			return err
+		}
 
 		if !stravaIntegration.Active || stravaIntegration.RefreshToken == "" {
 			continue
 		}
 
-		r, err := refreshStravaToken(stravaIntegration.ClientID, stravaIntegration.ClientSecret, stravaIntegration.RefreshToken)
+		decryptedSecret, err := security.Decrypt(stravaIntegration.ClientSecret, encryptionKey)
+		if err != nil {
+			return err
+		}
+
+		request := RefreshTokenRequest{
+			ClientID:     stravaIntegration.ClientID,
+			ClientSecret: string(decryptedSecret),
+			RefreshToken: stravaIntegration.RefreshToken,
+			GrantType:    "refresh_token",
+		}
+		r, err := GetStravaToken(request)
 		if err != nil {
 			warning := fmt.Sprintf("error refreshing strava access token: %v\n", err)
 			fmt.Print(warning)
@@ -60,7 +82,10 @@ func SyncStrava(app *pocketbase.PocketBase) error {
 			return err
 		}
 		i.Set("strava", string(b))
-		app.Dao().SaveRecord(i)
+		err = app.Dao().SaveRecord(i)
+		if err != nil {
+			return err
+		}
 
 		if stravaIntegration.Routes {
 			page := 1
@@ -110,15 +135,10 @@ func SyncStrava(app *pocketbase.PocketBase) error {
 	return nil
 }
 
-func refreshStravaToken(clientID int32, clientSecret, refreshToken string) (*RefreshTokenResponse, error) {
+func GetStravaToken(request any) (*RefreshTokenResponse, error) {
 	const stravaTokenURL = "https://www.strava.com/oauth/token"
 
-	requestBody, err := json.Marshal(RefreshTokenRequest{
-		ClientID:     clientID,
-		ClientSecret: clientSecret,
-		RefreshToken: refreshToken,
-		GrantType:    "refresh_token",
-	})
+	requestBody, err := json.Marshal(request)
 	if err != nil {
 		return nil, err
 	}
@@ -137,7 +157,7 @@ func refreshStravaToken(clientID int32, clientSecret, refreshToken string) (*Ref
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("failed to refresh token: received status %d", resp.StatusCode)
+		return nil, fmt.Errorf("failed to get token: received status %d", resp.StatusCode)
 	}
 
 	var tokenResponse RefreshTokenResponse