Merge branch 'master' into patch-6

client.go

@@ -162,7 +162,7 @@ func (c *Client) PushWithContext(ctx Context, n *Notification) (*Response, error
 	}
 
 	url := fmt.Sprintf("%v/3/device/%v", c.Host, n.DeviceToken)
-	req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(payload))
+	req, err := http.NewRequest(http.MethodPost, url, bytes.NewReader(payload))
 	if err != nil {
 		return nil, err
 	}

notification.go

@@ -137,12 +137,12 @@ type Notification struct {
 
 // MarshalJSON converts the notification payload to JSON.
 func (n *Notification) MarshalJSON() ([]byte, error) {
-	switch n.Payload.(type) {
+	switch payload := n.Payload.(type) {
 	case string:
-		return []byte(n.Payload.(string)), nil
+		return []byte(payload), nil
 	case []byte:
-		return n.Payload.([]byte), nil
+		return payload, nil
 	default:
-		return json.Marshal(n.Payload)
+		return json.Marshal(payload)
 	}
 }

token/token.go

@@ -58,12 +58,10 @@ func AuthKeyFromBytes(bytes []byte) (*ecdsa.PrivateKey, error) {
 	if err != nil {
 		return nil, err
 	}
-	switch pk := key.(type) {
-	case *ecdsa.PrivateKey:
+	if pk, ok := key.(*ecdsa.PrivateKey); ok {
 		return pk, nil
-	default:
-		return nil, ErrAuthKeyNotECDSA
 	}
+	return nil, ErrAuthKeyNotECDSA
 }
 
 // GenerateIfExpired checks to see if the token is about to expire and