diff --git a/AppStoreServerApi/AppleAppstoreClient.cs b/AppStoreServerApi/AppleAppstoreClient.cs index 28c4ff5..5782c70 100644 --- a/AppStoreServerApi/AppleAppstoreClient.cs +++ b/AppStoreServerApi/AppleAppstoreClient.cs @@ -4,7 +4,6 @@ using Microsoft.IdentityModel.JsonWebTokens; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using System.Dynamic; using System.Net.Http.Headers; using System.Security.Cryptography; @@ -93,6 +92,7 @@ private bool TokenExpired } #region Request utilities + private async Task MakeRequest(string url) { var token = this.GetToken(); @@ -143,7 +143,7 @@ private ECDsa GetEllipticCurveAlgorithm() }); } - public ECDsaSecurityKey GetEcdsaSecuritKey() + public ECDsaSecurityKey GetEcdsaSecurityKey() { var signatureAlgorithm = GetEllipticCurveAlgorithm(); var eCDsaSecurityKey = new ECDsaSecurityKey(signatureAlgorithm) @@ -164,7 +164,7 @@ private string GetToken() var now = DateTime.Now; var expiry = now.AddSeconds(MaxTokenAge); - ECDsaSecurityKey eCDsaSecurityKey = GetEcdsaSecuritKey(); + ECDsaSecurityKey eCDsaSecurityKey = GetEcdsaSecurityKey(); var handler = new JsonWebTokenHandler(); string jwt = handler.CreateToken(new SecurityTokenDescriptor @@ -187,14 +187,10 @@ private string GetToken() return jwt; } - /*private int GetUnixTimestamp(DateTime dateTime) - { - var time = (dateTime.ToUniversalTime() - new DateTime(1970, 1, 1)); - return (int)(time.TotalMilliseconds + 0.5); - }*/ #endregion #region Decode signed fields + public List DecodeTransactions(List signedTransactions) { return signedTransactions.Select(s => DecodeJWS(s)).ToList(); @@ -282,6 +278,7 @@ private static List ValidateCertificate(List certifica return x509certs; } + #endregion } } \ No newline at end of file diff --git a/AppStoreServerApi/Models/AppleEnvironment.cs b/AppStoreServerApi/Models/AppleEnvironment.cs index 9a953a7..f4b94f0 100644 --- a/AppStoreServerApi/Models/AppleEnvironment.cs +++ b/AppStoreServerApi/Models/AppleEnvironment.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { + // https://developer.apple.com/documentation/appstoreserverapi/environment public class AppleEnvironment { public const string Production = "Production"; diff --git a/AppStoreServerApi/Models/AutoRenewStatus.cs b/AppStoreServerApi/Models/AutoRenewStatus.cs index 549b204..0f6bb19 100644 --- a/AppStoreServerApi/Models/AutoRenewStatus.cs +++ b/AppStoreServerApi/Models/AutoRenewStatus.cs @@ -1,12 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { - // https://developer.apple.com/documentation/appstoreserverapi/autorenewstatus public enum AutoRenewStatus { diff --git a/AppStoreServerApi/Models/CertificateValidationException.cs b/AppStoreServerApi/Models/CertificateValidationException.cs index a63938e..4485786 100644 --- a/AppStoreServerApi/Models/CertificateValidationException.cs +++ b/AppStoreServerApi/Models/CertificateValidationException.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { public class CertificateValidationException: Exception { diff --git a/AppStoreServerApi/Models/DecodedNotificationPayload.cs b/AppStoreServerApi/Models/DecodedNotificationPayload.cs index be0192a..8e66792 100644 --- a/AppStoreServerApi/Models/DecodedNotificationPayload.cs +++ b/AppStoreServerApi/Models/DecodedNotificationPayload.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { public class DecodedNotificationPayload { diff --git a/AppStoreServerApi/Models/ExpirationIntent.cs b/AppStoreServerApi/Models/ExpirationIntent.cs index 5d8b752..1342ad1 100644 --- a/AppStoreServerApi/Models/ExpirationIntent.cs +++ b/AppStoreServerApi/Models/ExpirationIntent.cs @@ -1,12 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { - // https://developer.apple.com/documentation/appstoreserverapi/expirationintent public enum ExpirationIntent { diff --git a/AppStoreServerApi/Models/HistoryResponse.cs b/AppStoreServerApi/Models/HistoryResponse.cs index 831717c..6e9c874 100644 --- a/AppStoreServerApi/Models/HistoryResponse.cs +++ b/AppStoreServerApi/Models/HistoryResponse.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/historyresponse public class HistoryResponse diff --git a/AppStoreServerApi/Models/JWSDecodedHeader.cs b/AppStoreServerApi/Models/JWSDecodedHeader.cs index d8a92e1..5e91343 100644 --- a/AppStoreServerApi/Models/JWSDecodedHeader.cs +++ b/AppStoreServerApi/Models/JWSDecodedHeader.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/jwsdecodedheader public class JWSDecodedHeader diff --git a/AppStoreServerApi/Models/JWSRenewalInfoDecodedPayload.cs b/AppStoreServerApi/Models/JWSRenewalInfoDecodedPayload.cs index 2ba8282..38d5a8b 100644 --- a/AppStoreServerApi/Models/JWSRenewalInfoDecodedPayload.cs +++ b/AppStoreServerApi/Models/JWSRenewalInfoDecodedPayload.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/jwsrenewalinfodecodedpayload public class JWSRenewalInfoDecodedPayload diff --git a/AppStoreServerApi/Models/JWSTransactionDecodedPayload.cs b/AppStoreServerApi/Models/JWSTransactionDecodedPayload.cs index 4a6eff6..51610c9 100644 --- a/AppStoreServerApi/Models/JWSTransactionDecodedPayload.cs +++ b/AppStoreServerApi/Models/JWSTransactionDecodedPayload.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/jwstransactiondecodedpayload public class JWSTransactionDecodedPayload diff --git a/AppStoreServerApi/Models/LastTransactionsItem.cs b/AppStoreServerApi/Models/LastTransactionsItem.cs index 00077e0..56de791 100644 --- a/AppStoreServerApi/Models/LastTransactionsItem.cs +++ b/AppStoreServerApi/Models/LastTransactionsItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/lasttransactionsitem public class LastTransactionsItem diff --git a/AppStoreServerApi/Models/NotificationData.cs b/AppStoreServerApi/Models/NotificationData.cs index 789ffa3..7c2e9cd 100644 --- a/AppStoreServerApi/Models/NotificationData.cs +++ b/AppStoreServerApi/Models/NotificationData.cs @@ -1,6 +1,4 @@ -using System; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { public class NotificationData { diff --git a/AppStoreServerApi/Models/NotificationSubtype.cs b/AppStoreServerApi/Models/NotificationSubtype.cs index e28ad40..02f43d5 100644 --- a/AppStoreServerApi/Models/NotificationSubtype.cs +++ b/AppStoreServerApi/Models/NotificationSubtype.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { public class NotificationSubtype { diff --git a/AppStoreServerApi/Models/NotificationType.cs b/AppStoreServerApi/Models/NotificationType.cs index f42558f..aaddf6e 100644 --- a/AppStoreServerApi/Models/NotificationType.cs +++ b/AppStoreServerApi/Models/NotificationType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreservernotifications/notificationtype public class NotificationType diff --git a/AppStoreServerApi/Models/OfferType.cs b/AppStoreServerApi/Models/OfferType.cs index 2fe120f..66770d1 100644 --- a/AppStoreServerApi/Models/OfferType.cs +++ b/AppStoreServerApi/Models/OfferType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/offertype public enum OfferType diff --git a/AppStoreServerApi/Models/OrderLookupResponse.cs b/AppStoreServerApi/Models/OrderLookupResponse.cs index a7faf93..7900cfe 100644 --- a/AppStoreServerApi/Models/OrderLookupResponse.cs +++ b/AppStoreServerApi/Models/OrderLookupResponse.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/orderlookupresponse public class OrderLookupResponse diff --git a/AppStoreServerApi/Models/OrderLookupStatus.cs b/AppStoreServerApi/Models/OrderLookupStatus.cs index 28e6320..1264ec7 100644 --- a/AppStoreServerApi/Models/OrderLookupStatus.cs +++ b/AppStoreServerApi/Models/OrderLookupStatus.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { + // https://developer.apple.com/documentation/appstoreserverapi/orderlookupstatus public enum OrderLookupStatus { Valid = 0, diff --git a/AppStoreServerApi/Models/OwnershipType.cs b/AppStoreServerApi/Models/OwnershipType.cs index be6c039..c72c4aa 100644 --- a/AppStoreServerApi/Models/OwnershipType.cs +++ b/AppStoreServerApi/Models/OwnershipType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/inappownershiptype public class OwnershipType diff --git a/AppStoreServerApi/Models/PriceIncreaseStatus.cs b/AppStoreServerApi/Models/PriceIncreaseStatus.cs index 89fdb14..808048c 100644 --- a/AppStoreServerApi/Models/PriceIncreaseStatus.cs +++ b/AppStoreServerApi/Models/PriceIncreaseStatus.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/priceincreasestatus public enum PriceIncreaseStatus diff --git a/AppStoreServerApi/Models/StatusResponse.cs b/AppStoreServerApi/Models/StatusResponse.cs index 2e868d6..a4ec623 100644 --- a/AppStoreServerApi/Models/StatusResponse.cs +++ b/AppStoreServerApi/Models/StatusResponse.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/statusresponse public class StatusResponse diff --git a/AppStoreServerApi/Models/SubscriptionGroupIdentifierItem.cs b/AppStoreServerApi/Models/SubscriptionGroupIdentifierItem.cs index 71c2097..4051da7 100644 --- a/AppStoreServerApi/Models/SubscriptionGroupIdentifierItem.cs +++ b/AppStoreServerApi/Models/SubscriptionGroupIdentifierItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/subscriptiongroupidentifieritem public class SubscriptionGroupIdentifierItem diff --git a/AppStoreServerApi/Models/SubscriptionStatus.cs b/AppStoreServerApi/Models/SubscriptionStatus.cs index 3c000f0..c7c9caf 100644 --- a/AppStoreServerApi/Models/SubscriptionStatus.cs +++ b/AppStoreServerApi/Models/SubscriptionStatus.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/status public enum SubscriptionStatus diff --git a/AppStoreServerApi/Models/TransactionType.cs b/AppStoreServerApi/Models/TransactionType.cs index de40c20..5cf39c0 100644 --- a/AppStoreServerApi/Models/TransactionType.cs +++ b/AppStoreServerApi/Models/TransactionType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AppStoreServerApi.Models +namespace AppStoreServerApi.Models { // https://developer.apple.com/documentation/appstoreserverapi/type public class TransactionType