Add ability to enable Cloudflare app proxy usage

Castle/Classes/Client/CASAPIClient.m

@@ -14,9 +14,6 @@
 #import "CASUtils.h"
 #import "CASEvent.h"
 
-NSString *const CASAPIClientHostName = @"api.castle.io";
-NSString *const CASAPIClientVersion = @"v1";
-
 @interface CASAPIClient ()
 
 @property (nonatomic, copy, readonly) NSURL *baseURL;
@@ -117,8 +114,7 @@ - (NSURLSession *)session
 
 - (NSURL *)baseURL
 {
-    NSString *urlString = [NSString stringWithFormat:@"https://%@/%@/", CASAPIClientHostName, CASAPIClientVersion];
-    return [NSURL URLWithString:urlString];
+    return self.configuration.baseURL;
 }
 
 #pragma mark - NSURLRequest

Castle/Classes/Public/Castle.h

@@ -153,6 +153,14 @@ extern NSString *const CastleClientIdHeaderName;
  */
 + (BOOL)isWhitelistURL:(NSURL *)url;
 
+
+/**
+ Get base url
+
+ @return return Base URL
+ */
++ (NSURL *)baseURL;
+
 #pragma mark - Metadata
 
 /**

Castle/Classes/Public/Castle.m

@@ -396,6 +396,12 @@ + (BOOL)isWhitelistURL:(NSURL *)url
     return [castle.configuration.baseURLWhiteList filteredArrayUsingPredicate:predicate].count > 0;
 }
 
++ (NSURL *)baseURL
+{
+    Castle *castle = [Castle sharedInstance];
+    return castle.configuration.baseURL;
+}
+
 #pragma mark - Private
 
 - (BOOL)eventQueueExceedsFlushLimit

Castle/Classes/Public/CastleConfiguration.h

@@ -48,6 +48,25 @@
  */
 @property (nonatomic, strong, readwrite) NSArray<NSURL *> * _Nonnull baseURLWhiteList;
 
+/**
+ Cloudflare proxying enabled
+ */
+@property (nonatomic, assign) BOOL useCloudflareApp;
+
+/**
+ Get base url
+ */
+@property (nonatomic, copy, readonly, getter=baseURL) NSURL * _Nonnull baseURL;
+
+/**
+ Get API domain
+ */
+@property (nonatomic, copy) NSString * _Nonnull apiDomain;
+
+/**
+ Get API path
+ */
+@property (nonatomic, copy) NSString * _Nullable apiPath;
 
 /**
  Default configuration with provided publishable key

Castle/Classes/Public/CastleConfiguration.m

@@ -7,6 +7,10 @@
 
 #import "CastleConfiguration.h"
 
+static NSString *CastleConfigurationDefaultAPIDomain = @"api.castle.io";
+static NSString *CastleConfigurationCastleAPIPath = @"v1/";
+static NSString *CastleConfigurationCloudflareAPIPath = @"v1/c/mobile/";
+
 @interface CastleConfiguration ()
 @property (nonatomic, copy, readwrite) NSString *publishableKey;
 @end
@@ -16,13 +20,16 @@ @implementation CastleConfiguration
 + (instancetype _Nonnull)configurationWithPublishableKey:(NSString * _Nonnull)publishableKey
 {
     NSAssert([publishableKey hasPrefix:@"pk_"], @"You must provide a valid Castle publishable key when initializing the SDK.");
-
+    
     CastleConfiguration *configuration = [[CastleConfiguration alloc] init];
     configuration.publishableKey = publishableKey;
     configuration.screenTrackingEnabled = YES;
     configuration.debugLoggingEnabled = NO;
     configuration.flushLimit = 20;
     configuration.maxQueueLimit = 1000;
+    configuration.useCloudflareApp = NO;
+    configuration.apiDomain = CastleConfigurationDefaultAPIDomain;
+    configuration.apiPath = nil;
     return configuration;
 }
 
@@ -40,4 +47,35 @@ - (void)setBaseURLWhiteList:(NSArray *)baseURLWhiteList
     _baseURLWhiteList = whitelist.copy;
 }
 
+- (void)setUseCloudflareApp:(BOOL)useCloudflareApp
+{
+    if (useCloudflareApp && [self.apiDomain isEqualToString:CastleConfigurationDefaultAPIDomain]) {
+        NSException *exception = [[NSException alloc] initWithName:@"No API domain set" reason:@"You must set a API domain if useCloudflare app is enabled." userInfo:nil];
+        [exception raise];
+    }
+    _useCloudflareApp = useCloudflareApp;
+}
+
+#pragma mark - Getters
+
+- (NSURL *)baseURL
+{
+    if (self.useCloudflareApp) {
+        return [NSURL URLWithString:[NSString stringWithFormat:@"https://%@/%@", self.apiDomain, self.apiPath]];
+    }
+    return [NSURL URLWithString:[NSString stringWithFormat:@"https://%@/%@", CastleConfigurationDefaultAPIDomain, self.apiPath]];
+}
+
+- (NSString *)apiPath
+{
+    if (self.useCloudflareApp) {
+        if (_apiPath != nil) {
+            return _apiPath;
+        } else {
+            return CastleConfigurationCloudflareAPIPath;
+        }
+    }
+    return CastleConfigurationCastleAPIPath;
+}
+
 @end

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Castle (1.0.1)
+  - Castle (1.0.4)
 
 DEPENDENCIES:
   - Castle (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Castle: fe8d7d29959c4f13922f17a53dd1cd17906b3868
+  Castle: 0846f02b7850f97d6fa24bcc2d960203c3888c99
 
 PODFILE CHECKSUM: d69237890685db6bab2c6d1cac77481a062aa2cc
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.9.3

Example/Tests/Tests.m

@@ -117,6 +117,8 @@ - (void)testConfiguration
     XCTAssertEqual(configuration.maxQueueLimit, 20);
     XCTAssertEqual(configuration.baseURLWhiteList.count, 1);
     XCTAssertTrue([configuration.baseURLWhiteList[0].absoluteString isEqualToString:@"https://google.com/"]);
+    XCTAssertFalse(configuration.useCloudflareApp);
+    XCTAssertTrue([configuration.baseURL.absoluteString isEqualToString:@"https://api.castle.io/v1/"]);
 
     [configuration setBaseURLWhiteList:@[ [NSURL URLWithString:@"https://google.com/somethingelse"]]];
     XCTAssertFalse([configuration.baseURLWhiteList[0].absoluteString isEqualToString:@"https://google.com/somethingelse"]);
@@ -134,6 +136,40 @@ - (void)testConfiguration
     // Check whitelisting on configured instance
     XCTAssertTrue([Castle isWhitelistURL:[NSURL URLWithString:@"https://google.com/somethingelse"]]);
     XCTAssertFalse([Castle isWhitelistURL:nil]);
+
+    [Castle resetConfiguration];
+
+    // Test cloudflare logic
+    configuration = [CastleConfiguration configurationWithPublishableKey:@"pk_SE5aTeotKZpDEn8kurzBYquRZyy21fvZ"];
+    XCTAssertThrows(configuration.useCloudflareApp = YES, "");
+
+    configuration = [CastleConfiguration configurationWithPublishableKey:@"pk_SE5aTeotKZpDEn8kurzBYquRZyy21fvZ"];
+    configuration.apiDomain = @"example.com";
+    configuration.useCloudflareApp = YES;
+
+    XCTAssertTrue(configuration.useCloudflareApp);
+    XCTAssertTrue([configuration.apiDomain isEqualToString:@"example.com"]);
+    XCTAssertTrue([configuration.apiPath isEqualToString:@"v1/c/mobile/"]);
+    XCTAssertTrue([configuration.baseURL.absoluteString isEqualToString:@"https://example.com/v1/c/mobile/"]);
+
+    [Castle configure:configuration];
+
+    XCTAssertTrue([Castle.baseURL.absoluteString isEqualToString:@"https://example.com/v1/c/mobile/"]);
+
+    [Castle resetConfiguration];
+
+    configuration = [CastleConfiguration configurationWithPublishableKey:@"pk_SE5aTeotKZpDEn8kurzBYquRZyy21fvZ"];
+    configuration.apiDomain = @"example.com";
+    configuration.apiPath = @"v1/test/";
+    configuration.useCloudflareApp = YES;
+
+    XCTAssertTrue(configuration.useCloudflareApp);
+    XCTAssertTrue([configuration.apiDomain isEqualToString:@"example.com"]);
+    XCTAssertTrue([configuration.baseURL.absoluteString isEqualToString:@"https://example.com/v1/test/"]);
+
+    [Castle resetConfiguration];
+
+    [Castle configureWithPublishableKey:@"pk_SE5aTeotKZpDEn8kurzBYquRZyy21fvZ"];
 }
 
 - (void)testDeviceIdentifier