Switch config info to LPAPIConfig (#197)

e7mac · web-flow · commit 74d3225b3067 · 2018-08-28T23:20:28.000-07:00
diff --git a/Example/Tests/Classes/Utilities/LeanplumHelper.m b/Example/Tests/Classes/Utilities/LeanplumHelper.m
@@ -35,6 +35,7 @@
 #import "LeanplumReachability+Category.h"
 #import "LPNetworkEngine+Category.h"
 #import "LPNetworkOperation+Category.h"
+#import "LPAPIConfig.h"
 
 NSString *APPLICATION_ID = @"app_nLiaLr3lXvCjXhsztS1Gw8j281cPLO6sZetTDxYnaSk";
 NSString *DEVELOPMENT_KEY = @"dev_2bbeWLmVJyNrqI8F21Kn9nqyUPRkVCUoLddBkHEyzmk";
@@ -123,9 +124,9 @@ + (void)clean_up {
     [[LPVarCache sharedCache] reset];
     [[LPVarCache sharedCache] initialize];
     [LPActionManager reset];
-    [LeanplumRequest setDeviceId:nil];
-    [LeanplumRequest setUserId:nil];
-    [LeanplumRequest setToken:nil];
+    [[LPAPIConfig sharedConfig] setDeviceId:nil];
+    [[LPAPIConfig sharedConfig] setUserId:nil];
+    [[LPAPIConfig sharedConfig] setToken:nil];
     [LeanplumRequest reset];
     [LeanplumHelper reset_user_defaults];
     [[LeanplumRequest sendNowQueue] cancelAllOperations];
diff --git a/Leanplum-SDK/Classes/Features/Actions/LPActionManager.m b/Leanplum-SDK/Classes/Features/Actions/LPActionManager.m
@@ -34,6 +34,8 @@
 #import "LeanplumRequest.h"
 #import "LPMessageTemplates.h"
 #import "LPRequestFactory.h"
+#import "LPRequestManager.h"
+#import "LPAPIConfig.h"
 
 #import <objc/runtime.h>
 #import <objc/message.h>
@@ -106,7 +108,7 @@ - (NSString *)leanplum_createUserNotificationSettingsKey
 {
     return [NSString stringWithFormat:
             LEANPLUM_DEFAULTS_USER_NOTIFICATION_SETTINGS_KEY,
-            LeanplumRequest.appId, LeanplumRequest.userId, LeanplumRequest.deviceId];
+            [LPAPIConfig sharedConfig].appId, [LPAPIConfig sharedConfig].userId, [LPAPIConfig sharedConfig].deviceId];
 }
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000 && LP_NOT_TV
diff --git a/Leanplum-SDK/Classes/Features/Variables/LPVarCache.m b/Leanplum-SDK/Classes/Features/Variables/LPVarCache.m
@@ -34,6 +34,8 @@
 #import "Leanplum_SocketIO.h"
 #import "Utils.h"
 #import "LPRequestFactory.h"
+#import "LPRequestManager.h"
+#import "LPAPIConfig.h"
 
 @interface LPVarCache()
 @property (strong, nonatomic) NSRegularExpression *varNameRegex;
@@ -391,10 +393,10 @@ - (void)loadDiffs
             BOOL loggingEnabled = [archiver decodeBoolForKey:LP_KEY_LOGGING_ENABLED];
 
             if (deviceId) {
-                [LeanplumRequest setDeviceId:deviceId];
+                [[LPAPIConfig sharedConfig] setDeviceId:deviceId];
             }
             if (userId) {
-                [LeanplumRequest setUserId:userId];
+                [[LPAPIConfig sharedConfig] setUserId:userId];
             }
             if (loggingEnabled) {
                 [LPConstantsState sharedState].loggingEnabled = YES;
@@ -432,8 +434,8 @@ - (void)saveDiffs
         [archiver encodeObject:self.variantDebugInfo forKey:LP_KEY_VARIANT_DEBUG_INFO];
         [archiver encodeObject:self.regions forKey:LP_KEY_REGIONS];
         [archiver encodeObject:[LPConstantsState sharedState].sdkVersion forKey:LP_PARAM_SDK_VERSION];
-        [archiver encodeObject:LeanplumRequest.deviceId forKey:LP_PARAM_DEVICE_ID];
-        [archiver encodeObject:LeanplumRequest.userId forKey:LP_PARAM_USER_ID];
+        [archiver encodeObject:[LPAPIConfig sharedConfig].deviceId forKey:LP_PARAM_DEVICE_ID];
+        [archiver encodeObject:[LPAPIConfig sharedConfig].userId forKey:LP_PARAM_USER_ID];
         [archiver encodeBool:[LPConstantsState sharedState].loggingEnabled forKey:LP_KEY_LOGGING_ENABLED];
         [archiver finishEncoding];
 
@@ -748,7 +750,7 @@ - (NSMutableDictionary *)userAttributes
 {
     if (!_userAttributes) {
         @try {
-            NSString *token = [LeanplumRequest token];
+            NSString *token = [[LPAPIConfig sharedConfig] token];
             if (token) {
                 NSData *encryptedValue = [[NSUserDefaults standardUserDefaults] dataForKey:LEANPLUM_DEFAULTS_ATTRIBUTES_KEY];
                 if (encryptedValue) {
diff --git a/Leanplum-SDK/Classes/Internal/Leanplum.m b/Leanplum-SDK/Classes/Internal/Leanplum.m
@@ -46,6 +46,8 @@
 #import "LPAppIconManager.h"
 #import "LPUIEditorWrapper.h"
 #import "LPRequestFactory.h"
+#import "LPRequestManager.h"
+#import "LPAPIConfig.h"
 
 static NSString *leanplum_deviceId = nil;
 static NSString *registrationEmail = nil;
@@ -255,7 +257,8 @@ + (void)setAppId:(NSString *)appId withDevelopmentKey:(NSString *)accessKey
 
     LP_TRY
     [LPConstantsState sharedState].isDevelopmentModeEnabled = YES;
-    [LeanplumRequest setAppId:appId withAccessKey:accessKey];
+    [[LPAPIConfig sharedConfig] setAppId:appId withAccessKey:accessKey];
+    [LeanplumRequest initializeStaticVars];
     LP_END_TRY
 }
 
@@ -280,7 +283,8 @@ + (void)setAppId:(NSString *)appId withProductionKey:(NSString *)accessKey
 
     LP_TRY
     [LPConstantsState sharedState].isDevelopmentModeEnabled = NO;
-    [LeanplumRequest setAppId:appId withAccessKey:accessKey];
+    [[LPAPIConfig sharedConfig] setAppId:appId withAccessKey:accessKey];
+    [LeanplumRequest initializeStaticVars];
     LP_END_TRY
 }
 
@@ -374,7 +378,7 @@ + (void)synchronizeDefaults
 + (NSString *)pushTokenKey
 {
     return [NSString stringWithFormat: LEANPLUM_DEFAULTS_PUSH_TOKEN_KEY,
-            LeanplumRequest.appId, LeanplumRequest.userId, LeanplumRequest.deviceId];
+            [LPAPIConfig sharedConfig].appId, [LPAPIConfig sharedConfig].userId, [LPAPIConfig sharedConfig].deviceId];
 }
 
 + (void)start
@@ -669,7 +673,7 @@ + (void)startWithUserId:(NSString *)userId
          userAttributes:(NSDictionary *)attributes
         responseHandler:(LeanplumStartBlock)startResponse
 {
-    if ([LeanplumRequest appId] == nil) {
+    if ([LPAPIConfig sharedConfig].appId == nil) {
         [self throwError:@"Please provide your app ID using one of the [Leanplum setAppId:] "
          @"methods."];
         return;
@@ -732,7 +736,7 @@ + (void)startWithUserId:(NSString *)userId
     });
     state.actionManager = [LPActionManager sharedManager];
 
-    [LeanplumRequest loadToken];
+    [[LPAPIConfig sharedConfig] loadToken];
     [[LPVarCache sharedCache] setSilent:YES];
     [[LPVarCache sharedCache] loadDiffs];
     [[LPVarCache sharedCache] setSilent:NO];
@@ -757,7 +761,7 @@ + (void)startWithUserId:(NSString *)userId
     }];
 
     // Set device ID.
-    NSString *deviceId = [LeanplumRequest deviceId];
+    NSString *deviceId = [LPAPIConfig sharedConfig].deviceId;
     // This is the device ID set when the MAC address is used on iOS 7.
     // This is to allow apps who upgrade to the new ID to forget the old one.
     if ([deviceId isEqualToString:@"0f607264fc6318a92b9e13c65db7cd3c"]) {
@@ -776,17 +780,17 @@ + (void)startWithUserId:(NSString *)userId
         if (!deviceId) {
             deviceId = [[UIDevice currentDevice] leanplum_uniqueGlobalDeviceIdentifier];
         }
-        [LeanplumRequest setDeviceId:deviceId];
+        [[LPAPIConfig sharedConfig] setDeviceId:deviceId];
     }
 
     // Set user ID.
     if (!userId) {
-        userId = [LeanplumRequest userId];
+        userId = [LPAPIConfig sharedConfig].userId;
         if (!userId) {
-            userId = [LeanplumRequest deviceId];
+            userId = [LPAPIConfig sharedConfig].deviceId;
         }
     }
-    [LeanplumRequest setUserId:userId];
+    [[LPAPIConfig sharedConfig] setUserId:userId];
 
     // Setup parameters.
     NSString *versionName = [LPInternalState sharedState].appVersion;
@@ -875,8 +879,8 @@ + (void)startWithUserId:(NSString *)userId
         NSDictionary *variantDebugInfo = [self parseVariantDebugInfoFromResponse:response];
         [[LPVarCache sharedCache] setVariantDebugInfo:variantDebugInfo];
 
-        [LeanplumRequest setToken:token];
-        [LeanplumRequest saveToken];
+        [[LPAPIConfig sharedConfig] setToken:token];
+        [[LPAPIConfig sharedConfig] saveToken];
         [[LPVarCache sharedCache] applyVariableDiffs:values
                               messages:messages
                            updateRules:updateRules
@@ -930,8 +934,8 @@ + (void)startWithUserId:(NSString *)userId
             [[LPVarCache sharedCache] setDevModeValuesFromServer:valuesFromCode
                                     fileAttributes:fileAttributes
                                  actionDefinitions:actionDefinitions];
-            [[LeanplumSocket sharedSocket] connectToAppId:LeanplumRequest.appId
-                                                 deviceId:LeanplumRequest.deviceId];
+            [[LeanplumSocket sharedSocket] connectToAppId:[LPAPIConfig sharedConfig].appId
+                                                 deviceId:[LPAPIConfig sharedConfig].deviceId];
             if ([response[LP_KEY_IS_REGISTERED] boolValue]) {
                 [Leanplum onHasStartedAndRegisteredAsDeveloper];
             }
@@ -2044,7 +2048,7 @@ + (void)setUserIdInternal:(NSString *)userId withAttributes:(NSDictionary *)attr
     [req send];
 
     if (userId.length) {
-        [LeanplumRequest setUserId:userId];
+        [[LPAPIConfig sharedConfig] setUserId:userId];
         if ([LPInternalState sharedState].hasStarted) {
             [[LPVarCache sharedCache] saveDiffs];
         }
@@ -2441,7 +2445,7 @@ + (NSString *)deviceId
         [self throwError:@"[Leanplum start] must be called before calling deviceId"];
         return nil;
     }
-    return [LeanplumRequest deviceId];
+    return [LPAPIConfig sharedConfig].deviceId;
     LP_END_TRY
     return nil;
 }
@@ -2453,7 +2457,7 @@ + (NSString *)userId
         [self throwError:@"[Leanplum start] must be called before calling userId"];
         return nil;
     }
-    return [LeanplumRequest userId];
+    return [LPAPIConfig sharedConfig].userId;
     LP_END_TRY
     return nil;
 }
diff --git a/Leanplum-SDK/Classes/Managers/Networking/LPAPIConfig.h b/Leanplum-SDK/Classes/Managers/Networking/LPAPIConfig.h
@@ -0,0 +1,27 @@
+//
+//  LPAPIConfig.h
+//  Leanplum-iOS-SDK-source
+//
+//  Created by Mayank Sanganeria on 8/25/18.
+//
+
+#import <Foundation/Foundation.h>
+#import "LPRequesting.h"
+
+@interface LPAPIConfig : NSObject
+
+@property (nonatomic, readonly) NSString *appId;
+@property (nonatomic, readonly) NSString *accessKey;
+
+@property (nonatomic, strong) NSString *deviceId;
+@property (nonatomic, strong) NSString *userId;
+@property (nonatomic, strong) NSString *token;
+
++ (instancetype)sharedConfig;
+
+- (void)setAppId:(NSString *)appId withAccessKey:(NSString *)accessKey;
+
+- (void)loadToken;
+- (void)saveToken;
+
+@end
diff --git a/Leanplum-SDK/Classes/Managers/Networking/LPAPIConfig.m b/Leanplum-SDK/Classes/Managers/Networking/LPAPIConfig.m
@@ -0,0 +1,64 @@
+//
+//  LPAPIConfig.m
+//  Leanplum-iOS-SDK-source
+//
+//  Created by Mayank Sanganeria on 8/25/18.
+//
+
+#import "LPAPIConfig.h"
+#import "LeanplumInternal.h"
+#import "LPResponse.h"
+#import "LPKeychainWrapper.h"
+#import "LPEventDataManager.h"
+#import "LPEventCallbackManager.h"
+
+@interface LPAPIConfig()
+
+@property (nonatomic, strong) NSString *appId;
+@property (nonatomic, strong) NSString *accessKey;
+
+@end
+
+
+@implementation LPAPIConfig
+
++ (instancetype)sharedConfig {
+    static LPAPIConfig *sharedConfig = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedConfig = [[self alloc] init];
+        sharedConfig.token = nil;
+    });
+    return sharedConfig;
+}
+
+- (void)setAppId:(NSString *)appId withAccessKey:(NSString *)accessKey
+{
+    self.appId = appId;
+    self.accessKey = accessKey;
+}
+
+- (void)loadToken
+{
+    NSError *err;
+    NSString *token_ = [LPKeychainWrapper getPasswordForUsername:LP_KEYCHAIN_USERNAME
+                                                  andServiceName:LP_KEYCHAIN_SERVICE_NAME
+                                                           error:&err];
+    if (!token_) {
+        return;
+    }
+
+    [self setToken:token_];
+}
+
+- (void)saveToken
+{
+    NSError *err;
+    [LPKeychainWrapper storeUsername:LP_KEYCHAIN_USERNAME
+                         andPassword:[self token]
+                      forServiceName:LP_KEYCHAIN_SERVICE_NAME
+                      updateExisting:YES
+                               error:&err];
+}
+
+@end
diff --git a/Leanplum-SDK/Classes/Managers/Networking/LeanplumRequest.h b/Leanplum-SDK/Classes/Managers/Networking/LeanplumRequest.h
@@ -37,20 +37,9 @@
     BOOL _sent;
 }
 
-+ (void)setAppId:(NSString *)appId withAccessKey:(NSString *)accessKey;
-+ (void)setDeviceId:(NSString *)deviceId;
-+ (void)setUserId:(NSString *)userId;
++ (void)initializeStaticVars;
 + (void)setUploadUrl:(NSString *)url;
 
-+ (NSString *)deviceId;
-+ (NSString *)userId;
-+ (void)setToken:(NSString *)token;
-+ (void)loadToken;
-+ (void)saveToken;
-
-+ (NSString *)appId;
-+ (NSString *)token;
-
 - (void)attachApiKeys:(NSMutableDictionary *)dict;
 
 - (id)initWithHttpMethod:(NSString *)httpMethod apiMethod:(NSString *)apiMethod
diff --git a/Leanplum-SDK/Classes/Managers/Networking/LeanplumRequest.m b/Leanplum-SDK/Classes/Managers/Networking/LeanplumRequest.m
diff --git a/Leanplum-SDK/Classes/Managers/Networking/LeanplumSocket.m b/Leanplum-SDK/Classes/Managers/Networking/LeanplumSocket.m
diff --git a/Leanplum-SDK/Classes/Utilities/Encryption/LPAES.m b/Leanplum-SDK/Classes/Utilities/Encryption/LPAES.m
