Misc

rdnt · Jul 5, 2023 · e530080 · e530080
1 parent 76d04bc
commit e530080
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/client/remote/invitations.go b/src/client/remote/invitations.go
@@ -141,7 +141,9 @@ func (r *Remote) DeleteInvitation(id string) (invitation.Invitation, error) {
 	return inv, nil
 }
 
-func (r *Remote) FinalizeInvitation(invitationId string, privateKey []byte, inviteePublicKey []byte, k keystore.Keystore) (invitation.Invitation, error) {
+func (r *Remote) FinalizeInvitation(
+	invitationId string, privateKey []byte, inviteePublicKey []byte, k keystore.Keystore,
+) (invitation.Invitation, error) {
 	// derive shared secret using the user's private key and the invitee's public key
 	sharedSecret, err := curve25519.X25519(privateKey, inviteePublicKey)
 	if err != nil {
@@ -154,9 +156,11 @@ func (r *Remote) FinalizeInvitation(invitationId string, privateKey []byte, invi
 		return invitation.Invitation{}, errors.WithMessage(err, "failed to encrypt keystore key")
 	}
 
-	res, err := r.client.FinalizeInvitationWithResponse(context.Background(), invitationId, generated.FinalizeInvitationJSONRequestBody{
-		KeystoreKey: encryptedKeystoreKey,
-	})
+	res, err := r.client.FinalizeInvitationWithResponse(context.Background(),
+		invitationId, generated.FinalizeInvitationJSONRequestBody{
+			KeystoreKey: encryptedKeystoreKey,
+		},
+	)
 	if err != nil {
 		return invitation.Invitation{}, errors.Wrap(err, "failed to finalize invitation")
 	}

diff --git a/src/client/remote/keystores.go b/src/client/remote/keystores.go
@@ -69,10 +69,11 @@ func (r *Remote) UpdateKeystore(k keystore.Keystore) (keystore.Keystore, error)
 		return keystore.Keystore{}, errors.WithMessage(err, "aes256cbc encrypt failed")
 	}
 
-	res, err := r.client.UpdateKeystoreWithResponse(context.Background(), k.RemoteId, generated.UpdateKeystoreRequest{
-		Name:    &k.Name,
-		Payload: &b,
-	})
+	res, err := r.client.UpdateKeystoreWithResponse(context.Background(),
+		k.RemoteId, generated.UpdateKeystoreRequest{
+			Name:    &k.Name,
+			Payload: &b,
+		})
 	if err != nil {
 		return keystore.Keystore{}, errors.Wrap(err, "failed to update keystore")
 	}
@@ -81,14 +82,12 @@ func (r *Remote) UpdateKeystore(k keystore.Keystore) (keystore.Keystore, error)
 		return keystore.Keystore{}, errors.New("invalid response")
 	}
 
-	k2, err := KeystoreFromJSON(*res.JSON200, k.Key)
+	_, err = KeystoreFromJSON(*res.JSON200, k.Key)
 	if err != nil {
 		return keystore.Keystore{}, errors.WithMessage(err, "failed to parse keystore")
 	}
 
-	k2.Key = k.Key
-
-	return k2, nil
+	return k, nil
 }
 
 func (r *Remote) DeleteKeystore(id string) error {