Merge pull request #195 from richzw/master

feat(ios): mark ios test receipt through ErrReceiptIsForTest

Author: takecy

appstore/validator.go

@@ -25,6 +25,7 @@ const (
 // IAPClient is an interface to call validation API in App Store
 type IAPClient interface {
 	Verify(ctx context.Context, reqBody IAPRequest, resp interface{}) error
+	VerifyWithStatus(ctx context.Context, reqBody IAPRequest, resp interface{}) (int, error)
 }
 
 // Client implements IAPClient
@@ -109,69 +110,79 @@ func NewWithClient(client *http.Client) *Client {
 
 // Verify sends receipts and gets validation result
 func (c *Client) Verify(ctx context.Context, reqBody IAPRequest, result interface{}) error {
+	_, err := c.verify(ctx, reqBody, result)
+	return err
+}
+
+// VerifyWithStatus sends receipts and gets validation result with status code
+func (c *Client) VerifyWithStatus(ctx context.Context, reqBody IAPRequest, result interface{}) (int, error) {
+	return c.verify(ctx, reqBody, result)
+}
+
+func (c *Client) verify(ctx context.Context, reqBody IAPRequest, result interface{}) (int, error) {
 	b := new(bytes.Buffer)
 	if err := json.NewEncoder(b).Encode(reqBody); err != nil {
-		return err
+		return 0, err
 	}
 
 	req, err := http.NewRequest("POST", c.ProductionURL, b)
 	if err != nil {
-		return err
+		return 0, err
 	}
 	req.Header.Set("Content-Type", ContentType)
 	req = req.WithContext(ctx)
 	resp, err := c.httpCli.Do(req)
 	if err != nil {
-		return err
+		return 0, err
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode >= 500 {
-		return fmt.Errorf("Received http status code %d from the App Store: %w", resp.StatusCode, ErrAppStoreServer)
+		return 0, fmt.Errorf("Received http status code %d from the App Store: %w", resp.StatusCode, ErrAppStoreServer)
 	}
 	return c.parseResponse(resp, result, ctx, reqBody)
 }
 
-func (c *Client) parseResponse(resp *http.Response, result interface{}, ctx context.Context, reqBody IAPRequest) error {
+func (c *Client) parseResponse(resp *http.Response, result interface{}, ctx context.Context, reqBody IAPRequest) (int, error) {
 	// Read the body now so that we can unmarshal it twice
 	buf, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return err
+		return 0, err
 	}
 
 	err = json.Unmarshal(buf, &result)
 	if err != nil {
-		return err
+		return 0, err
 	}
 
 	// https://developer.apple.com/library/content/technotes/tn2413/_index.html#//apple_ref/doc/uid/DTS40016228-CH1-RECEIPTURL
 	var r StatusResponse
 	err = json.Unmarshal(buf, &r)
 	if err != nil {
-		return err
+		return 0, err
 	}
 	if r.Status == 21007 {
 		b := new(bytes.Buffer)
 		if err := json.NewEncoder(b).Encode(reqBody); err != nil {
-			return err
+			return 0, err
 		}
 
 		req, err := http.NewRequest("POST", c.SandboxURL, b)
 		if err != nil {
-			return err
+			return 0, err
 		}
 		req.Header.Set("Content-Type", ContentType)
 		req = req.WithContext(ctx)
 		resp, err := c.httpCli.Do(req)
 		if err != nil {
-			return err
+			return 0, err
 		}
 		defer resp.Body.Close()
 		if resp.StatusCode >= 500 {
-			return fmt.Errorf("Received http status code %d from the App Store Sandbox: %w", resp.StatusCode, ErrAppStoreServer)
+			return resp.StatusCode, fmt.Errorf("Received http status code %d from the App Store Sandbox: %w", resp.StatusCode, ErrAppStoreServer)
 		}
 
-		return json.NewDecoder(resp.Body).Decode(result)
+		return r.Status, json.NewDecoder(resp.Body).Decode(result)
 	}
 
-	return nil
+	return r.Status, nil
 }

appstore/validator_test.go

@@ -286,7 +286,7 @@ func TestCannotReadBody(t *testing.T) {
 	testResponse := http.Response{Body: ioutil.NopCloser(errReader(0))}
 
 	ctx := context.Background()
-	if client.parseResponse(&testResponse, IAPResponse{}, ctx, IAPRequest{}) == nil {
+	if _, err := client.parseResponse(&testResponse, IAPResponse{}, ctx, IAPRequest{}); err == nil {
 		t.Errorf("expected redirectToSandbox to fail to read the body")
 	}
 }
@@ -296,7 +296,7 @@ func TestCannotUnmarshalBody(t *testing.T) {
 	testResponse := http.Response{Body: ioutil.NopCloser(strings.NewReader(`{"status": true}`))}
 
 	ctx := context.Background()
-	if client.parseResponse(&testResponse, StatusResponse{}, ctx, IAPRequest{}) == nil {
+	if _, err := client.parseResponse(&testResponse, StatusResponse{}, ctx, IAPRequest{}); err == nil {
 		t.Errorf("expected redirectToSandbox to fail to unmarshal the data")
 	}
 }