Add a test endpoint that includes domain verification

Author: Jeff Yanta

pkg/code/server/web/paymentrequest/client.go

@@ -11,22 +11,22 @@ import (
 	messagingpb "github.com/code-payments/code-protobuf-api/generated/go/messaging/v1"
 	micropaymentpb "github.com/code-payments/code-protobuf-api/generated/go/micropayment/v1"
 
-	"github.com/code-payments/code-server/pkg/pointer"
 	"github.com/code-payments/code-server/pkg/code/common"
+	"github.com/code-payments/code-server/pkg/pointer"
 )
 
 const (
 	testWebhookEndpoint = "https://api.getcode.com/v1/testWebhook"
 )
 
-func (s *Server) createTrustedPaymentRequest(ctx context.Context, paymentRequest *trustedPaymentRequest) (err error) {
+func (s *Server) createTestGetcodeTrustedPaymentRequest(ctx context.Context, paymentRequest *trustedPaymentRequest) (err error) {
 	rendezvousKey := paymentRequest.GetPrivateRendezvousKey()
 
 	sendMessageReq := &messagingpb.SendMessageRequest{
 		RendezvousKey: &messagingpb.RendezvousKey{
 			Value: rendezvousKey.PublicKey().ToBytes(),
 		},
-		Message: paymentRequest.ToProtoMessage(),
+		Message: paymentRequest.ToProtoMessageWithVerifidDomain(pointer.String("app.getcode.com"), s.getcodeDomainVerifier),
 	}
 
 	// This is obviously the worst part about a trusted payment request. Server can

pkg/code/server/web/paymentrequest/model.go

@@ -12,6 +12,7 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/proto"
 
+	commonpb "github.com/code-payments/code-protobuf-api/generated/go/common/v1"
 	messagingpb "github.com/code-payments/code-protobuf-api/generated/go/messaging/v1"
 	transactionpb "github.com/code-payments/code-protobuf-api/generated/go/transaction/v2"
 
@@ -121,12 +122,56 @@ func (r *trustedPaymentRequest) ToKikCodePayload() *kikcode.Payload {
 	return r.kikCodePayload
 }
 
-func (r *trustedPaymentRequest) ToProtoMessage() *messagingpb.Message {
-	return getRequestToReceiveBillMessage(
-		r.currency,
-		r.nativeAmount,
-		r.destination,
-	)
+func (r *trustedPaymentRequest) ToProtoMessageWithVerifidDomain(domain *string, domainVerifier *common.Account) *messagingpb.Message {
+	var msg *messagingpb.RequestToReceiveBill
+	if r.currency == currency_lib.KIN {
+		quarks := kin.ToQuarks(uint64(r.nativeAmount))
+		if int(100.0*r.nativeAmount)%100.0 != 0 {
+			quarks += kin.ToQuarks(1)
+		}
+
+		msg = &messagingpb.RequestToReceiveBill{
+			ExchangeData: &messagingpb.RequestToReceiveBill_Exact{
+				Exact: &transactionpb.ExchangeData{
+					Currency:     string(r.currency),
+					ExchangeRate: 1.0,
+					NativeAmount: r.nativeAmount,
+					Quarks:       quarks,
+				},
+			},
+		}
+	} else {
+		msg = &messagingpb.RequestToReceiveBill{
+			ExchangeData: &messagingpb.RequestToReceiveBill_Partial{
+				Partial: &transactionpb.ExchangeDataWithoutRate{
+					Currency:     string(r.currency),
+					NativeAmount: r.nativeAmount,
+				},
+			},
+		}
+	}
+
+	msg.RequestorAccount = r.destination.ToProto()
+
+	if domain != nil {
+		msg.Domain = &commonpb.Domain{
+			Value: *domain,
+		}
+
+		if domainVerifier != nil {
+			msg.Verifier = domainVerifier.ToProto()
+			msg.RendezvousKey = &messagingpb.RendezvousKey{
+				Value: r.privateRendezvousKey.ToProto().Value,
+			}
+			msg.Signature, _ = signProtoMessage(msg, domainVerifier)
+		}
+	}
+
+	return &messagingpb.Message{
+		Kind: &messagingpb.Message_RequestToReceiveBill{
+			RequestToReceiveBill: msg,
+		},
+	}
 }
 
 func (r *trustedPaymentRequest) GetIdempotencyKey() kikcode.IdempotencyKey {
@@ -276,46 +321,3 @@ func (r *trustlessPaymentRequest) ToProtoMessage() *messagingpb.Message {
 		},
 	}
 }
-
-func getRequestToReceiveBillMessage(
-	currency currency_lib.Code,
-	nativeAmount float64,
-	destination *common.Account,
-) *messagingpb.Message {
-	if currency == currency_lib.KIN {
-		quarks := kin.ToQuarks(uint64(nativeAmount))
-		if int(100.0*nativeAmount)%100.0 != 0 {
-			quarks += kin.ToQuarks(1)
-		}
-
-		return &messagingpb.Message{
-			Kind: &messagingpb.Message_RequestToReceiveBill{
-				RequestToReceiveBill: &messagingpb.RequestToReceiveBill{
-					RequestorAccount: destination.ToProto(),
-					ExchangeData: &messagingpb.RequestToReceiveBill_Exact{
-						Exact: &transactionpb.ExchangeData{
-							Currency:     string(currency),
-							ExchangeRate: 1.0,
-							NativeAmount: nativeAmount,
-							Quarks:       quarks,
-						},
-					},
-				},
-			},
-		}
-	}
-
-	return &messagingpb.Message{
-		Kind: &messagingpb.Message_RequestToReceiveBill{
-			RequestToReceiveBill: &messagingpb.RequestToReceiveBill{
-				RequestorAccount: destination.ToProto(),
-				ExchangeData: &messagingpb.RequestToReceiveBill_Partial{
-					Partial: &transactionpb.ExchangeDataWithoutRate{
-						Currency:     string(currency),
-						NativeAmount: nativeAmount,
-					},
-				},
-			},
-		},
-	}
-}

pkg/code/server/web/paymentrequest/server.go

@@ -19,11 +19,11 @@ import (
 )
 
 const (
-	v1PathPrefix       = "/v1"
-	v1CreateIntentPath = v1PathPrefix + "/createIntent"
-	v1GetStatusPath    = v1PathPrefix + "/getStatus"
-	v1RequestPath      = v1PathPrefix + "/request"
-	v1TestWebhookpath  = v1PathPrefix + "/testWebhook"
+	v1PathPrefix                    = "/v1"
+	v1CreateIntentPath              = v1PathPrefix + "/createIntent"
+	v1GetStatusPath                 = v1PathPrefix + "/getStatus"
+	v1TestVerifiedDomainRequestPath = v1PathPrefix + "/testVerifiedDomainRequest"
+	v1TestWebhookpath               = v1PathPrefix + "/testWebhook"
 
 	intentHeaderName      = "x-code-intent"
 	idempotencyHeaderName = "x-code-idempotency"
@@ -49,16 +49,18 @@ type Assets struct {
 }
 
 type Server struct {
-	log    *logrus.Entry
-	cc     *grpc.ClientConn
-	assets *Assets
+	log                   *logrus.Entry
+	cc                    *grpc.ClientConn
+	assets                *Assets
+	getcodeDomainVerifier *common.Account
 }
 
-func NewPaymentRequestServer(cc *grpc.ClientConn, assets *Assets) *Server {
+func NewPaymentRequestServer(cc *grpc.ClientConn, assets *Assets, getcodeDomainVerifier *common.Account) *Server {
 	return &Server{
-		log:    logrus.StandardLogger().WithField("type", "paymentrequest/server"),
-		cc:     cc,
-		assets: assets,
+		log:                   logrus.StandardLogger().WithField("type", "paymentrequest/server"),
+		cc:                    cc,
+		assets:                assets,
+		getcodeDomainVerifier: getcodeDomainVerifier,
 	}
 }
 
@@ -134,7 +136,7 @@ func (s *Server) getStatusHandler(path string) func(w http.ResponseWriter, r *ht
 	}
 }
 
-func (s *Server) requestHandler(path string) func(w http.ResponseWriter, r *http.Request) {
+func (s *Server) testVerifiedDomainRequestHandler(path string) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		log := s.log.WithField("path", path)
 
@@ -163,7 +165,7 @@ func (s *Server) requestHandler(path string) func(w http.ResponseWriter, r *http
 
 		log = log.WithField("intent", intentId.PublicKey().ToBase58())
 
-		err = s.createTrustedPaymentRequest(ctx, model)
+		err = s.createTestGetcodeTrustedPaymentRequest(ctx, model)
 		if err != nil {
 			log.WithError(err).Warn("failure creating payment request")
 			HandleGrpcErrorInWebContext(w, err)
@@ -224,9 +226,9 @@ func (s *Server) testWebhookHandler(path string) func(w http.ResponseWriter, r *
 
 func (s *Server) GetHandlers() map[string]http.HandlerFunc {
 	return map[string]http.HandlerFunc{
-		v1CreateIntentPath: s.createIntentHandler(v1CreateIntentPath),
-		v1GetStatusPath:    s.getStatusHandler(v1GetStatusPath),
-		v1RequestPath:      s.requestHandler(v1RequestPath),
-		v1TestWebhookpath:  s.testWebhookHandler(v1TestWebhookpath),
+		v1CreateIntentPath:              s.createIntentHandler(v1CreateIntentPath),
+		v1GetStatusPath:                 s.getStatusHandler(v1GetStatusPath),
+		v1TestVerifiedDomainRequestPath: s.testVerifiedDomainRequestHandler(v1TestVerifiedDomainRequestPath),
+		v1TestWebhookpath:               s.testWebhookHandler(v1TestWebhookpath),
 	}
 }