From 36b9aa7879d3b907c6e48fdd99280884c57b9172 Mon Sep 17 00:00:00 2001 From: Sander Saelmans Date: Mon, 6 Sep 2021 10:36:47 +0200 Subject: [PATCH 1/2] Remove limitation of requests only allowing a dictionary based body. --- MASFoundation/Classes/models/Network/MASRequest.h | 4 ++-- MASFoundation/Classes/models/Network/MASRequest.m | 2 +- MASFoundation/Classes/models/Network/MASRequestBuilder.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MASFoundation/Classes/models/Network/MASRequest.h b/MASFoundation/Classes/models/Network/MASRequest.h index 67d17225..c0dfe7a2 100644 --- a/MASFoundation/Classes/models/Network/MASRequest.h +++ b/MASFoundation/Classes/models/Network/MASRequest.h @@ -61,9 +61,9 @@ /** - NSDictionary of type/value parameters to put into the body of a request. + Object to put into the body of a request. */ -@property (nonatomic, strong, nullable, readonly) NSDictionary *body; +@property (nonatomic, strong, nullable, readonly) id body; /** diff --git a/MASFoundation/Classes/models/Network/MASRequest.m b/MASFoundation/Classes/models/Network/MASRequest.m index 57f1f108..f8d60703 100644 --- a/MASFoundation/Classes/models/Network/MASRequest.m +++ b/MASFoundation/Classes/models/Network/MASRequest.m @@ -16,7 +16,7 @@ @interface MASRequest () @property (nonatomic, readwrite) NSString *httpMethod; @property (nonatomic, readwrite) NSData *privateKey; @property (nonatomic, readwrite) NSDictionary *header; -@property (nonatomic, readwrite) NSDictionary *body; +@property (nonatomic, readwrite) id body; @property (nonatomic, readwrite) NSDictionary *query; @property (assign, readwrite) BOOL isPublic; @property (assign, readwrite) BOOL sign; diff --git a/MASFoundation/Classes/models/Network/MASRequestBuilder.h b/MASFoundation/Classes/models/Network/MASRequestBuilder.h index 2d12f0cf..a1b3eeba 100644 --- a/MASFoundation/Classes/models/Network/MASRequestBuilder.h +++ b/MASFoundation/Classes/models/Network/MASRequestBuilder.h @@ -76,9 +76,9 @@ /** - NSDictionary of type/value parameters to put into the body of a request. + Object to put into the body of a request. */ -@property (nonatomic, strong, nullable) NSDictionary *body; +@property (nonatomic, strong, nullable) id body; /** From 5d0e5d3934f88c35a10361a87e2f4dc6235c47a4 Mon Sep 17 00:00:00 2001 From: Sander Saelmans Date: Mon, 6 Sep 2021 10:46:16 +0200 Subject: [PATCH 2/2] Remove 1 more dictionary constrained body --- .../Classes/_private_/models/Network/MASRequest+MASPrivate.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MASFoundation/Classes/_private_/models/Network/MASRequest+MASPrivate.m b/MASFoundation/Classes/_private_/models/Network/MASRequest+MASPrivate.m index 80289881..25fda0d2 100644 --- a/MASFoundation/Classes/_private_/models/Network/MASRequest+MASPrivate.m +++ b/MASFoundation/Classes/_private_/models/Network/MASRequest+MASPrivate.m @@ -17,7 +17,7 @@ @interface MASRequest () @property (nonatomic, readwrite) NSString *httpMethod; @property (nonatomic, readwrite) NSData *privateKey; @property (nonatomic, readwrite) NSDictionary *header; -@property (nonatomic, readwrite) NSDictionary *body; +@property (nonatomic, readwrite) id body; @property (nonatomic, readwrite) NSDictionary *query; @property (assign, readwrite) BOOL isPublic; @property (assign, readwrite) BOOL sign;