Add sync return url

quexten · Feb 4, 2024 · f319686 · f319686
1 parent d0e0d66
commit f319686
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/agent/actions/send.go b/agent/actions/send.go
@@ -19,9 +19,11 @@ func handleCreateSend(msg messages.IPCMessage, cfg *config.Config, vault *vault.
 	parsedMsg := messages.ParsePayload(msg).(messages.CreateSendRequest)
 
 	ctx := context.WithValue(context.TODO(), bitwarden.AuthToken{}, token.AccessToken)
-	_, err = bitwarden.CreateSend(ctx, cfg, vault, parsedMsg.Name, parsedMsg.Text)
+	url, err := bitwarden.CreateSend(ctx, cfg, vault, parsedMsg.Name, parsedMsg.Text)
 
-	response, err = messages.IPCMessageFromPayload(messages.CreateSendResponse{})
+	response, err = messages.IPCMessageFromPayload(messages.CreateSendResponse{
+		URL: url,
+	})
 	return
 }
 

diff --git a/agent/bitwarden/send.go b/agent/bitwarden/send.go
@@ -4,7 +4,9 @@ import (
 	"context"
 	"crypto/rand"
 	"crypto/sha256"
+	"encoding/base64"
 	"io"
+	"strings"
 	"time"
 
 	"github.com/quexten/goldwarden/agent/bitwarden/crypto"
@@ -38,6 +40,8 @@ type SendMetadata struct {
 }
 
 type SendCreateRequest struct {
+	AccessCount    *int             `json:"accessCount"`
+	AccessId       *string          `json:"accessId"`
 	DeletionDate   string           `json:"deletionDate"`
 	Disabled       bool             `json:"disabled"`
 	ExpirationDate *string          `json:"expirationDate"`
@@ -50,38 +54,38 @@ type SendCreateRequest struct {
 	Type           int              `json:"type"`
 }
 
-func CreateSend(ctx context.Context, cfg *config.Config, vault *vault.Vault, name string, text string) (SendMetadata, error) {
+func CreateSend(ctx context.Context, cfg *config.Config, vault *vault.Vault, name string, text string) (string, error) {
 	timestampIn14Days := time.Now().AddDate(0, 0, 14)
 	timestampIn14DaysStr := timestampIn14Days.Format("2006-01-02T15:04:05Z")
 
 	// generate 32 byte key
 	sendSourceKey := make([]byte, 32)
 	_, err := io.ReadFull(rand.Reader, sendSourceKey)
 	if err != nil {
-		return SendMetadata{}, err
+		return "", err
 	}
 
 	encryptedSendSourceKey, err := crypto.EncryptWithToString(sendSourceKey, crypto.AesCbc256_HmacSha256_B64, vault.Keyring.GetAccountKey())
 	if err != nil {
-		return SendMetadata{}, err
+		return "", err
 	}
 
 	sendUseKeyPairBytes := make([]byte, 64)
 	hkdf.New(sha256.New, sendSourceKey, []byte("bitwarden-send"), []byte("send")).Read(sendUseKeyPairBytes)
 
 	sendUseKeyPair, err := crypto.MemorySymmetricEncryptionKeyFromBytes(sendUseKeyPairBytes)
 	if err != nil {
-		return SendMetadata{}, err
+		return "", err
 	}
 
 	encryptedName, err := crypto.EncryptWithToString([]byte(name), crypto.AesCbc256_HmacSha256_B64, sendUseKeyPair)
 	if err != nil {
-		return SendMetadata{}, err
+		return "", err
 	}
 
 	encryptedText, err := crypto.EncryptWithToString([]byte(text), crypto.AesCbc256_HmacSha256_B64, sendUseKeyPair)
 	if err != nil {
-		return SendMetadata{}, err
+		return "", err
 	}
 
 	sendRequest := SendCreateRequest{
@@ -97,11 +101,11 @@ func CreateSend(ctx context.Context, cfg *config.Config, vault *vault.Vault, nam
 		Type: 0,
 	}
 
-	var result interface{}
+	var result SendCreateRequest
 	err = authenticatedHTTPPost(ctx, cfg.ConfigFile.ApiUrl+"/sends", &result, sendRequest)
 	if err != nil {
-		return SendMetadata{}, err
+		return "", err
 	}
 
-	return SendMetadata{}, nil
+	return cfg.ConfigFile.VaultUrl + "/#/send/" + *result.AccessId + "/" + strings.ReplaceAll(base64.RawURLEncoding.EncodeToString(sendSourceKey), "+", "-"), nil
 }
diff --git a/agent/bitwarden/sync.go b/agent/bitwarden/sync.go
@@ -10,7 +10,6 @@ import (
 	"github.com/quexten/goldwarden/agent/bitwarden/crypto"
 	"github.com/quexten/goldwarden/agent/bitwarden/models"
 	"github.com/quexten/goldwarden/agent/config"
-	"github.com/quexten/goldwarden/agent/notify"
 	"github.com/quexten/goldwarden/agent/vault"
 	"github.com/quexten/goldwarden/logging"
 )
@@ -35,7 +34,6 @@ func DoFullSync(ctx context.Context, vault *vault.Vault, config *config.Config,
 	sync, err := Sync(ctx, config)
 	if err != nil {
 		log.Error("Could not sync: %v", err)
-		notify.Notify("Goldwarden", "Could not sync", "", 0, func() {})
 		if allowCache {
 			home, _ := os.UserHomeDir()
 			sync, err = ReadVault(home + path)