refactor: default rest client support changing id and key

Author: zapcannon87

AVOS/Sources/Foundation/LCApplication.m

@@ -15,16 +15,6 @@
 
 @implementation LCApplication
 
-+ (void)initializePaasClient
-{
-    LCPaasClient *paasClient = [LCPaasClient sharedInstance];
-    
-    paasClient.applicationId = [self getApplicationId];
-    paasClient.clientKey     = [self getClientKey];
-    
-    [paasClient handleAllArchivedRequests];
-}
-
 + (void)setApplicationId:(NSString *)applicationId
                clientKey:(NSString *)clientKey
          serverURLString:(NSString *)serverURLString
@@ -44,11 +34,11 @@ + (void)setApplicationId:(NSString *)applicationId
                         format:@"Server URL not found."] ;
         }
     }
-    
     [[LCApplication defaultApplication] setWithIdentifier:applicationId
                                                       key:clientKey];
-    
-    [self initializePaasClient];
+    LCPaasClient *paasClient = [LCPaasClient sharedInstance];
+    paasClient.application = [LCApplication defaultApplication];
+    [paasClient handleAllArchivedRequests];
 }
 
 + (NSString *)getApplicationId {
@@ -184,8 +174,7 @@ + (void)getServerDateWithBlock:(void (^)(NSDate * _Nullable, NSError * _Nullable
     });
 }
 
-+ (instancetype)defaultApplication
-{
++ (instancetype)defaultApplication {
     static LCApplication *instance;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
@@ -194,23 +183,20 @@ + (instancetype)defaultApplication
     return instance;
 }
 
-- (void)setWithIdentifier:(NSString *)identifier key:(NSString *)key
-{
+- (void)setWithIdentifier:(NSString *)identifier key:(NSString *)key {
     _identifier = [identifier copy];
     _key = [key copy];
 }
 
-- (NSString *)identifierThrowException
-{
+- (NSString *)identifierThrowException {
     if (!self.identifier) {
         [NSException raise:NSInternalInconsistencyException
                     format:@"Application identifier not found."];
     }
     return self.identifier;
 }
 
-- (NSString *)keyThrowException
-{
+- (NSString *)keyThrowException {
     if (!self.key) {
         [NSException raise:NSInternalInconsistencyException
                     format:@"Application key not found."];

AVOS/Sources/Foundation/LCConstants.h

@@ -160,19 +160,18 @@ typedef void (^LCBooleanResultBlock)(BOOL succeeded,  NSError * _Nullable error)
 typedef void (^LCIntegerResultBlock)(NSInteger number, NSError * _Nullable error);
 typedef void (^LCArrayResultBlock)(NSArray * _Nullable objects, NSError * _Nullable error);
 typedef void (^LCObjectResultBlock)(LCObject * _Nullable object, NSError * _Nullable error);
-typedef void (^LCSetResultBlock)(NSSet * _Nullable channels, NSError * _Nullable error);
+typedef void (^LCSetResultBlock)(NSSet * _Nullable set, NSError * _Nullable error);
 typedef void (^LCUserResultBlock)(LCUser * _Nullable user, NSError * _Nullable error);
 typedef void (^LCDataResultBlock)(NSData * _Nullable data, NSError * _Nullable error);
 #if LC_TARGET_OS_OSX
 typedef void (^LCImageResultBlock)(NSImage * _Nullable image, NSError * _Nullable error);
 #else
 typedef void (^LCImageResultBlock)(UIImage * _Nullable image, NSError * _Nullable error);
 #endif
-typedef void (^LCDataStreamResultBlock)(NSInputStream * _Nullable stream, NSError * _Nullable error);
 typedef void (^LCStringResultBlock)(NSString * _Nullable string, NSError * _Nullable error);
 typedef void (^LCIdResultBlock)(id _Nullable object, NSError * _Nullable error);
-typedef void (^LCProgressBlock)(NSInteger percentDone);
+typedef void (^LCProgressBlock)(NSInteger percent);
 typedef void (^LCFileResultBlock)(LCFile * _Nullable file, NSError * _Nullable error);
-typedef void (^LCDictionaryResultBlock)(NSDictionary * _Nullable dict, NSError * _Nullable error);
+typedef void (^LCDictionaryResultBlock)(NSDictionary * _Nullable dictionary, NSError * _Nullable error);
 
 #define LC_WARN_UNUSED_RESULT __attribute__((warn_unused_result))

AVOS/Sources/Foundation/Request/LCPaasClient.h

@@ -11,20 +11,21 @@
 #import "LCACL.h"
 #import "UserAgent.h"
 
-static NSString *const USER_AGENT = @"LeanCloud-Objc-SDK/" SDK_VERSION;
+@class LCApplication;
 
-FOUNDATION_EXPORT NSString *const LCHeaderFieldNameId;
-FOUNDATION_EXPORT NSString *const LCHeaderFieldNameKey;
-FOUNDATION_EXPORT NSString *const LCHeaderFieldNameSign;
-FOUNDATION_EXPORT NSString *const LCHeaderFieldNameSession;
-FOUNDATION_EXPORT NSString *const LCHeaderFieldNameProduction;
+static NSString * const USER_AGENT = @"LeanCloud-Objc-SDK/" SDK_VERSION;
+
+FOUNDATION_EXPORT NSString * const LCHeaderFieldNameId;
+FOUNDATION_EXPORT NSString * const LCHeaderFieldNameKey;
+FOUNDATION_EXPORT NSString * const LCHeaderFieldNameSign;
+FOUNDATION_EXPORT NSString * const LCHeaderFieldNameSession;
+FOUNDATION_EXPORT NSString * const LCHeaderFieldNameProduction;
 
 @interface LCPaasClient : NSObject
 
-+(LCPaasClient *)sharedInstance;
++ (LCPaasClient *)sharedInstance;
 
-@property (nonatomic, readwrite, copy) NSString * applicationId;
-@property (nonatomic, readwrite, copy) NSString * clientKey;
+@property (nonatomic) LCApplication *application;
 @property (nonatomic, readonly, copy) NSString * apiVersion;
 @property (nonatomic, readwrite, copy) NSString * applicationIdField;
 @property (nonatomic, readwrite, copy) NSString * applicationKeyField;

AVOS/Sources/Foundation/Request/LCPaasClient.m

@@ -20,6 +20,7 @@
 #import "LCObjectUtils.h"
 #import "LCRouter_Internal.h"
 #import "LCConstants.h"
+#import "LCApplication_Internal.h"
 
 static NSString * const kLC_code = @"code";
 static NSString * const kLC_error = @"error";
@@ -195,10 +196,10 @@ -(void)clearLastModifyCache {
 }
 
 - (NSString *)signatureHeaderFieldValue {
-    NSString *timestamp=[NSString stringWithFormat:@"%.0f",1000*[[NSDate date] timeIntervalSince1970]];
-    NSString *sign=[[[NSString stringWithFormat:@"%@%@",timestamp,self.clientKey] LCMD5String] lowercaseString];
-    NSString *headerValue=[NSString stringWithFormat:@"%@,%@",sign,timestamp];
-    
+    NSString *key = [self.application keyThrowException];
+    NSString *timestamp = [NSString stringWithFormat:@"%.0f", 1000 * [[NSDate date] timeIntervalSince1970]];
+    NSString *sign = [[[NSString stringWithFormat:@"%@%@", timestamp, key] LCMD5String] lowercaseString];
+    NSString *headerValue = [NSString stringWithFormat:@"%@,%@", sign, timestamp];
     return headerValue;
 }
 
@@ -245,10 +246,11 @@ - (NSMutableURLRequest *)requestWithPath:(NSString *)path
     }
 
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
+    NSString *appID = [self.application identifierThrowException];
 
     [request setHTTPMethod:method];
     [request setTimeoutInterval:self.timeoutInterval];
-    [request setValue:self.applicationId forHTTPHeaderField:LCHeaderFieldNameId];
+    [request setValue:appID forHTTPHeaderField:LCHeaderFieldNameId];
     [request setValue:[self signatureHeaderFieldValue] forHTTPHeaderField:LCHeaderFieldNameSign];
     [request setValue:self.productionMode ? @"1": @"0" forHTTPHeaderField:LCHeaderFieldNameProduction];
     [request setValue:USER_AGENT forHTTPHeaderField:@"User-Agent"];
@@ -257,7 +259,6 @@ - (NSMutableURLRequest *)requestWithPath:(NSString *)path
     [request setValue:@"gzip" forHTTPHeaderField:@"Accept-Encoding"];
 
     NSString *sessionToken = self.currentUser.sessionToken;
-    
     if (sessionToken) {
         [request setValue:sessionToken forHTTPHeaderField:LCHeaderFieldNameSession];
     }