mirror of
https://github.com/quexten/goldwarden.git
synced 2024-10-27 03:33:14 +03:00
Fix sync error
This commit is contained in:
parent
f798ef3825
commit
24f6907c0d
@ -16,20 +16,12 @@ import (
|
|||||||
|
|
||||||
var log = logging.GetLogger("Goldwarden", "Bitwarden API")
|
var log = logging.GetLogger("Goldwarden", "Bitwarden API")
|
||||||
|
|
||||||
const path = "/.cache/goldwarden-vault.json"
|
|
||||||
|
|
||||||
func Sync(ctx context.Context, config *config.Config) (models.SyncData, error) {
|
func Sync(ctx context.Context, config *config.Config) (models.SyncData, error) {
|
||||||
var sync models.SyncData
|
var sync models.SyncData
|
||||||
if err := authenticatedHTTPGet(ctx, config.ConfigFile.ApiUrl+"/sync", &sync); err != nil {
|
if err := authenticatedHTTPGet(ctx, config.ConfigFile.ApiUrl+"/sync", &sync); err != nil {
|
||||||
return models.SyncData{}, fmt.Errorf("could not sync: %v", err)
|
return models.SyncData{}, fmt.Errorf("could not sync: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
home, _ := os.UserHomeDir()
|
|
||||||
err := WriteVault(sync, home+path)
|
|
||||||
if err != nil {
|
|
||||||
return sync, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return sync, nil
|
return sync, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -38,15 +30,7 @@ func DoFullSync(ctx context.Context, vault *vault.Vault, config *config.Config,
|
|||||||
sync, err := Sync(ctx, config)
|
sync, err := Sync(ctx, config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Could not sync: %v", err)
|
log.Error("Could not sync: %v", err)
|
||||||
if allowCache {
|
return err
|
||||||
home, _ := os.UserHomeDir()
|
|
||||||
sync, err = ReadVault(home + path)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
log.Info("Sync successful, initializing keyring and vault...")
|
log.Info("Sync successful, initializing keyring and vault...")
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user