Merge branch 'master' of github.com:awa/go-iap

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-- 1.10.2
+- 1.11.2
 before_install:
 - sudo pip install codecov
 install:

README.md

@@ -1,7 +1,7 @@
 go-iap
 ======
 
-![](https://img.shields.io/badge/golang-1.10-blue.svg?style=flat)
+![](https://img.shields.io/badge/golang-1.11-blue.svg?style=flat)
 [![Build Status](https://travis-ci.org/awa/go-iap.svg?branch=master)](https://travis-ci.org/awa/go-iap)
 [![codecov.io](https://codecov.io/github/awa/go-iap/coverage.svg?branch=master)](https://codecov.io/github/awa/go-iap?branch=master)
 

appstore/model.go

@@ -119,6 +119,7 @@ type (
 		SubscriptionAutoRenewStatus    string `json:"auto_renew_status"`
 		SubscriptionPriceConsentStatus string `json:"price_consent_status"`
 		ProductID                      string `json:"product_id"`
+		OriginalTransactionID          string `json:"original_transaction_id"`
 	}
 
 	// The IAPResponse type has the response properties

appstore/model_test.go

@@ -33,7 +33,7 @@ func TestNumericString_UnmarshalJSON(t *testing.T) {
 		{
 			name: "object case",
 			in:   []byte("{\"ID\":{\"Num\": 8080}}"),
-			err:  errors.New("json: cannot unmarshal object into Go struct field foo.ID of type json.Number"),
+			err:  errors.New("json: cannot unmarshal object into Go value of type json.Number"),
 			out:  foo{},
 		},
 	}

playstore/validator_test.go

@@ -33,8 +33,9 @@ func init() {
 
 func TestNew(t *testing.T) {
 	t.Parallel()
+
 	// Exception scenario
-	expected := "oauth2: cannot fetch token: 401 Unauthorized\nResponse: {\n  \"error\" : \"invalid_client\",\n  \"error_description\" : \"The OAuth client was invalid.\"\n}"
+	expected := "oauth2: cannot fetch token: 400 Bad Request\nResponse: {\n  \"error\": \"invalid_grant\",\n  \"error_description\": \"Invalid issuer: Not a service account.\"\n}"
 
 	actual, _ := New(dummyKey)
 	val := actual.httpCli.Transport.(*oauth2.Transport)
@@ -196,54 +197,83 @@ func TestRevokeSubscription(t *testing.T) {
 
 func TestVerifySignature(t *testing.T) {
 	t.Parallel()
-	receipt := `{"orderId":"GPA.xxxx-xxxx-xxxx-xxxxx","packageName":"my.package","productId":"myproduct","purchaseTime":1437564796303,"purchaseState":0,"developerPayload":"user001","purchaseToken":"some-token"}`
+	receipt := []byte(`{"orderId":"GPA.xxxx-xxxx-xxxx-xxxxx","packageName":"my.package","productId":"myproduct","purchaseTime":1437564796303,"purchaseState":0,"developerPayload":"user001","purchaseToken":"some-token"}`)
 
-	// when public key format is invalid base64
+	type in struct {
-	pubkey := "dummy_public_key"
+		pubkey  string
-	sig := "gj0N8LANKXOw4OhWkS1UZmDVUxM1UIP28F6bDzEp7BCqcVAe0DuDxmAY5wXdEgMRx/VM1Nl2crjogeV60OqCsbIaWqS/ZJwdP127aKR0jk8sbX36ssyYZ0DdZdBdCr1tBZ/eSW1GlGuD/CgVaxns0JaWecXakgoV7j+RF2AFbS4="
+		receipt []byte
-	expectedStr := "failed to decode public key"
+		sig     string
-	_, err := VerifySignature(pubkey, []byte(receipt), sig)
-	if err.Error() != expectedStr {
-		t.Errorf("got %v\nwant %v", err, expectedStr)
 	}
 
-	// when pub key is not rsa public key
+	tests := []struct {
-	pubkey = "JTbngOdvBE0rfdOs3GeuBnPB+YEP1w/peM4VJbnVz+hN9Td25vPjAznX9YKTGQN4iDohZ07wtl+zYygIcpSCc2ozNZUs9pV0s5itayQo22aT5myJrQmkp94ZSGI2npDP4+FE6ZiF+7khl3qoE0rVZq4G2mfk5LIIyTPTSA4UvyQ="
+		name  string
-	sig = "gj0N8LANKXOw4OhWkS1UZmDVUxM1UIP28F6bDzEp7BCqcVAe0DuDxmAY5wXdEgMRx/VM1Nl2crjogeV60OqCsbIaWqS/ZJwdP127aKR0jk8sbX36ssyYZ0DdZdBdCr1tBZ/eSW1GlGuD/CgVaxns0JaWecXakgoV7j+RF2AFbS4="
+		in    in
-	expectedStr = "failed to parse public key"
+		err   error
-	_, err = VerifySignature(pubkey, []byte(receipt), sig)
+		valid bool
-	if err.Error() != expectedStr {
+	}{
-		t.Errorf("got %v\nwant %v", err, expectedStr)
+		{
+			name: "public key is invalid base64 format",
+			in: in{
+				pubkey:  "dummy_public_key",
+				receipt: receipt,
+				sig:     "gj0N8LANKXOw4OhWkS1UZmDVUxM1UIP28F6bDzEp7BCqcVAe0DuDxmAY5wXdEgMRx/VM1Nl2crjogeV60OqCsbIaWqS/ZJwdP127aKR0jk8sbX36ssyYZ0DdZdBdCr1tBZ/eSW1GlGuD/CgVaxns0JaWecXakgoV7j+RF2AFbS4=",
+			},
+			err:   errors.New("failed to decode public key"),
+			valid: false,
+		},
+		{
+			name: "public key is not rsa public key",
+			in: in{
+				pubkey:  "JTbngOdvBE0rfdOs3GeuBnPB+YEP1w/peM4VJbnVz+hN9Td25vPjAznX9YKTGQN4iDohZ07wtl+zYygIcpSCc2ozNZUs9pV0s5itayQo22aT5myJrQmkp94ZSGI2npDP4+FE6ZiF+7khl3qoE0rVZq4G2mfk5LIIyTPTSA4UvyQ=",
+				receipt: receipt,
+				sig:     "gj0N8LANKXOw4OhWkS1UZmDVUxM1UIP28F6bDzEp7BCqcVAe0DuDxmAY5wXdEgMRx/VM1Nl2crjogeV60OqCsbIaWqS/ZJwdP127aKR0jk8sbX36ssyYZ0DdZdBdCr1tBZ/eSW1GlGuD/CgVaxns0JaWecXakgoV7j+RF2AFbS4=",
+			},
+			err:   errors.New("failed to parse public key"),
+			valid: false,
+		},
+		{
+			name: "signature is invalid base64 format",
+			in: in{
+				pubkey:  "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGvModvVUrqJ9C5fy8J77ZQ7JDC6+tf5iK8C74/3mjmcvwo4nmprCgzR/BQIEuZWJi8KX+jiJUXKXF90JPsXHkKAPq6A1SCga7kWvs/M8srMpjNS9zJdwZF+eDOR0+lJEihO04zlpAV9ybPJ3Q621y1HUeVpwdxDNLQpJTuIflnwIDAQAB",
+				receipt: receipt,
+				sig:     "invalid_signature",
+			},
+			err:   errors.New("failed to decode signature"),
+			valid: false,
+		},
+		{
+			name: "signature is invalid",
+			in: in{
+				pubkey:  "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGvModvVUrqJ9C5fy8J77ZQ7JDC6+tf5iK8C74/3mjmcvwo4nmprCgzR/BQIEuZWJi8KX+jiJUXKXF90JPsXHkKAPq6A1SCga7kWvs/M8srMpjNS9zJdwZF+eDOR0+lJEihO04zlpAV9ybPJ3Q621y1HUeVpwdxDNLQpJTuIflnwIDAQAB",
+				receipt: receipt,
+				sig:     "JTbngOdvBE0rfdOs3GeuBnPB+YEP1w/peM4VJbnVz+hN9Td25vPjAznX9YKTGQN4iDohZ07wtl+zYygIcpSCc2ozNZUs9pV0s5itayQo22aT5myJrQmkp94ZSGI2npDP4+FE6ZiF+7khl3qoE0rVZq4G2mfk5LIIyTPTSA4UvyQ=",
+			},
+			err:   nil,
+			valid: false,
+		},
+		{
+			name: "normal",
+			in: in{
+				pubkey:  "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGvModvVUrqJ9C5fy8J77ZQ7JDC6+tf5iK8C74/3mjmcvwo4nmprCgzR/BQIEuZWJi8KX+jiJUXKXF90JPsXHkKAPq6A1SCga7kWvs/M8srMpjNS9zJdwZF+eDOR0+lJEihO04zlpAV9ybPJ3Q621y1HUeVpwdxDNLQpJTuIflnwIDAQAB",
+				receipt: receipt,
+				sig:     "gj0N8LANKXOw4OhWkS1UZmDVUxM1UIP28F6bDzEp7BCqcVAe0DuDxmAY5wXdEgMRx/VM1Nl2crjogeV60OqCsbIaWqS/ZJwdP127aKR0jk8sbX36ssyYZ0DdZdBdCr1tBZ/eSW1GlGuD/CgVaxns0JaWecXakgoV7j+RF2AFbS4=",
+			},
+			err:   nil,
+			valid: true,
+		},
 	}
 
-	// when signature is invalid base64 format
+	for _, tt := range tests {
-	pubkey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGvModvVUrqJ9C5fy8J77ZQ7JDC6+tf5iK8C74/3mjmcvwo4nmprCgzR/BQIEuZWJi8KX+jiJUXKXF90JPsXHkKAPq6A1SCga7kWvs/M8srMpjNS9zJdwZF+eDOR0+lJEihO04zlpAV9ybPJ3Q621y1HUeVpwdxDNLQpJTuIflnwIDAQAB"
+		t.Run(tt.name, func(t *testing.T) {
-	sig = "invalid_signature"
+			valid, err := VerifySignature(tt.in.pubkey, tt.in.receipt, tt.in.sig)
-	expectedStr = "failed to decode signature"
+
-	_, err = VerifySignature(pubkey, []byte(receipt), sig)
+			if valid != tt.valid {
-	if err.Error() != expectedStr {
+				t.Errorf("input: %v\nget: %t\nwant: %t\n", tt.in, valid, tt.valid)
-		t.Errorf("got %v\nwant %v", err, expectedStr)
 			}
 
-	// when signature is invalid
+			if !reflect.DeepEqual(err, tt.err) {
-	pubkey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGvModvVUrqJ9C5fy8J77ZQ7JDC6+tf5iK8C74/3mjmcvwo4nmprCgzR/BQIEuZWJi8KX+jiJUXKXF90JPsXHkKAPq6A1SCga7kWvs/M8srMpjNS9zJdwZF+eDOR0+lJEihO04zlpAV9ybPJ3Q621y1HUeVpwdxDNLQpJTuIflnwIDAQAB"
+				t.Errorf("input: %v\nget: %s\nwant: %s\n", tt.in, err, tt.err)
-	sig = "JTbngOdvBE0rfdOs3GeuBnPB+YEP1w/peM4VJbnVz+hN9Td25vPjAznX9YKTGQN4iDohZ07wtl+zYygIcpSCc2ozNZUs9pV0s5itayQo22aT5myJrQmkp94ZSGI2npDP4+FE6ZiF+7khl3qoE0rVZq4G2mfk5LIIyTPTSA4UvyQ="
-	isValid, err := VerifySignature(pubkey, []byte(receipt), sig)
-	if err != nil {
-		t.Errorf("got %v\n", err)
 			}
-	if isValid {
+		})
-		t.Errorf("got %v\nwant %v", isValid, false)
-	}
-
-	// when all arguments are valid
-	pubkey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGvModvVUrqJ9C5fy8J77ZQ7JDC6+tf5iK8C74/3mjmcvwo4nmprCgzR/BQIEuZWJi8KX+jiJUXKXF90JPsXHkKAPq6A1SCga7kWvs/M8srMpjNS9zJdwZF+eDOR0+lJEihO04zlpAV9ybPJ3Q621y1HUeVpwdxDNLQpJTuIflnwIDAQAB"
-	sig = "gj0N8LANKXOw4OhWkS1UZmDVUxM1UIP28F6bDzEp7BCqcVAe0DuDxmAY5wXdEgMRx/VM1Nl2crjogeV60OqCsbIaWqS/ZJwdP127aKR0jk8sbX36ssyYZ0DdZdBdCr1tBZ/eSW1GlGuD/CgVaxns0JaWecXakgoV7j+RF2AFbS4="
-	isValid, err = VerifySignature(pubkey, []byte(receipt), sig)
-	if err != nil {
-		t.Errorf("got %v\n", err)
-	}
-	if !isValid {
-		t.Errorf("got %v\nwant %v", isValid, true)
 	}
 }