Mirrors/go-iap
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #11 from jun06t/json-credential

Browse Source 
Use JSON credential of service account instead of oauth token
This commit is contained in:
Junpei Tsuji
2015-05-26 23:49:49 +09:00
parent 74d18f9aa3 7c39cf1775
commit 51163ff874
3 changed files with 56 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@@ -54,13 +54,14 @@ import(
) )
func main() { func main() {
// You need to prepare an authorization code or a refresh token. // You need to prepare a public key for your Android app's in app billing
// If you have a refresh token, you can generate an oauth token like this. // at https://console.developers.google.com.
token := &oauth2.Token{ jsonKey, err := ioutil.ReadFile("jsonKey.json")
RefreshToken: "your refresh token", if err != nil {
log.Fatal(err)
} }
client := playstore.New(token) client := playstore.New(jsonKey)
resp, err := client.VerifySubscription("package", "subscriptionID", "purchaseToken") resp, err := client.VerifySubscription("package", "subscriptionID", "purchaseToken")
} }
``` ```

82
playstore/validator.go
View File

@@ -1,86 +1,26 @@
package playstore package playstore
import ( import (
"errors"
"net/http" "net/http"
"os"
"time" "time"
"golang.org/x/net/context" "golang.org/x/net/context"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"golang.org/x/oauth2/google"
androidpublisher "google.golang.org/api/androidpublisher/v2" androidpublisher "google.golang.org/api/androidpublisher/v2"
) )
const ( const (
scope = "https://www.googleapis.com/auth/androidpublisher" scope = "https://www.googleapis.com/auth/androidpublisher"
authURL = "https://accounts.google.com/o/oauth2/auth"
tokenURL = "https://accounts.google.com/o/oauth2/token"
timeout = time.Second * 5 defaultTimeout = time.Second * 5
) )
var defaultConfig *oauth2.Config var timeout = defaultTimeout
var defaultTimeout = timeout
// Init initializes the global configuration
func Init() error {
defaultConfig = &oauth2.Config{
Scopes: []string{scope},
Endpoint: oauth2.Endpoint{
AuthURL: authURL,
TokenURL: tokenURL,
},
}
clientID := os.Getenv("IAB_CLIENT_ID")
if clientID != "" {
defaultConfig.ClientID = clientID
}
if defaultConfig.ClientID == "" {
return errors.New("Client ID is required")
}
clientSecret := os.Getenv("IAB_CLIENT_SECRET")
if clientSecret != "" {
defaultConfig.ClientSecret = clientSecret
}
if defaultConfig.ClientSecret == "" {
return errors.New("Client Secret Key is required")
}
return nil
}
// InitWithConfig initializes the global configuration with parameters
func InitWithConfig(config *oauth2.Config) error {
if config.ClientID == "" {
return errors.New("Client ID is required")
}
if config.ClientSecret == "" {
return errors.New("Client Secret Key is required")
}
if len(config.Scopes) == 0 {
config.Scopes = []string{scope}
}
if config.Endpoint.AuthURL == "" {
config.Endpoint.AuthURL = authURL
}
if config.Endpoint.TokenURL == "" {
config.Endpoint.TokenURL = tokenURL
}
defaultConfig = config
return nil
}
// SetTimeout sets dial timeout duration // SetTimeout sets dial timeout duration
func SetTimeout(t time.Duration) { func SetTimeout(t time.Duration) {
defaultTimeout = t timeout = t
} }
// The IABClient type is an interface to verify purchase token // The IABClient type is an interface to verify purchase token
@@ -94,15 +34,17 @@ type Client struct {
httpClient *http.Client httpClient *http.Client
} }
// New returns http client which has oauth token // New returns http client which includes the credentials to access androidpublisher API.
func New(token *oauth2.Token) Client { // You should create a service account for your project at
// https://console.developers.google.com and download a JSON key file to set this argument.
func New(jsonKey []byte) (Client, error) {
ctx := context.WithValue(oauth2.NoContext, oauth2.HTTPClient, &http.Client{ ctx := context.WithValue(oauth2.NoContext, oauth2.HTTPClient, &http.Client{
Timeout: defaultTimeout, Timeout: timeout,
}) })
httpClient := defaultConfig.Client(ctx, token) conf, err := google.JWTConfigFromJSON(jsonKey, scope)
return Client{httpClient} return Client{conf.Client(ctx)}, err
} }
// VerifySubscription Verifies subscription status // VerifySubscription Verifies subscription status

167
playstore/validator_test.go
View File

@@ -1,8 +1,8 @@
package playstore package playstore
import ( import (
"encoding/json"
"errors" "errors"
"os"
"reflect" "reflect"
"testing" "testing"
"time" "time"
@@ -10,146 +10,60 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
func TestInit(t *testing.T) { type testSignature struct {
expected := &oauth2.Config{ PrivateKeyID string `json:"private_key_id"`
ClientID: "dummyId", PrivateKey string `json:"private_key"`
ClientSecret: "dummySecret", ClientEmail string `json:"client_email"`
Scopes: []string{"https://www.googleapis.com/auth/androidpublisher"}, ClientID string `json:"client_id"`
Endpoint: oauth2.Endpoint{ Type string `json:"type"`
AuthURL: "https://accounts.google.com/o/oauth2/auth",
TokenURL: "https://accounts.google.com/o/oauth2/token",
},
}
os.Setenv("IAB_CLIENT_ID", "dummyId")
os.Setenv("IAB_CLIENT_SECRET", "dummySecret")
Init()
os.Clearenv()
actual := defaultConfig
if !reflect.DeepEqual(actual, expected) {
t.Errorf("got %v\nwant %v", actual, expected)
}
} }
func TestInitWithoutClientSecret(t *testing.T) { var testJSON = testSignature{
expected := errors.New("Client Secret Key is required") PrivateKeyID: "dummyKeyID",
PrivateKey: "-----BEGIN PRIVATE KEY-----\nMIIBOQIBAAJBANXOa7wgs5KHMEVJmVo2eoRxEgeqiYF2oABPGYrebU+cQiE7Mwdy\nxv153DHME+9L9QzAj+fR4y5Rwva/fAsGAssCAwEAAQJATQwrFMtwCtC+22kvYywY\nsJuSlMKm9MmL1TCsErgfCj2rksRK1U+/ZY709tE3XJVYlZalWCeVhHTjs5p0pnk6\nYQIhAOw0FksytfIfpdfcREbful+LhFp1um5WjcVf7kQ73JDxAiEA57nJkG9pwnUd\nBCyIcElTVIAKU0+iFpd1208OnGxyT3sCIGaEBNkGXWmEytnxQ8DvAVjOmNcaGZwh\n/M4ZYLREtupBAiAsrpFkTWdqPKTcsi2Y4Tq1N39GMzvA+XGbWTIrDWo5UwIgHhp9\nEOnHuUuPCjpLfYM2vSFiYzaj8UJCImjkMtDwzbA=\n-----END PRIVATE KEY-----\n",
os.Setenv("IAB_CLIENT_ID", "dummyId") ClientEmail: "dummyEmail",
actual := Init() ClientID: "dummyClientID",
os.Clearenv() Type: "service_account",
if !reflect.DeepEqual(actual, expected) {
t.Errorf("got %v\nwant %v", actual, expected)
}
}
func TestInitWithConfig(t *testing.T) {
expected := &oauth2.Config{
ClientID: "dummyId",
ClientSecret: "dummySecret",
Scopes: []string{"https://www.googleapis.com/auth/androidpublisher"},
Endpoint: oauth2.Endpoint{
AuthURL: "https://accounts.google.com/o/oauth2/auth",
TokenURL: "https://accounts.google.com/o/oauth2/token",
},
}
config := &oauth2.Config{
ClientID: "dummyId",
ClientSecret: "dummySecret",
}
InitWithConfig(config)
actual := defaultConfig
if !reflect.DeepEqual(actual, expected) {
t.Errorf("got %v\nwant %v", actual, expected)
}
}
func TestInitWithConfigErrors(t *testing.T) {
expected := errors.New("Client ID is required")
config := &oauth2.Config{
Scopes: []string{"https://www.googleapis.com/auth/androidpublisher"},
Endpoint: oauth2.Endpoint{
AuthURL: "https://accounts.google.com/o/oauth2/auth",
TokenURL: "https://accounts.google.com/o/oauth2/token",
},
}
actual := InitWithConfig(config)
if !reflect.DeepEqual(actual, expected) {
t.Errorf("got %v\nwant %v", actual, expected)
}
expected = errors.New("Client Secret Key is required")
config = &oauth2.Config{
ClientID: "dummyId",
Scopes: []string{"https://www.googleapis.com/auth/androidpublisher"},
Endpoint: oauth2.Endpoint{
AuthURL: "https://accounts.google.com/o/oauth2/auth",
TokenURL: "https://accounts.google.com/o/oauth2/token",
},
}
actual = InitWithConfig(config)
if !reflect.DeepEqual(actual, expected) {
t.Errorf("got %v\nwant %v", actual, expected)
}
} }
func TestNew(t *testing.T) { func TestNew(t *testing.T) {
// Initialize config // Exception scenario
_config := &oauth2.Config{ jsonKey, _ := json.Marshal(testJSON)
ClientID: "dummyId", expected := "oauth2: cannot fetch token: 400 Bad Request\nResponse: {\n \"error\" : \"invalid_grant\"\n}"
ClientSecret: "dummySecret",
RedirectURL: "REDIRECT_URL",
Scopes: []string{"scope1", "scope2"},
Endpoint: oauth2.Endpoint{
AuthURL: "http://example.com/auth",
TokenURL: "http://example.com/token",
},
}
InitWithConfig(_config)
_token := &oauth2.Token{ actual, _ := New(jsonKey)
AccessToken: "accessToken",
RefreshToken: "refreshToken",
Expiry: time.Unix(2234567890, 0).UTC(),
}
actual := New(_token)
val := actual.httpClient.Transport.(*oauth2.Transport) val := actual.httpClient.Transport.(*oauth2.Transport)
token, _ := val.Source.Token() token, err := val.Source.Token()
if !reflect.DeepEqual(token, _token) { if token != nil {
t.Errorf("got %v\nwant %v", token, _token) t.Errorf("got %#v", token)
} }
if err.Error() != expected {
t.Errorf("got %v\nwant %v", err, expected)
}
// TODO Normal scenario
} }
func TestSetTimeout(t *testing.T) { func TestSetTimeout(t *testing.T) {
timeout := time.Second * 3 _timeout := time.Second * 3
SetTimeout(timeout) SetTimeout(_timeout)
if defaultTimeout != timeout { if timeout != _timeout {
t.Errorf("got %#v\nwant %#v", defaultTimeout, timeout) t.Errorf("got %#v\nwant %#v", timeout, _timeout)
} }
} }
func TestVerifySubscription(t *testing.T) { func TestVerifySubscription(t *testing.T) {
Init()
// Exception scenario // Exception scenario
token := &oauth2.Token{ jsonKey, _ := json.Marshal(testJSON)
AccessToken: "accessToken",
RefreshToken: "refreshToken",
Expiry: time.Unix(2234567890, 0).UTC(),
}
client := New(token) expected := "Get https://www.googleapis.com/androidpublisher/v2/applications/package/purchases/subscriptions/subscriptionID/tokens/purchaseToken?alt=json: oauth2: cannot fetch token: 400 Bad Request\nResponse: {\n \"error\" : \"invalid_grant\"\n}"
expected := "googleapi: Error 401: Invalid Credentials, authError"
client, _ := New(jsonKey)
_, err := client.VerifySubscription("package", "subscriptionID", "purchaseToken") _, err := client.VerifySubscription("package", "subscriptionID", "purchaseToken")
if err.Error() != expected { if err.Error() != expected {
t.Errorf("got %v", err) t.Errorf("got %v\nwant %v", err, expected)
} }
// TODO Normal scenario // TODO Normal scenario
@@ -166,17 +80,12 @@ func TestVerifySubscriptionAndroidPublisherError(t *testing.T) {
} }
func TestVerifyProduct(t *testing.T) { func TestVerifyProduct(t *testing.T) {
Init()
// Exception scenario // Exception scenario
token := &oauth2.Token{ jsonKey, _ := json.Marshal(testJSON)
AccessToken: "accessToken",
RefreshToken: "refreshToken",
Expiry: time.Unix(2234567890, 0).UTC(),
}
client := New(token) expected := "Get https://www.googleapis.com/androidpublisher/v2/applications/package/purchases/products/productID/tokens/purchaseToken?alt=json: oauth2: cannot fetch token: 400 Bad Request\nResponse: {\n \"error\" : \"invalid_grant\"\n}"
expected := "googleapi: Error 401: Invalid Credentials, authError"
client, _ := New(jsonKey)
_, err := client.VerifyProduct("package", "productID", "purchaseToken") _, err := client.VerifyProduct("package", "productID", "purchaseToken")
if err.Error() != expected { if err.Error() != expected {