Expose DBRoute host as an enum

Author: Qiming Yuan

Source/ObjectiveDropboxOfficial/Shared/Handwritten/Networking/DBTransportBaseClient.m

@@ -13,6 +13,7 @@
 #import "DBStoneBase.h"
 #import "DBTransportBaseClient.h"
 #import "DBTransportBaseConfig.h"
+#import "DBTransportBaseHostnameConfig.h"
 
 #pragma mark - Internal serialization helpers
 
@@ -130,7 +131,7 @@ + (NSMutableURLRequest *)requestWithHeaders:(NSDictionary *)httpHeaders
 }
 
 - (NSURL *)urlWithRoute:(DBRoute *)route {
-  NSString *routePrefix = [_hostnameConfig apiV2PrefixWithRouteType:route.attrs[@"host"]];
+  NSString *routePrefix = [_hostnameConfig apiV2PrefixWithRoute:route];
   return [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@/%@", routePrefix, route.namespace_, route.name]];
 }
 

Source/ObjectiveDropboxOfficial/Shared/Handwritten/Networking/DBTransportBaseHostnameConfig.h

@@ -3,9 +3,25 @@
 ///
 
 #import <Foundation/Foundation.h>
+#import "DBStoneBase.h"
+
+/// Enum of Dropbox API hosts.
+typedef NS_ENUM(NSUInteger, DBRouteHost) {
+    DBRouteHostUnknown = 0,
+    DBRouteHostApi,
+    DBRouteHostContent,
+    DBRouteHostNotify,
+};
 
 NS_ASSUME_NONNULL_BEGIN
 
+@interface DBRoute (DropboxHost)
+
+/// @return which host this route points to
+@property (nonatomic, readonly) DBRouteHost host;
+
+@end
+
 ///
 /// Configuration class that defines the different hostnames that the Dropbox SDK uses
 ///
@@ -38,12 +54,12 @@ NS_ASSUME_NONNULL_BEGIN
 ///
 /// Returns the prefix to use for API calls to the given route type.
 ///
-/// @param routeType the type of route to get a prefix for.
-/// Currently the valid values are: "api", "content", and "notify".
+/// @param route the type of route to get a prefix for.
+/// Currently the valid hosts are: "api", "content", and "notify".
 ///
 /// @return An absolute URL prefix, typically "https://<hostname>/2" or nil if an invalid route type is provided.
 ///
-- (nullable NSString *)apiV2PrefixWithRouteType:(NSString *)routeType;
+- (nullable NSString *)apiV2PrefixWithRoute:(DBRoute *)route;
 
 @end
 

Source/ObjectiveDropboxOfficial/Shared/Handwritten/Networking/DBTransportBaseHostnameConfig.m

@@ -4,6 +4,25 @@
 
 #import "DBTransportBaseHostnameConfig.h"
 #import "DBSDKConstants.h"
+#import "DBStoneBase.h"
+
+@implementation DBRoute (DropboxHost)
+
+- (DBRouteHost)host {
+  NSString *routeHost = self.attrs[@"host"];
+  if ([routeHost isEqualToString:@"api"]) {
+    return DBRouteHostApi;
+  }
+  if ([routeHost isEqualToString:@"content"]) {
+    return DBRouteHostContent;
+  }
+  if ([routeHost isEqualToString:@"notify"]) {
+    return DBRouteHostNotify;
+  }
+  return DBRouteHostUnknown;
+}
+
+@end
 
 @implementation DBTransportBaseHostnameConfig
 
@@ -35,15 +54,16 @@ - (instancetype)initWithMeta:(NSString *)meta
   return self;
 }
 
-- (nullable NSString *)apiV2PrefixWithRouteType:(NSString *)routeType {
-  if ([routeType isEqualToString:@"api"]) {
-    return [NSString stringWithFormat:@"https://%@/2", _api];
-  } else if ([routeType isEqualToString:@"content"]) {
-    return [NSString stringWithFormat:@"https://%@/2", _content];
-  } else if ([routeType isEqualToString:@"notify"]) {
-    return [NSString stringWithFormat:@"https://%@/2", _notify];
-  } else {
-    return nil;
+- (nullable NSString *)apiV2PrefixWithRoute:(DBRoute *)route {
+  switch (route.host) {
+    case DBRouteHostApi:
+      return [NSString stringWithFormat:@"https://%@/2", _api];
+    case DBRouteHostContent:
+      return [NSString stringWithFormat:@"https://%@/2", _content];
+    case DBRouteHostNotify:
+      return [NSString stringWithFormat:@"https://%@/2", _notify];
+    case DBRouteHostUnknown:
+      return nil;
   }
 }
 

Source/ObjectiveDropboxOfficial/Shared/Handwritten/Networking/DBTransportDefaultClient.m

@@ -9,6 +9,7 @@
 #import "DBStoneBase.h"
 #import "DBTasksImpl.h"
 #import "DBTransportBaseClient+Internal.h"
+#import "DBTransportBaseHostnameConfig.h"
 #import "DBTransportDefaultConfig.h"
 
 @implementation DBTransportDefaultClient {
@@ -98,7 +99,7 @@ - (DBRpcTaskImpl *)requestRpc:(DBRoute *)route arg:(id<DBSerializable>)arg {
   NSURLSession *sessionToUse = _session;
 
   // longpoll requests have a much longer timeout period than other requests
-  if ([route.attrs[@"host"] isEqualToString:@"notify"]) {
+  if (route.host == DBRouteHostNotify) {
     sessionToUse = _longpollSession;
   }