Merge pull request #165 from Microsoft/dynamic_key

[CodePush setDeploymentKey] method

Author: lostintangent

CodePush.h

@@ -12,7 +12,7 @@
  * This method assumes that your JS bundle is named "main.jsbundle"
  * and therefore, if it isn't, you should use either the bundleURLForResource:
  * or bundleURLForResource:withExtension: methods to override that behavior.
-*/
+ */
 + (NSURL *)bundleURL;
 
 + (NSURL *)bundleURLForResource:(NSString *)resourceName;
@@ -22,6 +22,13 @@
 
 + (NSString *)getApplicationSupportDirectory;
 
+/*
+ * This methods allows dynamically setting the app's
+ * deployment key, in addition to setting it via
+ * the Info.plist file's CodePushDeploymentKey setting.
+ */
++ (void)setDeploymentKey:(NSString *)deploymentKey;
+
 // The below methods are only used during tests.
 + (BOOL)isUsingTestConfiguration;
 + (void)setUsingTestConfiguration:(BOOL)shouldUseTestConfiguration;
@@ -62,7 +69,7 @@ failCallback:(void (^)(NSError *err))failCallback;
 @interface CodePushPackage : NSObject
 
 + (void)installPackage:(NSDictionary *)updatePackage
-               error:(NSError **)error;
+                 error:(NSError **)error;
 
 + (NSDictionary *)getCurrentPackage:(NSError **)error;
 + (NSString *)getCurrentPackageFolderPath:(NSError **)error;

CodePush.m

@@ -13,6 +13,8 @@ @implementation CodePush {
 
 RCT_EXPORT_MODULE()
 
+#pragma mark - Private constants
+
 static BOOL needToReportRollback = NO;
 static BOOL isRunningBinaryVersion = NO;
 static BOOL testConfigurationFlag = NO;
@@ -38,9 +40,8 @@ @implementation CodePush {
 static NSString *const PackageHashKey = @"packageHash";
 static NSString *const PackageIsPendingKey = @"isPending";
 
-@synthesize bridge = _bridge;
+#pragma mark - Public Obj-C API
 
-// Public Obj-C API (see header for method comments)
 + (NSURL *)bundleURL
 {
     return [self bundleURLForResource:@"main"];
@@ -91,7 +92,7 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
 #ifndef DEBUG
         [CodePush clearUpdates];
 #endif
-
+        
         NSLog(logMessageFormat, binaryJsBundleUrl);
         isRunningBinaryVersion = YES;
         return binaryJsBundleUrl;
@@ -113,7 +114,12 @@ + (BOOL)isUsingTestConfiguration
     return testConfigurationFlag;
 }
 
-/* 
++ (void)setDeploymentKey:(NSString *)deploymentKey
+{
+    [CodePushConfig current].deploymentKey = deploymentKey;
+}
+
+/*
  * This is used to enable an environment in which tests can be run.
  * Specifically, it flips a boolean flag that causes bundles to be
  * saved to a test folder and enables the ability to modify
@@ -134,8 +140,9 @@ + (void)clearUpdates
     [self removeFailedUpdates];
 }
 
+#pragma mark - Private API methods
 
-// Private API methods
+@synthesize bridge = _bridge;
 
 /*
  * This method is used by the React Native bridge to allow
@@ -147,10 +154,10 @@ - (NSDictionary *)constantsToExport
 {
     // Export the values of the CodePushInstallMode enum
     // so that the script-side can easily stay in sync
-    return @{ 
-              @"codePushInstallModeOnNextRestart":@(CodePushInstallModeOnNextRestart),
-              @"codePushInstallModeImmediate": @(CodePushInstallModeImmediate),
-              @"codePushInstallModeOnNextResume": @(CodePushInstallModeOnNextResume)
+    return @{
+             @"codePushInstallModeOnNextRestart":@(CodePushInstallModeOnNextRestart),
+             @"codePushInstallModeImmediate": @(CodePushInstallModeImmediate),
+             @"codePushInstallModeOnNextResume": @(CodePushInstallModeOnNextResume)
             };
 };
 
@@ -257,7 +264,7 @@ - (BOOL)isPendingUpdate:(NSString*)packageHash
 {
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSDictionary *pendingUpdate = [preferences objectForKey:PendingUpdateKey];
-
+    
     // If there is a pending update whose "state" isn't loading, then we consider it "pending".
     // Additionally, if a specific hash was provided, we ensure it matches that of the pending update.
     BOOL updateIsPending = pendingUpdate &&
@@ -380,7 +387,7 @@ - (void)savePendingUpdate:(NSString *)packageHash
     [preferences synchronize];
 }
 
-// JavaScript-exported module methods
+#pragma mark - JavaScript-exported module methods
 
 /*
  * This is native-side of the RemotePackage.download method
@@ -404,11 +411,11 @@ - (void)savePendingUpdate:(NSString *)packageHash
         doneCallback:^{
             NSError *err;
             NSDictionary *newPackage = [CodePushPackage getPackage:updatePackage[PackageHashKey] error:&err];
-                
+            
             if (err) {
                 return reject(err);
             }
-                
+            
             resolve(newPackage);
         }
         // The download failed
@@ -447,7 +454,7 @@ - (void)savePendingUpdate:(NSString *)packageHash
         // the script-side doesn't need to immediately call back into native to populate it.
         BOOL isPendingUpdate = [self isPendingUpdate:[package objectForKey:PackageHashKey]];
         [package setObject:@(isPendingUpdate) forKey:PackageIsPendingKey];
-
+        
         resolve(package);
     });
 }
@@ -527,7 +534,7 @@ - (void)savePendingUpdate:(NSString *)packageHash
 }
 
 /*
- * This method is checks if a new status update exists (new version was installed, 
+ * This method is checks if a new status update exists (new version was installed,
  * or an update failed) and return its details (version label, status).
  */
 RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve
@@ -589,7 +596,7 @@ - (void)savePendingUpdate:(NSString *)packageHash
 /*
  * This method is the native side of the CodePush.downloadAndReplaceCurrentBundle()
  * method, which replaces the current bundle with the one downloaded from
- * removeBundleUrl. It is only to be used during tests and no-ops if the test 
+ * removeBundleUrl. It is only to be used during tests and no-ops if the test
  * configuration flag is not set.
  */
 RCT_EXPORT_METHOD(downloadAndReplaceCurrentBundle:(NSString *)remoteBundleUrl)
@@ -599,4 +606,4 @@ - (void)savePendingUpdate:(NSString *)packageHash
     }
 }
 
-@end
+@end