Merge pull request #1 from Purchase-Fly/fix

remove duplicate

appstore/model.go

@@ -95,7 +95,7 @@ type (
 
 		IsTrialPeriod        string `json:"is_trial_period"`
 		IsInIntroOfferPeriod string `json:"is_in_intro_offer_period,omitempty"`
-		IsUpgraded           string `json:"is_upgraded"`
+		IsUpgraded           string `json:"is_upgraded,omitempty"`
 
 		ExpiresDate
 
@@ -149,6 +149,18 @@ type (
 		PendingRenewalInfo []PendingRenewalInfo `json:"pending_renewal_info,omitempty"`
 		IsRetryable        bool                 `json:"is-retryable,omitempty"`
 	}
+	// The IAPLatestResponse type has the response properties
+	// If you use latest_receipt as token to verify, response should be like following struct
+	IAPLatestResponse struct {
+		Status                         int    `json:"status,omitempty"`
+		Receipt                        InApp  `json:"receipt"`
+		LatestReceiptInfo              InApp  `json:"latest_receipt_info,omitempty"`
+		LatestExpiredReceiptInfo       InApp  `json:"latest_expired_receipt_info,omitempty"`
+		LatestReceipt                  string `json:"latest_receipt,omitempty"`
+		SubscriptionAutoRenewStatus    string `json:"auto_renew_status,omitempty"`
+		SubscriptionAutoRenewProductID string `json:"auto_renew_product_id,omitempty"`
+		SubscriptionRetryFlag          string `json:"is_in_billing_retry_period,omitempty"`
+	}
 
 	// The HttpStatusResponse struct contains the status code returned by the store
 	// Used as a workaround to detect when to hit the production appstore or sandbox appstore regardless of receipt type

appstore/notification.go

@@ -82,9 +82,14 @@ type SubscriptionNotification struct {
 	ExpirationIntent string `json:"expiration_intent"`
 
 	// Auto renew info
-	AutoRenewStatus    string `json:"auto_renew_status"` // false or true
+	AutoRenewStatus    string    `json:"auto_renew_status"` // false or true
 	AutoRenewProductID string `json:"auto_renew_product_id"`
 
+	// HACK (msyrus): Separate Subscriptiton Notification from Notification verification response
+	Status                int                 `json:"status,omitempty"`
+	Receipt               NotificationReceipt `json:"recipt"`
+	SubscriptionRetryFlag string              `json:"is_in_billing_retry_period"`
+
 	// Posted if the notification_type is RENEWAL or INTERACTIVE_RENEWAL, and only if the renewal is successful.
 	// Posted also if the notification_type is INITIAL_BUY.
 	// Not posted for notification_type CANCEL.

appstore/validator.go

@@ -96,64 +96,64 @@ 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 {
+func (c *Client) Verify(ctx context.Context, reqBody IAPRequest, result interface{}) (Environment, error) {
 	b := new(bytes.Buffer)
 	if err := json.NewEncoder(b).Encode(reqBody); err != nil {
-		return err
+		return "", err
 	}
 
 	req, err := http.NewRequest("POST", c.ProductionURL, b)
 	if err != nil {
-		return err
+		return "", err
 	}
 	req.Header.Set("Content-Type", ContentType)
 	req = req.WithContext(ctx)
 	resp, err := c.httpCli.Do(req)
 	if err != nil {
-		return err
+		return "", err
 	}
 	defer resp.Body.Close()
 	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) (Environment, error) {
 	// Read the body now so that we can unmarshal it twice
 	buf, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	err = json.Unmarshal(buf, &result)
 	if err != nil {
-		return err
+		return "", 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 "", err
 	}
 	if r.Status == 21007 {
 		b := new(bytes.Buffer)
 		if err := json.NewEncoder(b).Encode(reqBody); err != nil {
-			return err
+			return "", err
 		}
 
 		req, err := http.NewRequest("POST", c.SandboxURL, b)
 		if err != nil {
-			return err
+			return "", err
 		}
 		req.Header.Set("Content-Type", ContentType)
 		req = req.WithContext(ctx)
 		resp, err := c.httpCli.Do(req)
 		if err != nil {
-			return err
+			return "", err
 		}
 		defer resp.Body.Close()
-
-		return json.NewDecoder(resp.Body).Decode(result)
+		// 21007 is found when the receipt is from the test environment
+		return Sandbox, json.NewDecoder(resp.Body).Decode(result)
 	}
 
-	return nil
+	return Production, nil
 }