fix: Parse.setServer does not set new server URL (#1708)

Author: mtrezza

Parse/Parse/Internal/PFInternalUtils.h

@@ -19,9 +19,6 @@
 
 @interface PFInternalUtils : NSObject
 
-+ (NSString *)parseServerURLString;
-+ (void)setParseServer:(NSString *)server;
-
 /**
  Clears system time zone cache, gets the name of the time zone
  and caches it. This method is completely thread-safe.

Parse/Parse/Internal/PFInternalUtils.m

@@ -40,27 +40,8 @@
 #import "PFProduct.h"
 #endif
 
-static NSString *parseServer_;
-
 @implementation PFInternalUtils
 
-+ (void)initialize {
-    if (self == [PFInternalUtils class]) {
-        [self setParseServer:_ParseDefaultServerURLString];
-    }
-}
-
-+ (NSString *)parseServerURLString {
-    return parseServer_;
-}
-
-// Useful for testing.
-// Beware of race conditions if you call setParseServer while something else may be using
-// httpClient.
-+ (void)setParseServer:(NSString *)server {
-    parseServer_ = [server copy];
-}
-
 + (NSString *)currentSystemTimeZoneName {
     static NSLock *methodLock;
     static dispatch_once_t onceToken;

Parse/Parse/Source/Parse.h

@@ -107,11 +107,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, nullable, readonly, class) ParseClientConfiguration *currentConfiguration;
 
 /**
- Sets the server URL to connect to Parse Server. The local client cache is not cleared.
- @discussion This can be used to update the server URL after this client has been initialized, without having to destroy this client. An example use case is
- server connection failover, where the clients connects to another URL if the server becomes unreachable at the current URL.
- @warning The new server URL must point to a Parse Server that connects to the same database. Otherwise, issues may arise
- related to locally cached data or delayed methods such as saveEventually.
+ Sets the server URL to connect to Parse Server.
+ @discussion This can be used to update the server URL after the client was initialized. An example use case is server
+ connection failover, where the client connects to another URL if the server becomes unreachable at the current URL. The
+ client will be re-initialized maintaining the same configuration. Any pending requests will still be made against the previous
+ server URL that was set at the time the request was queued.
+ @warning The new server URL must point to a Parse Server that connects to the same database. Otherwise, issues may
+ arise related to locally cached data or delayed methods such as saveEventually.
  @param server  The server URL to set.
  */
 + (void)setServer:(nonnull NSString *)server;

Parse/Parse/Source/Parse.m

@@ -59,7 +59,6 @@ + (void)setApplicationId:(NSString *)applicationId clientKey:(NSString *)clientK
     PFParameterAssert(clientKey.length, @"`clientKey` should not be nil.");
     currentParseConfiguration_.applicationId = applicationId;
     currentParseConfiguration_.clientKey = clientKey;
-    currentParseConfiguration_.server = [PFInternalUtils parseServerURLString]; // TODO: (nlutsenko) Clean this up after tests are updated.
 
     [self initializeWithConfiguration:currentParseConfiguration_];
 
@@ -69,13 +68,17 @@ + (void)setApplicationId:(NSString *)applicationId clientKey:(NSString *)clientK
 }
 
 + (void)initializeWithConfiguration:(ParseClientConfiguration *)configuration {
+    PFConsistencyAssert(![self currentConfiguration], @"Parse is already initialized.");
+    [self initializeWithConfigurationAllowingReinitialize:configuration];
+}
+
++ (void)initializeWithConfigurationAllowingReinitialize:(ParseClientConfiguration *)configuration {
     PFConsistencyAssert(configuration.applicationId.length != 0,
                         @"You must set your configuration's `applicationId` before calling %s!", __PRETTY_FUNCTION__);
     PFConsistencyAssert(![PFApplication currentApplication].extensionEnvironment ||
                         configuration.applicationGroupIdentifier == nil ||
                         configuration.containingApplicationBundleIdentifier != nil,
                         @"'containingApplicationBundleIdentifier' must be non-nil in extension environment");
-    PFConsistencyAssert(![self currentConfiguration], @"Parse is already initialized.");
 
     ParseManager *manager = [[ParseManager alloc] initWithConfiguration:configuration];
     [manager startManaging];
@@ -94,11 +97,15 @@ + (void)initializeWithConfiguration:(ParseClientConfiguration *)configuration {
                                                             object:nil];
         return nil;
     }];
-    
 }
 
 + (void)setServer:(nonnull NSString *)server {
-    [PFInternalUtils setParseServer:server];
+    // Use current config with new server
+    ParseClientConfiguration *config = currentParseManager_ ? currentParseManager_.configuration : currentParseConfiguration_;
+    config.server = server;
+    
+    // Re-initialize SDK
+    [self initializeWithConfigurationAllowingReinitialize:config];
 }
 
 + (nullable ParseClientConfiguration *)currentConfiguration {
@@ -126,7 +133,9 @@ + (nullable NSString *)getClientKey {
 }
 
 + (nullable NSString *)server {
-    return [[PFInternalUtils parseServerURLString] copy];
+    ParseClientConfiguration *config = currentParseManager_ ? currentParseManager_.configuration
+                                                            : currentParseConfiguration_;
+    return currentParseManager_.configuration.server;
 }
 
 ///--------------------------------------