Added request uuid and request creation timestamps to v1/qr-code requ…

…ests
BranchMetrics · Oct 3, 2024 · be28ff6 · be28ff6
1 parent 5988a60
commit be28ff6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/Branch-TestBed/Branch-SDK-Tests/BNCServerRequestQueueTests.m b/Branch-TestBed/Branch-SDK-Tests/BNCServerRequestQueueTests.m
@@ -209,7 +209,6 @@ - (void)testUUIDANDTimeStampPersistence {
             XCTAssertTrue([timeStampFromEventObject isEqualToNumber:[(BranchEventRequest *)requestObject requestCreationTimeStamp]]);
         }
         if ([requestObject isKindOfClass:BranchOpenRequest.class]) {
-
             XCTAssertTrue([uuidFromOpenObject isEqualToString:[(BranchOpenRequest *)requestObject requestUUID]]);
             XCTAssertTrue([timeStampFromOpenObject isEqualToNumber:[(BranchOpenRequest *)requestObject requestCreationTimeStamp]]);
         }

diff --git a/Sources/BranchSDK/BNCServerRequest.m b/Sources/BranchSDK/BNCServerRequest.m
@@ -14,9 +14,9 @@ @implementation BNCServerRequest
 
 - (id) init {
     if ((self = [super init])) {
-        NSDate *timeStampDate = [NSDate date];
-        _requestUUID = [self generateRequestUUIDFromDate:timeStampDate];
-        _requestCreationTimeStamp = BNCWireFormatFromDate(timeStampDate);
+        NSDate *timeStamp = [NSDate date];
+        _requestUUID = [BNCServerRequest generateRequestUUIDFromDate:timeStamp];
+        _requestCreationTimeStamp = BNCWireFormatFromDate(timeStamp);
     }
     return self;
 }
@@ -53,7 +53,7 @@ + (BOOL)supportsSecureCoding {
     return YES;
 }
 
-- (NSString *) generateRequestUUIDFromDate:(NSDate *) localDate {
++ (NSString *) generateRequestUUIDFromDate:(NSDate *) localDate {
     NSString *uuid = [[NSUUID UUID ] UUIDString];
 
     NSTimeZone *gmt = [NSTimeZone timeZoneWithAbbreviation:@"GMT"];

diff --git a/Sources/BranchSDK/BranchQRCode.m b/Sources/BranchSDK/BranchQRCode.m
@@ -15,6 +15,8 @@
 #import "UIViewController+Branch.h"
 #import "BranchLogger.h"
 #import "BNCServerAPI.h"
+#import "BranchConstants.h"
+#import "BNCEncodingUtils.h"
 
 @interface BranchQRCode()
 @property (nonatomic, copy, readwrite) NSString *buoTitle;
@@ -91,6 +93,10 @@ - (void)getQRCodeAsData:(nullable BranchUniversalObject *)buo
     parameters[@"data"] = [buo dictionary];
     parameters[@"branch_key"] = [Branch branchKey];
 
+    NSDate *timestamp = [NSDate date];
+    parameters[BRANCH_REQUEST_KEY_REQUEST_CREATION_TIME_STAMP] = BNCWireFormatFromDate(timestamp);
+    parameters[BRANCH_REQUEST_KEY_REQUEST_UUID] = [BNCServerRequest generateRequestUUIDFromDate:timestamp];
+
     NSData *cachedQRCode = [[BNCQRCodeCache sharedInstance] checkQRCodeCache:parameters];
     if (cachedQRCode) {
         completion(cachedQRCode, nil);
@@ -136,8 +142,7 @@ - (void)callQRCodeAPI:(nullable NSDictionary *)params
 
     NSData *postData = [NSJSONSerialization dataWithJSONObject:params options:0 error:&error];
     [request setHTTPBody:postData];
-
-    [[BranchLogger shared] logDebug:[NSString stringWithFormat:@"Network start operation %@.", request.URL.absoluteString] error:nil];
+    [[BranchLogger shared] logDebug:[NSString stringWithFormat:@"Network start operation %@.\n Body %@", request.URL.absoluteString, [BNCEncodingUtils prettyPrintJSON:params]] error:nil];
     NSDate *startDate = [NSDate date];
 
     NSURLSessionDataTask *postDataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {

diff --git a/Sources/BranchSDK/Public/BNCServerRequest.h b/Sources/BranchSDK/Public/BNCServerRequest.h
@@ -16,4 +16,5 @@
 - (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key callback:(BNCServerCallback)callback;
 - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error;
 - (void)safeSetValue:(NSObject *)value forKey:(NSString *)key onDict:(NSMutableDictionary *)dict;
++ (NSString *) generateRequestUUIDFromDate:(NSDate *) localDate;
 @end