From 7998e82017c9c9c2114eef82e804498725d8f4b8 Mon Sep 17 00:00:00 2001
From: Finn <finn@finn.io>
Date: Sat, 12 Dec 2020 02:55:38 -0800
Subject: [PATCH] Send ID with register and verify requests

---
 cmd/signald-cli/cmd/register.go | 1 +
 cmd/signald-cli/cmd/verify.go   | 1 +
 signald/signald.go              | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmd/signald-cli/cmd/register.go b/cmd/signald-cli/cmd/register.go
index eebf8a0..7868a8c 100644
--- a/cmd/signald-cli/cmd/register.go
+++ b/cmd/signald-cli/cmd/register.go
@@ -35,6 +35,7 @@ var registerCmd = &cobra.Command{
 		err := s.RawRequest(v0.LegacyRequest{
 			Type:     "register",
 			Username: username,
+			ID:       requestID,
 		})
 		if err != nil {
 			log.Fatal("error sending request: ", err)
diff --git a/cmd/signald-cli/cmd/verify.go b/cmd/signald-cli/cmd/verify.go
index baadb71..3dea1d3 100644
--- a/cmd/signald-cli/cmd/verify.go
+++ b/cmd/signald-cli/cmd/verify.go
@@ -40,6 +40,7 @@ var verify = &cobra.Command{
 			Type:     "verify",
 			Username: username,
 			Code:     code,
+			ID:       requestID,
 		})
 		if err != nil {
 			log.Fatal("error sending request: ", err)
diff --git a/signald/signald.go b/signald/signald.go
index 7df4561..f1200d8 100644
--- a/signald/signald.go
+++ b/signald/signald.go
@@ -59,7 +59,7 @@ func (s *Signald) Connect() error {
 		return err
 	}
 	s.socket = socket
-	log.Println("signald-go: Connected to signald socket ", socket.RemoteAddr().String())
+	log.Println("signald-go: Connected to signald socket", socket.RemoteAddr().String())
 	return nil
 }