Merge pull request #5 from xiatechs/upstream-upgrade

Upgrade upstream to v3.12.0

access_scopes.go

@@ -0,0 +1,28 @@
+package goshopify
+
+type AccessScopesService interface {
+	List(interface{}) ([]AccessScope, error)
+}
+
+type AccessScope struct {
+	Handle string `json:"handle,omitempty"`
+}
+
+// AccessScopesResource represents the result from the oauth/access_scopes.json endpoint
+type AccessScopesResource struct {
+	AccessScopes []AccessScope `json:"access_scopes,omitempty"`
+}
+
+// AccessScopesServiceOp handles communication with the Access Scopes
+// related methods of the Shopify API
+type AccessScopesServiceOp struct {
+	client     *Client
+}
+
+// List gets access scopes based on used oauth token
+func (s *AccessScopesServiceOp) List(options interface{}) ([]AccessScope, error) {
+	path := "oauth/access_scopes.json"
+	resource := new(AccessScopesResource)
+	err := s.client.Get(path, resource, options)
+	return resource.AccessScopes, err
+}

access_scopes_test.go

@@ -0,0 +1,37 @@
+package goshopify
+
+import (
+	"testing"
+	"fmt"
+	"reflect"
+
+	"github.com/jarcoal/httpmock"
+)
+
+func TestAccessScopesServiceOp_List(t *testing.T) {
+	setup()
+	defer teardown()
+
+	httpmock.RegisterResponder(
+		"GET",
+		fmt.Sprintf("https://fooshop.myshopify.com/%s/oauth/access_scopes.json", client.pathPrefix),
+		httpmock.NewBytesResponder(200, loadFixture("access_scopes.json")),
+	)
+
+	scopeResponse, err := client.AccessScopes.List(nil)
+	if err != nil {
+		t.Errorf("AccessScopes.List returned an error: %v", err)
+	}
+
+	expected := []AccessScope{
+		{
+			Handle: "scope_1",
+		},
+		{
+			Handle: "scope_2",
+		},
+	}
+	if !reflect.DeepEqual(scopeResponse, expected) {
+		t.Errorf("AccessScopes.List returned %+v, expected %+v", expected, expected)
+	}
+}

customcollection_test.go

@@ -238,6 +238,7 @@ func TestCustomCollectionCreateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 
@@ -261,6 +262,7 @@ func TestCustomCollectionUpdateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 

customer_test.go

@@ -495,6 +495,7 @@ func TestCustomerCreateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 
@@ -518,6 +519,7 @@ func TestCustomerUpdateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 

fixtures/access_scopes.json

@@ -0,0 +1,10 @@
+{
+  "access_scopes": [
+    {
+      "handle": "scope_1"
+    },
+    {
+      "handle": "scope_2"
+    }
+  ]
+}

fixtures/metafield.json

@@ -5,6 +5,7 @@
     "key": "app_key",
     "value": "app_value",
     "value_type": "string",
+    "type": "single_line_text_field",
     "description": "some amaaazing app's value",
     "owner_id": 1,
     "created_at": "2016-01-01T00:00:00Z",

goshopify.go

@@ -115,6 +115,7 @@ type Client struct {
 	InventoryItem              InventoryItemService
 	ShippingZone               ShippingZoneService
 	ProductListing             ProductListingService
+	AccessScopes               AccessScopesService
 }
 
 // A general response error that follows a similar layout to Shopify's response
@@ -289,6 +290,7 @@ func NewClient(app App, shopName, token string, opts ...Option) *Client {
 	c.InventoryItem = &InventoryItemServiceOp{client: c}
 	c.ShippingZone = &ShippingZoneServiceOp{client: c}
 	c.ProductListing = &ProductListingServiceOp{client: c}
+	c.AccessScopes = &AccessScopesServiceOp{client: c}
 
 	// apply any options
 	for _, opt := range opts {
@@ -323,7 +325,7 @@ func (c *Client) doGetHeaders(req *http.Request, v interface{}) (http.Header, er
 		resp, err = c.Client.Do(req)
 		c.logResponse(resp)
 		if err != nil {
-			return nil, err //http client errors, not api responses
+			return nil, err // http client errors, not api responses
 		}
 
 		respErr := CheckResponseError(resp)

metafield.go

@@ -39,17 +39,18 @@ type MetafieldServiceOp struct {
 
 // Metafield represents a Shopify metafield.
 type Metafield struct {
-	ID            int64       `json:"id,omitempty"`
-	Key           string      `json:"key,omitempty"`
-	Value         interface{} `json:"value,omitempty"`
-	ValueType     string      `json:"value_type,omitempty"`
-	Namespace     string      `json:"namespace,omitempty"`
-	Description   string      `json:"description,omitempty"`
-	OwnerId       int64       `json:"owner_id,omitempty"`
-	CreatedAt     *time.Time  `json:"created_at,omitempty"`
-	UpdatedAt     *time.Time  `json:"updated_at,omitempty"`
-	OwnerResource string      `json:"owner_resource,omitempty"`
-	AdminGraphqlAPIID string  `json:"admin_graphql_api_id,omitempty"`
+	ID                int64       `json:"id,omitempty"`
+	Key               string      `json:"key,omitempty"`
+	Value             interface{} `json:"value,omitempty"`
+	ValueType         string      `json:"value_type,omitempty"`
+	Type              string      `json:"type,omitempty"`
+	Namespace         string      `json:"namespace,omitempty"`
+	Description       string      `json:"description,omitempty"`
+	OwnerId           int64       `json:"owner_id,omitempty"`
+	CreatedAt         *time.Time  `json:"created_at,omitempty"`
+	UpdatedAt         *time.Time  `json:"updated_at,omitempty"`
+	OwnerResource     string      `json:"owner_resource,omitempty"`
+	AdminGraphqlAPIID string      `json:"admin_graphql_api_id,omitempty"`
 }
 
 // MetafieldResource represents the result from the metafields/X.json endpoint

metafield_test.go

@@ -90,6 +90,7 @@ func TestMetafieldGet(t *testing.T) {
 		Key:               "app_key",
 		Value:             "app_value",
 		ValueType:         "string",
+		Type:              "single_line_text_field",
 		Namespace:         "affiliates",
 		Description:       "some amaaazing app's value",
 		OwnerId:           1,
@@ -115,6 +116,7 @@ func TestMetafieldCreate(t *testing.T) {
 		Key:       "warehouse",
 		Value:     "25",
 		ValueType: "integer",
+		Type:      "single_line_text_field",
 	}
 
 	returnedMetafield, err := client.Metafield.Create(metafield)
@@ -136,6 +138,7 @@ func TestMetafieldUpdate(t *testing.T) {
 		ID:        1,
 		Value:     "something new",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 	}
 
 	returnedMetafield, err := client.Metafield.Update(metafield)

order_test.go

@@ -549,6 +549,7 @@ func TestOrderCreateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 
@@ -572,6 +573,7 @@ func TestOrderUpdateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 

page_test.go

@@ -224,6 +224,7 @@ func TestPageCreateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 
@@ -247,6 +248,7 @@ func TestPageUpdateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 

product_test.go

@@ -393,6 +393,7 @@ func TestProductCreateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 
@@ -416,6 +417,7 @@ func TestProductUpdateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 

smartcollection_test.go

@@ -241,6 +241,7 @@ func TestSmartCollectionCreateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 
@@ -264,6 +265,7 @@ func TestSmartCollectionUpdateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 

variant_test.go

@@ -321,6 +321,7 @@ func TestVariantCreateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}
 
@@ -344,6 +345,7 @@ func TestVariantUpdateMetafield(t *testing.T) {
 		Key:       "app_key",
 		Value:     "app_value",
 		ValueType: "string",
+		Type:      "single_line_text_field",
 		Namespace: "affiliates",
 	}