add wrapper agents to -first and -next of -request's return value

TODO test
ably · Jan 15, 2025 · 8b94864 · 8b94864
1 parent 132d0bc
commit 8b94864
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Source/ARTHTTPPaginatedResponse.m b/Source/ARTHTTPPaginatedResponse.m
@@ -20,10 +20,12 @@ - (instancetype)initWithResponse:(NSHTTPURLResponse *)response
                       relCurrent:(NSMutableURLRequest *)relCurrent
                          relNext:(NSMutableURLRequest *)relNext
                responseProcessor:(ARTPaginatedResultResponseProcessor)responseProcessor
+                wrapperSDKAgents:(nullable NSDictionary<NSString *,NSString *> *)wrapperSDKAgents
                           logger:(ARTInternalLog *)logger {
     self = [super initWithItems:items rest:rest relFirst:relFirst relCurrent:relCurrent relNext:relNext responseProcessor:responseProcessor logger:logger];
     if (self) {
         _response = response;
+        _wrapperSDKAgents = [wrapperSDKAgents copy];
     }
     return self;
 }
@@ -60,7 +62,7 @@ - (void)first:(ARTHTTPPaginatedCallback)callback {
         };
     }
 
-    [self.class executePaginated:self.rest withRequest:self.relFirst wrapperSDKAgents:nil logger:self.logger callback:callback];
+    [self.class executePaginated:self.rest withRequest:self.relFirst wrapperSDKAgents:self.wrapperSDKAgents logger:self.logger callback:callback];
 }
 
 - (void)next:(ARTHTTPPaginatedCallback)callback {
@@ -81,7 +83,7 @@ - (void)next:(ARTHTTPPaginatedCallback)callback {
         return;
     }
 
-    [self.class executePaginated:self.rest withRequest:self.relNext wrapperSDKAgents:nil logger:self.logger callback:callback];
+    [self.class executePaginated:self.rest withRequest:self.relNext wrapperSDKAgents:self.wrapperSDKAgents logger:self.logger callback:callback];
 }
 
 + (void)executePaginated:(ARTRestInternal *)rest
@@ -119,7 +121,7 @@ + (void)executePaginated:(ARTRestInternal *)rest
         NSMutableURLRequest *currentRel = [NSMutableURLRequest requestWithPath:links[@"current"] relativeTo:request];
         NSMutableURLRequest *nextRel = [NSMutableURLRequest requestWithPath:links[@"next"] relativeTo:request];
 
-        ARTHTTPPaginatedResponse *result = [[ARTHTTPPaginatedResponse alloc] initWithResponse:response items:items rest:rest relFirst:firstRel relCurrent:currentRel relNext:nextRel responseProcessor:responseProcessor logger:logger];
+        ARTHTTPPaginatedResponse *result = [[ARTHTTPPaginatedResponse alloc] initWithResponse:response items:items rest:rest relFirst:firstRel relCurrent:currentRel relNext:nextRel responseProcessor:responseProcessor wrapperSDKAgents:wrapperSDKAgents logger:logger];
 
         callback(result, nil);
     }];

diff --git a/Source/PrivateHeaders/Ably/ARTHTTPPaginatedResponse+Private.h b/Source/PrivateHeaders/Ably/ARTHTTPPaginatedResponse+Private.h
@@ -9,6 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface ARTHTTPPaginatedResponse ()
 
 @property (nonatomic) NSHTTPURLResponse *response;
+@property (nullable, nonatomic, readonly) NSDictionary<NSString *, NSString *> *wrapperSDKAgents;
 
 - (instancetype)initWithResponse:(NSHTTPURLResponse *)response
                            items:(NSArray *)items
@@ -17,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
                       relCurrent:(NSMutableURLRequest *)relCurrent
                          relNext:(NSMutableURLRequest *)relNext
                responseProcessor:(ARTPaginatedResultResponseProcessor)responseProcessor
+                wrapperSDKAgents:(nullable NSDictionary<NSString *, NSString *> *)wrapperSDKAgents
                           logger:(ARTInternalLog *)logger;
 
 + (void)executePaginated:(ARTRestInternal *)rest