Use the configured jotform API base url

Author: toddkazakov

oura/jotform/submission.go

@@ -6,7 +6,8 @@ import (
 )
 
 type SubmissionResponse struct {
-	Content Content `json:"content"`
+	ResponseCode int     `json:"responseCode"`
+	Content      Content `json:"content"`
 }
 
 type Content struct {
@@ -96,7 +97,7 @@ func (a *Answers) UnmarshalJSON(data []byte) error {
 			}
 			answer = cf
 		default:
-			return fmt.Errorf("unknown answer type: %s for key %s", typeInfo.Type, key)
+			continue
 		}
 
 		(*a)[answer.Name()] = answer

oura/jotform/webhook.go

@@ -16,8 +16,6 @@ import (
 )
 
 const (
-	BaseURL = "https://api.jotform.com"
-
 	EligibleField    = "eligible"
 	NameField        = "name"
 	DateOfBirthField = "dateOfBirth"
@@ -164,7 +162,7 @@ func (w *WebhookProcessor) ensureConsentRecordExists(ctx context.Context, userID
 }
 
 func (w *WebhookProcessor) getSubmission(ctx context.Context, submissionID string) (*SubmissionResponse, error) {
-	url := fmt.Sprintf("%s/v1/submissions/%s", BaseURL, submissionID)
+	url := fmt.Sprintf("%s/v1/submissions/%s", w.baseURL, submissionID)
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
@@ -190,5 +188,10 @@ func (w *WebhookProcessor) getSubmission(ctx context.Context, submissionID strin
 		return nil, errors.Wrap(err, "failed to decode response")
 	}
 
+	// Sometimes the jotform webhook returns a 200 http response with a non-200 response code in the body
+	if response.ResponseCode != http.StatusOK {
+		return nil, errors.Newf("unexpected response code: %d", response.ResponseCode)
+	}
+
 	return &response, nil
 }