fixes step 2

client/invitation/files/step2.go

@@ -8,10 +8,12 @@ import (
 	"forge.redroom.link/yves/meowlib"
 	"forge.redroom.link/yves/meowlib/client"
 	"forge.redroom.link/yves/meowlib/client/invitation/messages"
+	"google.golang.org/protobuf/proto"
 )
 
 // Step2ReadAndAnswer reads an InvitationInitPayload from a .mwiv file, creates the
-// invitee's peer entry, and writes the invitee's ContactCard response to a .mwiv file.
+// invitee's peer entry, and writes the encrypted ContactCard (PackedUserMessage) to a
+// .mwiv file for the initiator to pick up and process in step 3.
 func Step2ReadAndAnswer(invitationFile string, nickname string, myNickname string, serverUids []string) error {
 	if _, err := os.Stat(invitationFile); os.IsNotExist(err) {
 		return err
@@ -33,12 +35,29 @@ func Step2ReadAndAnswer(invitationFile string, nickname string, myNickname strin
 		mynick = client.GetConfig().GetIdentity().Nickname
 	}
 
-	response, err := messages.Step2InviteeCreatesInitiatorAndEncryptedContactCard(payload, nickname, mynick, serverUids)
+	packed, peer, err := messages.Step2InviteeCreatesInitiatorAndEncryptedContactCard(payload, nickname, mynick, serverUids)
+	if err != nil {
+		return err
+	}
+
+	// Wrap the PackedUserMessage in an Invitation so the initiator (step3) has the
+	// invitee's public key available for signature verification without an extra file.
+	packedBytes, err := proto.Marshal(packed)
+	if err != nil {
+		return err
+	}
+	invitation := &meowlib.Invitation{
+		Uuid:    peer.InvitationId,
+		Step:    2,
+		From:    peer.MyIdentity.Public,
+		Payload: packedBytes,
+	}
+	out, err := proto.Marshal(invitation)
 	if err != nil {
 		return err
 	}
 
 	c := client.GetConfig()
 	filename := c.StoragePath + string(os.PathSeparator) + mynick + "-" + nickname + ".mwiv"
-	return response.GetMyContact().WriteCompressed(filename)
+	return os.WriteFile(filename, out, 0600)
 }