feat(SPV-1538): migrate contact endpoints to v2 API

actions/testabilities/assert_spvwallet_application.go

@@ -44,6 +44,7 @@ type JsonValueGetter interface {
 	GetString(xpath string) string
 	GetAsType(xpath string, target any)
 	GetField(xpath string) any
+	GetInt(xpath string) int
 }
 
 func Then(t testing.TB, app SPVWalletApplicationFixture) SPVWalletApplicationAssertions {

actions/testabilities/fixture_spvwallet_application.go

@@ -38,6 +38,8 @@ type SPVWalletApplicationFixture interface {
 
 	Faucet(user fixtures.User) testengine.FaucetFixture
 
+	User(user fixtures.User) testengine.UserFixture
+
 	EngineFixture() testengine.EngineFixture
 
 	// Tx creates a new mocked transaction builder
@@ -162,6 +164,10 @@ func (f *appFixture) Faucet(user fixtures.User) testengine.FaucetFixture {
 	return f.engineFixture.Faucet(user)
 }
 
+func (f *appFixture) User(user fixtures.User) testengine.UserFixture {
+	return f.engineFixture.User(user)
+}
+
 func (f *appFixture) Tx() txtestability.TransactionSpec {
 	return f.engineFixture.Tx()
 }

actions/v2/admin/contacts/accept.go

@@ -0,0 +1,22 @@
+package contacts
+
+import (
+	"net/http"
+
+	"github.com/bitcoin-sv/spv-wallet/actions/v2/internal/mapping"
+	"github.com/bitcoin-sv/spv-wallet/engine/spverrors"
+	"github.com/gin-gonic/gin"
+)
+
+// AdminAcceptInvitation accepts an invitation from a contact.
+func (s *APIAdminContacts) AdminAcceptInvitation(c *gin.Context, id uint) {
+	contact, err := s.contactsService.AcceptContactByID(c, id)
+	if err != nil {
+		spverrors.ErrorResponse(c, err, s.logger)
+		return
+	}
+
+	res := mapping.MapToContactContract(contact)
+
+	c.JSON(http.StatusOK, res)
+}

actions/v2/admin/contacts/accept_test.go

@@ -0,0 +1,131 @@
+package contacts_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/bitcoin-sv/spv-wallet/actions/testabilities"
+	"github.com/bitcoin-sv/spv-wallet/actions/testabilities/apierror"
+	testengine "github.com/bitcoin-sv/spv-wallet/engine/testabilities"
+	"github.com/bitcoin-sv/spv-wallet/engine/tester/fixtures"
+	"github.com/bitcoin-sv/spv-wallet/engine/v2/contacts/contactsmodels"
+)
+
+func TestAcceptContact(t *testing.T) {
+	// given:
+	givenForAllTests := testabilities.Given(t)
+	cleanup := givenForAllTests.StartedSPVWalletWithConfiguration(
+		testengine.WithV2(),
+	)
+	defer cleanup()
+
+	t.Run("Accept contact", func(t *testing.T) {
+		// given:
+		given, then := testabilities.NewOf(givenForAllTests, t)
+		contact := given.User(fixtures.Sender).HasContactTo(fixtures.RecipientInternal)
+		client := given.HttpClient().ForAdmin()
+
+		// when:
+		res, _ := client.R().
+			Post(fmt.Sprintf("/api/v2/admin/invitations/%d", contact.ID))
+
+		// then:
+		then.Response(res).
+			HasStatus(200).
+			WithJSONMatching(`{
+				"id": "{{ matchNumber }}",
+				"createdAt": "{{ matchTimestamp }}",
+				"updatedAt": "{{ matchTimestamp }}",
+				"fullName": "{{ .fullName }}",
+				"paymail": "{{ .paymail }}",
+				"pubKey": "{{ matchHexWithLength 66 }}",
+				"status": "{{ .status }}"
+			}`, map[string]any{
+				"fullName": fixtures.RecipientInternal.DefaultPaymail().PublicName(),
+				"paymail":  fixtures.RecipientInternal.DefaultPaymail().String(),
+				"status":   contactsmodels.ContactNotConfirmed,
+			})
+	})
+
+	t.Run("Accept already accepted contact", func(t *testing.T) {
+		// given:
+		given, then := testabilities.NewOf(givenForAllTests, t)
+		contact := given.User(fixtures.Sender).HasContactTo(fixtures.RecipientInternal)
+		client := given.HttpClient().ForAdmin()
+
+		// when:
+		res, _ := client.R().
+			Post(fmt.Sprintf("/api/v2/admin/invitations/%d", contact.ID))
+
+		// then:
+		then.Response(res).
+			HasStatus(200).
+			WithJSONMatching(`{
+				"id": "{{ matchNumber }}",
+				"createdAt": "{{ matchTimestamp }}",
+				"updatedAt": "{{ matchTimestamp }}",
+				"fullName": "{{ .fullName }}",
+				"paymail": "{{ .paymail }}",
+				"pubKey": "{{ matchHexWithLength 66 }}",
+				"status": "{{ .status }}"
+			}`, map[string]any{
+				"fullName": fixtures.RecipientInternal.DefaultPaymail().PublicName(),
+				"paymail":  fixtures.RecipientInternal.DefaultPaymail().String(),
+				"status":   contactsmodels.ContactNotConfirmed,
+			})
+
+		// when:
+		res, _ = client.R().
+			Post(fmt.Sprintf("/api/v2/admin/invitations/%d", contact.ID))
+
+		// then:
+		then.Response(res).
+			HasStatus(200).
+			WithJSONMatching(`{
+				"id": "{{ matchNumber }}",
+				"createdAt": "{{ matchTimestamp }}",
+				"updatedAt": "{{ matchTimestamp }}",
+				"fullName": "{{ .fullName }}",
+				"paymail": "{{ .paymail }}",
+				"pubKey": "{{ matchHexWithLength 66 }}",
+				"status": "{{ .status }}"
+			}`, map[string]any{
+				"fullName": fixtures.RecipientInternal.DefaultPaymail().PublicName(),
+				"paymail":  fixtures.RecipientInternal.DefaultPaymail().String(),
+				"status":   contactsmodels.ContactNotConfirmed,
+			})
+	})
+
+	t.Run("Accept contact with user xpub", func(t *testing.T) {
+		// given:
+		given, then := testabilities.NewOf(givenForAllTests, t)
+		contact := given.User(fixtures.Sender).HasContactTo(fixtures.RecipientInternal)
+
+		client := given.HttpClient().ForUser()
+
+		// when:
+		res, _ := client.R().
+			Post(fmt.Sprintf("/api/v2/admin/invitations/%d", contact.ID))
+
+		// then:
+		then.Response(res).
+			HasStatus(401).
+			WithJSONf(apierror.ExpectedJSON("error-unauthorized-xpub-not-an-admin-key", "xpub provided is not an admin key"))
+	})
+
+	t.Run("No contact to accept", func(t *testing.T) {
+		// given:
+		given, then := testabilities.NewOf(givenForAllTests, t)
+		client := given.HttpClient().ForAdmin()
+
+		// when:
+		res, _ := client.R().
+			Post("/api/v2/admin/invitations/99999")
+
+		// then:
+		then.Response(res).
+			HasStatus(500).
+			WithJSONf(apierror.ExpectedJSON("error-contact-updating-status-failed", "updating contact status failed"))
+
+	})
+}

actions/v2/admin/contacts/confirm.go

@@ -0,0 +1,26 @@
+package contacts
+
+import (
+	"net/http"
+
+	"github.com/bitcoin-sv/spv-wallet/api"
+	"github.com/bitcoin-sv/spv-wallet/engine/spverrors"
+	"github.com/gin-gonic/gin"
+)
+
+// AdminConfirmContact confirms a contact between two users.
+func (s *APIAdminContacts) AdminConfirmContact(c *gin.Context) {
+	var reqParams *api.RequestsAdminConfirmContact
+	if err := c.Bind(&reqParams); err != nil {
+		spverrors.ErrorResponse(c, spverrors.ErrCannotBindRequest.WithTrace(err), s.logger)
+		return
+	}
+
+	if err := s.contactsService.AdminConfirmContacts(c, reqParams.PaymailA, reqParams.PaymailB); err != nil {
+		spverrors.ErrorResponse(c, err, s.logger)
+		return
+	}
+
+	c.Status(http.StatusOK)
+
+}

actions/v2/admin/contacts/confirm_test.go

@@ -0,0 +1,130 @@
+package contacts_test
+
+import (
+	"testing"
+
+	"github.com/bitcoin-sv/spv-wallet/actions/testabilities"
+	"github.com/bitcoin-sv/spv-wallet/actions/testabilities/apierror"
+	testengine "github.com/bitcoin-sv/spv-wallet/engine/testabilities"
+	"github.com/bitcoin-sv/spv-wallet/engine/tester/fixtures"
+)
+
+func TestConfirmContact(t *testing.T) {
+	// given:
+	givenForAllTests := testabilities.Given(t)
+	cleanup := givenForAllTests.StartedSPVWalletWithConfiguration(
+		testengine.WithV2(),
+	)
+	defer cleanup()
+
+	t.Run("No side has contact", func(t *testing.T) {
+		// given:
+		given, then := testabilities.NewOf(givenForAllTests, t)
+
+		client := given.HttpClient().ForAdmin()
+
+		// when:
+		res, _ := client.R().
+			SetBody(map[string]any{
+				"paymailA": fixtures.Sender.DefaultPaymail().String(),
+				"paymailB": fixtures.RecipientInternal.DefaultPaymail().String(),
+			}).
+			Post("/api/v2/admin/contacts/confirmations")
+
+		// then:
+		then.Response(res).HasStatus(500).
+			WithJSONf(apierror.ExpectedJSON("error-contact-getting-contact-failed", "getting contact failed"))
+	})
+
+	t.Run("Only one side has contact", func(t *testing.T) {
+		// given:
+		given, then := testabilities.NewOf(givenForAllTests, t)
+		given.User(fixtures.Sender).HasContactTo(fixtures.RecipientInternal)
+
+		client := given.HttpClient().ForAdmin()
+
+		// when:
+		res, _ := client.R().
+			SetBody(map[string]any{
+				"paymailA": fixtures.Sender.DefaultPaymail().String(),
+				"paymailB": fixtures.RecipientInternal.DefaultPaymail().String(),
+			}).
+			Post("/api/v2/admin/contacts/confirmations")
+
+		// then:
+		then.Response(res).HasStatus(500).
+			WithJSONf(apierror.ExpectedJSON("error-contact-getting-contact-failed", "getting contact failed"))
+	})
+
+	t.Run("Confirm contact", func(t *testing.T) {
+		// given:
+		given, then := testabilities.NewOf(givenForAllTests, t)
+		given.User(fixtures.Sender).HasContactTo(fixtures.RecipientInternal)
+		given.User(fixtures.RecipientInternal).HasContactTo(fixtures.Sender)
+
+		client := given.HttpClient().ForAdmin()
+
+		// when:
+		res, _ := client.R().
+			SetBody(map[string]any{
+				"paymailA": fixtures.Sender.DefaultPaymail().String(),
+				"paymailB": fixtures.RecipientInternal.DefaultPaymail().String(),
+			}).
+			Post("/api/v2/admin/contacts/confirmations")
+
+		// then:
+		then.Response(res).IsOK()
+	})
+
+	t.Run("Confirm already confirmed contact", func(t *testing.T) {
+		// given:
+		given, then := testabilities.NewOf(givenForAllTests, t)
+		given.User(fixtures.Sender).HasContactTo(fixtures.RecipientInternal)
+		given.User(fixtures.RecipientInternal).HasContactTo(fixtures.Sender)
+
+		client := given.HttpClient().ForAdmin()
+
+		// when:
+		res, _ := client.R().
+			SetBody(map[string]any{
+				"paymailA": fixtures.Sender.DefaultPaymail().String(),
+				"paymailB": fixtures.RecipientInternal.DefaultPaymail().String(),
+			}).
+			Post("/api/v2/admin/contacts/confirmations")
+
+		// then:
+		then.Response(res).IsOK()
+
+		// when:
+		res, _ = client.R().
+			SetBody(map[string]any{
+				"paymailA": fixtures.Sender.DefaultPaymail().String(),
+				"paymailB": fixtures.RecipientInternal.DefaultPaymail().String(),
+			}).
+			Post("/api/v2/admin/contacts/confirmations")
+
+		// then:
+		then.Response(res).IsOK()
+	})
+
+	t.Run("Confirm contact with user xpub", func(t *testing.T) {
+		// given:
+		given, then := testabilities.NewOf(givenForAllTests, t)
+
+		client := given.HttpClient().ForUser()
+
+		// when:
+		res, _ := client.R().
+			SetBody(map[string]any{
+				"paymailA": fixtures.RecipientExternal.DefaultPaymail().String(),
+				"paymailB": fixtures.Sender.DefaultPaymail().String(),
+			}).
+			Post("/api/v2/admin/contacts/confirmations")
+
+		// then:
+		then.Response(res).
+			HasStatus(401).
+			WithJSONf(apierror.ExpectedJSON("error-unauthorized-xpub-not-an-admin-key", "xpub provided is not an admin key"))
+	})
+
+}

actions/v2/admin/contacts/create.go

@@ -0,0 +1,35 @@
+package contacts
+
+import (
+	"net/http"
+
+	"github.com/bitcoin-sv/spv-wallet/actions/v2/internal/mapping"
+	"github.com/bitcoin-sv/spv-wallet/api"
+	"github.com/bitcoin-sv/spv-wallet/engine/spverrors"
+	"github.com/bitcoin-sv/spv-wallet/engine/v2/contacts/contactsmodels"
+	"github.com/gin-gonic/gin"
+)
+
+// AdminCreateContact creates a new contact for a user.
+func (s *APIAdminContacts) AdminCreateContact(c *gin.Context, paymail string) {
+	var req api.RequestsAdminCreateContact
+	if err := c.Bind(&req); err != nil {
+		spverrors.ErrorResponse(c, spverrors.ErrCannotBindRequest.WithTrace(err), s.logger)
+		return
+	}
+
+	newContact := contactsmodels.NewContact{
+		FullName:          req.FullName,
+		NewContactPaymail: paymail,
+		RequesterPaymail:  req.CreatorPaymail,
+		Status:            contactsmodels.ContactNotConfirmed,
+	}
+
+	contact, err := s.contactsService.AdminCreateContact(c, newContact)
+	if err != nil {
+		spverrors.ErrorResponse(c, err, s.logger)
+		return
+	}
+
+	c.JSON(http.StatusOK, mapping.MapToContactContract(contact))
+}