diff --git a/providers/apple/apple.go b/providers/apple/apple.go index 137e95ab3..b0e870a2c 100644 --- a/providers/apple/apple.go +++ b/providers/apple/apple.go @@ -63,12 +63,12 @@ func (p Provider) ClientId() string { } type SecretParams struct { - pkcs8PrivateKey, teamId, keyId, clientId string - iat, exp int + PKCS8PrivateKey, TeamId, KeyId, ClientId string + Iat, Exp int } func MakeSecret(sp SecretParams) (*string, error) { - block, rest := pem.Decode([]byte(strings.TrimSpace(sp.pkcs8PrivateKey))) + block, rest := pem.Decode([]byte(strings.TrimSpace(sp.PKCS8PrivateKey))) if block == nil || len(rest) > 0 { return nil, errors.New("invalid private key") } @@ -77,13 +77,13 @@ func MakeSecret(sp SecretParams) (*string, error) { return nil, err } token := jwt.NewWithClaims(jwt.SigningMethodES256, jwt.MapClaims{ - "iss": sp.teamId, - "iat": sp.iat, - "exp": sp.exp, + "iss": sp.TeamId, + "iat": sp.Iat, + "exp": sp.Exp, "aud": AppleAudOrIss, - "sub": sp.clientId, + "sub": sp.ClientId, }) - token.Header["kid"] = sp.keyId + token.Header["kid"] = sp.KeyId ss, err := token.SignedString(pk) return &ss, err } diff --git a/providers/apple/apple_test.go b/providers/apple/apple_test.go index d8e8f5096..2786d6c9f 100644 --- a/providers/apple/apple_test.go +++ b/providers/apple/apple_test.go @@ -58,16 +58,16 @@ func TestMakeSecret(t *testing.T) { iat := 1570636633 ss, err := MakeSecret(SecretParams{ - pkcs8PrivateKey: `-----BEGIN PRIVATE KEY----- + PKCS8PrivateKey: `-----BEGIN PRIVATE KEY----- MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgPALVklHT2n9FNxeP c1+TCP+Ep7YOU7T9KB5MTVpjL1ShRANCAATXAbDMQ/URATKRoSIFMkwetLH/M2S4 nNFzkp23qt9IJDivieB/BBJct1UvhoICg5eZDhSR+x7UH3Uhog8qgoIC -----END PRIVATE KEY-----`, // example - teamId: "TK...", - keyId: "", - clientId: "", - iat: iat, - exp: iat + 15777000, + TeamId: "TK...", + KeyId: "", + ClientId: "", + Iat: iat, + Exp: iat + 15777000, }) a.NoError(err) a.NotZero(ss)