Merge pull request #308 from Vovcharaa/master

Update `golang-jwt/jwt` to v5

README.md

@@ -191,7 +191,7 @@ func main() {
 ```go
 import (
 	"github.com/awa/go-iap/appstore"
-	"github.com/golang-jwt/jwt/v4"
+	"github.com/golang-jwt/jwt/v5"
 )
 
 func main() {

appstore/api/model.go

@@ -1,6 +1,9 @@
 package api
 
-import "github.com/awa/go-iap/appstore"
+import (
+	"github.com/awa/go-iap/appstore"
+	"github.com/golang-jwt/jwt/v5"
+)
 
 // OrderLookupResponse https://developer.apple.com/documentation/appstoreserverapi/orderlookupresponse
 type OrderLookupResponse struct {
@@ -83,6 +86,9 @@ type ConsumptionRequestBody struct {
 	RefundPreference         int32  `json:"refundPreference"`
 }
 
+// Verify that JWSRenewalInfoDecodedPayload implements jwt.Claims
+var _ jwt.Claims = JWSRenewalInfoDecodedPayload{}
+
 // JWSRenewalInfoDecodedPayload https://developer.apple.com/documentation/appstoreserverapi/jwsrenewalinfodecodedpayload
 type JWSRenewalInfoDecodedPayload struct {
 	AutoRenewProductId          string            `json:"autoRenewProductId"`
@@ -105,8 +111,34 @@ type JWSRenewalInfoDecodedPayload struct {
 	EligibleWinBackOfferIds     []string          `json:"eligibleWinBackOfferIds,omitempty"`
 }
 
-func (J JWSRenewalInfoDecodedPayload) Valid() error {
-	return nil
+// GetAudience implements jwt.Claims.
+func (J JWSRenewalInfoDecodedPayload) GetAudience() (jwt.ClaimStrings, error) {
+	return nil, nil
+}
+
+// GetExpirationTime implements jwt.Claims.
+func (J JWSRenewalInfoDecodedPayload) GetExpirationTime() (*jwt.NumericDate, error) {
+	return nil, nil
+}
+
+// GetIssuedAt implements jwt.Claims.
+func (J JWSRenewalInfoDecodedPayload) GetIssuedAt() (*jwt.NumericDate, error) {
+	return nil, nil
+}
+
+// GetIssuer implements jwt.Claims.
+func (J JWSRenewalInfoDecodedPayload) GetIssuer() (string, error) {
+	return "", nil
+}
+
+// GetNotBefore implements jwt.Claims.
+func (J JWSRenewalInfoDecodedPayload) GetNotBefore() (*jwt.NumericDate, error) {
+	return nil, nil
+}
+
+// GetSubject implements jwt.Claims.
+func (J JWSRenewalInfoDecodedPayload) GetSubject() (string, error) {
+	return "", nil
 }
 
 // JWSDecodedHeader https://developer.apple.com/documentation/appstoreserverapi/jwsdecodedheader
@@ -143,6 +175,9 @@ const (
 	OfferDiscountTypePayUpFront OfferDiscountType = "PAY_UP_FRONT"
 )
 
+// Verify that JWSTransaction implements jwt.Claims
+var _ jwt.Claims = JWSTransaction{}
+
 // JWSTransaction https://developer.apple.com/documentation/appstoreserverapi/jwstransaction
 type JWSTransaction struct {
 	TransactionID               string            `json:"transactionId,omitempty"`
@@ -173,8 +208,34 @@ type JWSTransaction struct {
 	OfferDiscountType           OfferDiscountType `json:"offerDiscountType,omitempty"`
 }
 
-func (J JWSTransaction) Valid() error {
-	return nil
+// GetAudience implements jwt.Claims.
+func (J JWSTransaction) GetAudience() (jwt.ClaimStrings, error) {
+	return nil, nil
+}
+
+// GetExpirationTime implements jwt.Claims.
+func (J JWSTransaction) GetExpirationTime() (*jwt.NumericDate, error) {
+	return nil, nil
+}
+
+// GetIssuedAt implements jwt.Claims.
+func (J JWSTransaction) GetIssuedAt() (*jwt.NumericDate, error) {
+	return nil, nil
+}
+
+// GetIssuer implements jwt.Claims.
+func (J JWSTransaction) GetIssuer() (string, error) {
+	return "", nil
+}
+
+// GetNotBefore implements jwt.Claims.
+func (J JWSTransaction) GetNotBefore() (*jwt.NumericDate, error) {
+	return nil, nil
+}
+
+// GetSubject implements jwt.Claims.
+func (J JWSTransaction) GetSubject() (string, error) {
+	return "", nil
 }
 
 // https://developer.apple.com/documentation/appstoreserverapi/extendreasoncode
@@ -258,8 +319,10 @@ type SendTestNotificationResponse struct {
 	TestNotificationToken string `json:"testNotificationToken"`
 }
 
-type AutoRenewSubscriptionStatus int32
-type AutoRenewStatus int32
+type (
+	AutoRenewSubscriptionStatus int32
+	AutoRenewStatus             int32
+)
 
 const (
 	SubscriptionActive      AutoRenewSubscriptionStatus = 1

appstore/api/store.go

@@ -16,7 +16,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang-jwt/jwt/v4"
+	"github.com/golang-jwt/jwt/v5"
 )
 
 const (

appstore/api/token.go

@@ -5,11 +5,10 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"errors"
-	"os"
 	"sync"
 	"time"
 
-	"github.com/golang-jwt/jwt/v4"
+	"github.com/golang-jwt/jwt/v5"
 	"github.com/google/uuid"
 )
 
@@ -113,16 +112,6 @@ func (t *Token) Generate() error {
 	return nil
 }
 
-// loadKeyFromFile loads a .p8 certificate from a local file and returns a *ecdsa.PrivateKey.
-func (t *Token) loadKeyFromFile(filename string) (*ecdsa.PrivateKey, error) {
-	bytes, err := os.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	return t.passKeyFromByte(bytes)
-}
-
 // passKeyFromByte loads a .p8 certificate from an in memory byte array and returns an *ecdsa.PrivateKey.
 func (t *Token) passKeyFromByte(bytes []byte) (*ecdsa.PrivateKey, error) {
 	block, _ := pem.Decode(bytes)