Merge pull request #1 from chuganzy/type-guard

Add a type guard to Validator

Author: alexanderjordanbaker

index.ts

@@ -130,7 +130,7 @@ export class AppStoreServerAPIClient {
                     if (!validator.validate(responseBody)) {
                         throw new Error("Unexpected response body format")
                     }
-                    return responseBody as T
+                    return responseBody
                 });
             } else {
                 return r.json().then(responseBody => {

jwt_verification.ts

@@ -145,7 +145,7 @@ export class SignedDataVerifier {
         throw new VerificationException(VerificationStatus.INVALID_CERTIFICATE)
       }
       try {
-        const decodedJWT = jsonwebtoken.decode(jwt) as T
+        const decodedJWT = jsonwebtoken.decode(jwt)
         if (!validator.validate(decodedJWT)) {
           throw new VerificationException(VerificationStatus.FAILURE)
         }

models/AccountTenure.ts

@@ -19,7 +19,7 @@ export enum AccountTenure {
 }
 
 export class AccountTenureValidator implements Validator<AccountTenure> {
-   validate(obj: any): boolean {
+   validate(obj: any): obj is AccountTenure {
         return Object.values(AccountTenure).includes(obj)
     }
 }

models/AppTransaction.ts

@@ -90,7 +90,7 @@ export interface AppTransaction {
 
 export class AppTransactionValidator implements Validator<AppTransaction> {
     static readonly environmentValidator = new EnvironmentValidator()
-    validate(obj: any): boolean {
+    validate(obj: any): obj is AppTransaction {
         if ((typeof obj['appAppleId'] !== 'undefined') && !(typeof obj['appAppleId'] === "number")) {
             return false
         }

models/AutoRenewStatus.ts

@@ -13,7 +13,7 @@ export enum AutoRenewStatus {
 }
 
 export class AutoRenewStatusValidator implements Validator<AutoRenewStatus> {
-   validate(obj: any): boolean {
+   validate(obj: any): obj is AutoRenewStatus {
         return Object.values(AutoRenewStatus).includes(obj)
     }
 }

models/CheckTestNotificationResponse.ts

@@ -27,7 +27,7 @@ export interface CheckTestNotificationResponse {
 
 export class CheckTestNotificationResponseValidator implements Validator<CheckTestNotificationResponse> {
     static readonly sendAttemptItemValidator = new SendAttemptItemValidator()
-    validate(obj: any): boolean {
+    validate(obj: any): obj is CheckTestNotificationResponse {
         if ((typeof obj['signedPayload'] !== 'undefined') && !(typeof obj['signedPayload'] === "string" || obj['signedPayload'] instanceof String)) {
             return false
         }

models/ConsumptionStatus.ts

@@ -15,7 +15,7 @@ export enum ConsumptionStatus {
 }
 
 export class ConsumptionStatusValidator implements Validator<ConsumptionStatus> {
-   validate(obj: any): boolean {
+   validate(obj: any): obj is ConsumptionStatus {
         return Object.values(ConsumptionStatus).includes(obj)
     }
 }

models/Data.ts

@@ -56,7 +56,7 @@ export interface Data {
 
 export class DataValidator implements Validator<Data> {
     static readonly environmentValidator = new EnvironmentValidator()
-    validate(obj: any): boolean {
+    validate(obj: any): obj is Data {
         if ((typeof obj['environment'] !== 'undefined') && !(DataValidator.environmentValidator.validate(obj['environment']))) {
             return false
         }

models/DeliveryStatus.ts

@@ -17,7 +17,7 @@ export enum DeliveryStatus {
 }
 
 export class DeliveryStatusValidator implements Validator<DeliveryStatus> {
-   validate(obj: any): boolean {
+   validate(obj: any): obj is DeliveryStatus {
         return Object.values(DeliveryStatus).includes(obj)
     }
 }

models/Environment.ts

@@ -13,7 +13,7 @@ export enum Environment {
 }
 
 export class EnvironmentValidator implements Validator<Environment> {
-   validate(obj: any): boolean {
+   validate(obj: any): obj is Environment {
         return Object.values(Environment).includes(obj)
     }
 }