Ensure user exists before creating consent

Author: toddkazakov

auth/service/service/service.go

@@ -290,12 +290,22 @@ func (s *Service) initializeRouter() error {
 	if err := envconfig.Process("", &customerIOConfig); err != nil {
 		return errors.Wrap(err, "unable to load customerio config")
 	}
-	customerIOClient, err := customerio.NewClient(customerIOConfig)
+	customerIOClient, err := customerio.NewClient(customerIOConfig, s.Logger())
 	if err != nil {
 		return errors.Wrap(err, "unable to create customerio client")
 	}
 
-	webhookProcessor, err := jotform.NewWebhookProcessor(jotformConfig, s.Logger(), s.consentService, customerIOClient)
+	s.Logger().Debug("Initializing user client")
+	usrClient, err := userClient.NewDefaultClient(userClient.Params{
+		ConfigReporter: s.ConfigReporter(),
+		Logger:         s.Logger(),
+		UserAgent:      s.UserAgent(),
+	})
+	if err != nil {
+		return errors.Wrap(err, "unable to create user client")
+	}
+
+	webhookProcessor, err := jotform.NewWebhookProcessor(jotformConfig, s.Logger(), s.consentService, customerIOClient, usrClient)
 	if err != nil {
 		return errors.Wrap(err, "unable to create jotform webhook processor")
 	}

oura/customerio/client.go

@@ -1,5 +1,7 @@
 package customerio
 
+import "github.com/tidepool-org/platform/log"
+
 const appAPIBaseURL = "https://api.customer.io"
 const trackAPIBaseURL = "https://track.customer.io/api/"
 
@@ -9,6 +11,7 @@ type Client struct {
 	siteID          string
 	appAPIBaseURL   string
 	trackAPIBaseURL string
+	logger          log.Logger
 }
 
 type Config struct {
@@ -18,12 +21,13 @@ type Config struct {
 	SegmentID   string `envconfig:"TIDEPOOL_CUSTOMERIO_SEGMENT_ID"`
 }
 
-func NewClient(config Config) (*Client, error) {
+func NewClient(config Config, logger log.Logger) (*Client, error) {
 	return &Client{
 		appAPIKey:       config.AppAPIKey,
 		trackAPIKey:     config.TrackAPIKey,
 		siteID:          config.SiteID,
 		appAPIBaseURL:   appAPIBaseURL,
 		trackAPIBaseURL: trackAPIBaseURL,
+		logger:          logger,
 	}, nil
 }

oura/customerio/customer.go

@@ -71,6 +71,8 @@ func (c *Client) GetCustomer(ctx context.Context, cid string, typ IDType) (*Cust
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.appAPIKey))
 	req.Header.Set("Content-Type", "application/json")
 
+	c.logger.WithField("cid", cid).WithField("url", req.URL.String()).Debug("fetching customer")
+
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("failed to execute request: %w", err)

oura/jotform/webhook.go

@@ -13,15 +13,16 @@ import (
 	"github.com/tidepool-org/platform/page"
 	"github.com/tidepool-org/platform/pointer"
 	"github.com/tidepool-org/platform/structure/validator"
+	"github.com/tidepool-org/platform/user"
 )
 
 const (
 	EligibleField    = "eligible"
 	NameField        = "name"
 	DateOfBirthField = "dateOfBirth"
 
-	UserIDField        = "participantId"
-	ParticipantIDField = "userId"
+	UserIDField        = "userId"
+	ParticipantIDField = "participantId"
 )
 
 type WebhookProcessor struct {
@@ -32,14 +33,15 @@ type WebhookProcessor struct {
 
 	consentService   consent.Service
 	customerIOClient *customerio.Client
+	userClient       user.Client
 }
 
 type Config struct {
 	BaseURL string `envconfig:"TIDEPOOL_JOTFORM_BASE_URL"`
 	APIKey  string `envconfig:"TIDEPOOL_JOTFORM_API_KEY"`
 }
 
-func NewWebhookProcessor(config Config, logger log.Logger, consentService consent.Service, customerIOClient *customerio.Client) (*WebhookProcessor, error) {
+func NewWebhookProcessor(config Config, logger log.Logger, consentService consent.Service, customerIOClient *customerio.Client, userClient user.Client) (*WebhookProcessor, error) {
 	return &WebhookProcessor{
 		apiKey:  config.APIKey,
 		baseURL: config.BaseURL,
@@ -48,6 +50,7 @@ func NewWebhookProcessor(config Config, logger log.Logger, consentService consen
 
 		consentService:   consentService,
 		customerIOClient: customerIOClient,
+		userClient:       userClient,
 	}, nil
 }
 
@@ -98,27 +101,33 @@ func (w *WebhookProcessor) validateUser(ctx context.Context, submissionID string
 
 	customer, err := w.customerIOClient.GetCustomer(ctx, userID, customerio.IDTypeUserID)
 	if err != nil {
-		return "", errors.Wrap(err, "unable to get customer")
+		return "", errors.Wrapf(err, "unable to get customer with id %s", userID)
 	}
 
 	if customer == nil {
-		return "", errors.New("customer not found")
+		return "", errors.Newf("customer with id %s not found", userID)
 	}
 	if customer.OuraParticipantID != participantID {
-		return "", errors.New("participant id mismatch")
+		return "", errors.Newf("participant id mismatch for user with id %s", userID)
 	}
+
+	usr, err := w.userClient.Get(ctx, userID)
+	if err != nil {
+		return "", errors.Wrap(err, "unable to get user")
+	}
+	if usr == nil {
+		return "", errors.New("user not found")
+	}
+
 	return userID, nil
 }
 
 func (w *WebhookProcessor) ensureConsentRecordExists(ctx context.Context, userID string, submission *SubmissionResponse) error {
 	logger := w.logger.WithField("submission", submission.Content.ID)
 
-	survey := OuraEligibilitySurvey{}
-	if dob, ok := submission.Content.Answers[DateOfBirthField]; ok && dob.Answer() != "" {
-		survey.DateOfBirth = dob.Answer()
-	}
-	if name, ok := submission.Content.Answers[NameField]; ok && name.Answer() != "" {
-		survey.Name = name.Answer()
+	survey := OuraEligibilitySurvey{
+		DateOfBirth: submission.Content.Answers.GetAnswerTextByName(DateOfBirthField),
+		Name:        submission.Content.Answers.GetAnswerTextByName(NameField),
 	}
 
 	v := validator.New(w.logger)