quexten/goldwarden
1
1
Fork 0
mirror of https://github.com/quexten/goldwarden.git synced 2024-08-18 07:30:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #241 from iron3oxide/main

Browse Source 
style: Fix typo: Websocked -> Websocket
This commit is contained in:
Bernd Schoolmann 2024-07-04 21:26:13 +02:00 committed by GitHub
commit fa4b735635
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/agent/actions/vault.go
View File

@ -256,7 +256,7 @@ func handleVaultStatus(request messages.IPCMessage, cfg *config.Config, vault *v
vaultStatus.NumberOfLogins = len(vault.GetLogins()) vaultStatus.NumberOfLogins = len(vault.GetLogins())
vaultStatus.NumberOfNotes = len(vault.GetNotes()) vaultStatus.NumberOfNotes = len(vault.GetNotes())
vaultStatus.LastSynced = vault.GetLastSynced() vaultStatus.LastSynced = vault.GetLastSynced()
vaultStatus.WebsockedConnected = vault.IsWebsocketConnected() vaultStatus.WebsocketConnected = vault.IsWebsocketConnected()
vaultStatus.PinSet = cfg.HasPin() vaultStatus.PinSet = cfg.HasPin()
vaultStatus.LoggedIn = cfg.IsLoggedIn() vaultStatus.LoggedIn = cfg.IsLoggedIn()
response, err = messages.IPCMessageFromPayload(vaultStatus) response, err = messages.IPCMessageFromPayload(vaultStatus)

8
cli/agent/vault/vault.go
View File

@ -20,7 +20,7 @@ type Vault struct {
sshKeyNoteIDs []string sshKeyNoteIDs []string
envCredentials map[string]string envCredentials map[string]string
lastSynced int64 lastSynced int64
websockedConnected bool websocketConnected bool
mu sync.Mutex mu sync.Mutex
} }
@ -32,7 +32,7 @@ func NewVault(keyring *crypto.Keyring) *Vault {
sshKeyNoteIDs: make([]string, 0), sshKeyNoteIDs: make([]string, 0),
envCredentials: make(map[string]string), envCredentials: make(map[string]string),
lastSynced: 0, lastSynced: 0,
websockedConnected: false, websocketConnected: false,
} }
} }
@ -424,7 +424,7 @@ func (vault *Vault) GetLastSynced() int64 {
func (vault *Vault) SetWebsocketConnected(connected bool) { func (vault *Vault) SetWebsocketConnected(connected bool) {
vault.lockMutex() vault.lockMutex()
vault.websockedConnected = connected vault.websocketConnected = connected
vault.unlockMutex() vault.unlockMutex()
} }
@ -432,5 +432,5 @@ func (vault *Vault) IsWebsocketConnected() bool {
vault.lockMutex() vault.lockMutex()
defer vault.unlockMutex() defer vault.unlockMutex()
return vault.websockedConnected return vault.websocketConnected
} }

2
cli/cmd/vault.go
View File

@ -114,7 +114,7 @@ var statusCmd = &cobra.Command{
response["loginEntries"] = status.NumberOfLogins response["loginEntries"] = status.NumberOfLogins
response["noteEntries"] = status.NumberOfNotes response["noteEntries"] = status.NumberOfNotes
response["lastSynced"] = time.Unix(status.LastSynced, 0).String() response["lastSynced"] = time.Unix(status.LastSynced, 0).String()
response["websocketConnected"] = status.WebsockedConnected response["websocketConnected"] = status.WebsocketConnected
response["pinSet"] = status.PinSet response["pinSet"] = status.PinSet
response["loggedIn"] = status.LoggedIn response["loggedIn"] = status.LoggedIn
responseJSON, _ := json.Marshal(response) responseJSON, _ := json.Marshal(response)

2
cli/ipc/messages/vault.go
View File

@ -27,7 +27,7 @@ type VaultStatusResponse struct {
NumberOfLogins int NumberOfLogins int
NumberOfNotes int NumberOfNotes int
LastSynced int64 LastSynced int64
WebsockedConnected bool WebsocketConnected bool
} }
func init() { func init() {

2
gui/src/gui/settings.blp
View File

@ -110,7 +110,7 @@ Adw.ApplicationWindow window {
icon-name: "emblem-synchronizing-symbolic"; icon-name: "emblem-synchronizing-symbolic";
} }
Adw.ActionRow websocket_connected_row { Adw.ActionRow websocket_connected_row {
title: "Websocked Connected"; title: "Websocket Connected";
subtitle: "False"; subtitle: "False";
} }
Adw.ActionRow logins_row { Adw.ActionRow logins_row {