Make Parsing Methods Type Safe (#1040)

* Make type safe * Type check before init * Check for passthrough response type * Remove Unnecessary change * Update PrebidMobile/PrebidMobileRendering/Utilities/PBMFunctions.m Co-authored-by: David Robles <[email protected]> * Update PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidExt.m Co-authored-by: David Robles <[email protected]> * Update PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidExtPrebid.m Co-authored-by: David Robles <[email protected]> * Update PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidResponseExtPrebid.m Co-authored-by: David Robles <[email protected]> --------- Co-authored-by: Ankit Rajendra Thanekar <[email protected]> Co-authored-by: David Robles <[email protected]>
prebid · Dec 19, 2024 · c04a415 · c04a415
1 parent 424c60d
commit c04a415
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidExt.m b/PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidExt.m
@@ -43,7 +43,8 @@ - (instancetype)initWithJsonDictionary:(PBMJsonDictionary *)jsonDictionary {
     }
 
     #if DEBUG
-    NSArray * const passthroughDics = jsonDictionary[@"passthrough"];
+
+    NSArray<PBMJsonDictionary *> *const passthroughDics = [PBMFunctions dictionariesForPassthrough:jsonDictionary[@"passthrough"]];
     _passthrough = nil;
     if (passthroughDics) {
         NSMutableArray * const newPassthrough = [[NSMutableArray alloc] initWithCapacity:passthroughDics.count];

diff --git a/PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidExtPrebid.m b/PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidExtPrebid.m
@@ -36,7 +36,7 @@ - (instancetype)initWithJsonDictionary:(PBMJsonDictionary *)jsonDictionary {
     _meta = jsonDictionary[@"meta"];
     _type = jsonDictionary[@"type"];
 
-    NSArray * const passthroughDics = jsonDictionary[@"passthrough"];
+    NSArray<PBMJsonDictionary *> *const passthroughDics = [PBMFunctions dictionariesForPassthrough:jsonDictionary[@"passthrough"]];
     _passthrough = nil;
     if (passthroughDics) {
         NSMutableArray * const newPassthrough = [[NSMutableArray alloc] initWithCapacity:passthroughDics.count];

diff --git a/PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidResponseExtPrebid.m b/PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/ORTB/Prebid/PBMORTBBidResponseExtPrebid.m
@@ -22,7 +22,7 @@ - (instancetype)initWithJsonDictionary:(PBMJsonDictionary *)jsonDictionary {
         return nil;
     }
 
-    NSArray * const passthroughDics = jsonDictionary[@"passthrough"];
+    NSArray<PBMJsonDictionary *> *const passthroughDics = [PBMFunctions dictionariesForPassthrough:jsonDictionary[@"passthrough"]];
     _passthrough = nil;
     if (passthroughDics) {
         NSMutableArray * const newPassthrough = [[NSMutableArray alloc] initWithCapacity:passthroughDics.count];

diff --git a/PrebidMobile/PrebidMobileRendering/Utilities/PBMFunctions.h b/PrebidMobile/PrebidMobileRendering/Utilities/PBMFunctions.h
@@ -15,6 +15,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#import "PBMConstants.h"
 
 NS_ASSUME_NONNULL_BEGIN
 @interface PBMFunctions : NSObject
@@ -24,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSDictionary<NSString *, NSString *> *)extractVideoAdParamsFromTheURLString:(NSString *)urlString forKeys:(NSArray *)keys;
 + (BOOL)canLoadVideoAdWithDomain:(NSString *)domain adUnitID:(nullable NSString *)adUnitID adUnitGroupID:(nullable NSString *)adUnitGroupID;
 + (void)checkCertificateChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable))completionHandler;
-
++ (nullable NSArray<PBMJsonDictionary *> *)dictionariesForPassthrough:(id)passthrough;
 //FIXME: move to private fucntions ??
 #pragma mark - SDK Info
 

diff --git a/PrebidMobile/PrebidMobileRendering/Utilities/PBMFunctions.m b/PrebidMobile/PrebidMobileRendering/Utilities/PBMFunctions.m
@@ -17,7 +17,6 @@
 #import "PBMFunctions+Private.h"
 #import "PBMFunctions+Testing.h"
 
-#import "PBMConstants.h"
 #import "PBMError.h"
 
 #import "PrebidMobileSwiftHeaders.h"
@@ -231,6 +230,18 @@ + (nullable NSString *)toStringJsonDictionary:(nonnull PBMJsonDictionary *)jsonD
     return [jsonString stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
 }
 
++ (nullable NSArray<PBMJsonDictionary *> *)dictionariesForPassthrough:(id)passthrough {
+    if ([passthrough isKindOfClass:[NSArray<PBMJsonDictionary*> class]]) {
+        NSArray<PBMJsonDictionary *> *response = passthrough;
+        return response;
+    } else if ([passthrough isKindOfClass:[PBMJsonDictionary class]]) {
+        NSDictionary *response = passthrough;
+        return @[response];
+    } else {
+        return nil;
+    }
+}
+
 #pragma mark - SDK Info
 
 + (nonnull NSBundle *)bundleForSDK {