Fixed bug on empty strings

Author: djthorpe

cmd/api/bitwarden.go

@@ -20,8 +20,9 @@ import (
 
 type bwCipher struct {
 	Name     string `json:"name,wrap"`
-	Username string `json:"username,width:30"`
-	URI      string `json:"uri,width:40"`
+	Username string `json:"username,width:30,wrap"`
+	Password string `json:"password,width:30,wrap"`
+	URI      string `json:"uri,width:40,wrap"`
 	Folder   string `json:"folder,width:36"`
 }
 
@@ -177,14 +178,28 @@ func bwLogins(w *tablewriter.Writer, _ []string) error {
 	}
 
 	// Decrypt the ciphers from the session
-	var result []*schema.Cipher
+	var result []bwCipher
 	for cipher := ciphers.Next(); cipher != nil; cipher = ciphers.Next() {
+		if cipher.Type != schema.CipherTypeLogin || cipher.Login == nil {
+			continue
+		}
 		if ciphers.CanCrypt() {
 			if cipher, err := ciphers.Decrypt(cipher); err == nil {
-				result = append(result, cipher)
+				result = append(result, bwCipher{
+					Name:     cipher.Name,
+					Username: cipher.Login.Username,
+					Password: cipher.Login.Password,
+					URI:      cipher.Login.URI,
+					Folder:   cipher.FolderId,
+				})
 			}
 		} else {
-			result = append(result, cipher)
+			result = append(result, bwCipher{
+				Name:     cipher.Name,
+				Username: cipher.Login.Username,
+				URI:      cipher.Login.URI,
+				Folder:   cipher.FolderId,
+			})
 		}
 	}
 	return w.Write(result)

pkg/bitwarden/crypto/crypto.go

@@ -184,7 +184,9 @@ func (k *CryptoKey) Decrypt(data *Encrypted) ([]byte, error) {
 }
 
 func (k *CryptoKey) DecryptStr(data string) (string, error) {
-	if encrypted, err := NewEncrypted(data); err != nil {
+	if data == "" {
+		return "", nil
+	} else if encrypted, err := NewEncrypted(data); err != nil {
 		return "", err
 	} else if value, err := k.Decrypt(encrypted); err != nil {
 		return "", err

pkg/bitwarden/schema/cipher.go

@@ -15,16 +15,16 @@ import (
 type Ciphers []*Cipher
 
 type Cipher struct {
-	Id             string       `json:"id"`
-	Name           string       `json:"name"`
-	Type           CipherType   `json:"type"`
-	FolderId       string       `json:"folderId,omitempty"`
-	OrganizationId string       `json:"organizationId,omitempty"`
-	Favorite       bool         `json:"favorite,omitempty"`
-	Edit           bool         `json:"edit"`
-	RevisionDate   time.Time    `json:"revisionDate"`
+	Id             string       `json:"id,width:36"`
+	Name           string       `json:"name,width:30"`
+	Type           CipherType   `json:"type,width:5"`
+	FolderId       string       `json:"folderId,omitempty,width:36"`
+	OrganizationId string       `json:"organizationId,omitempty,width:36"`
+	Favorite       bool         `json:"favorite,omitempty,width:5"`
+	Edit           bool         `json:"edit,width:5"`
+	RevisionDate   time.Time    `json:"revisionDate,width:29"`
 	CollectionIds  []string     `json:"collectionIds,omitempty"`
-	ViewPassword   bool         `json:"viewPassword"`
+	ViewPassword   bool         `json:"viewPassword,width:5"`
 	Login          *CipherLogin `json:"Login,omitempty,wrap"`
 	//	Card           *CardData       `json:"Card,omitempty"`
 	//	SecureNote     *SecureNoteData `json:"SecureNote,omitempty"`