Added configurationBaseURL option for Custom Domains support

Lock/ClassicRouter.swift

@@ -40,7 +40,8 @@ struct ClassicRouter: Router {
         let connections = self.lock.connections
         guard !connections.isEmpty else {
             self.lock.logger.debug("No connections configured. Loading application info from Auth0...")
-            let interactor = CDNLoaderInteractor(baseURL: self.lock.authentication.url, clientId: self.lock.authentication.clientId)
+            let baseURL = self.lock.options.configurationBaseURL ?? self.lock.authentication.url
+            let interactor = CDNLoaderInteractor(baseURL: baseURL, clientId: self.lock.authentication.clientId)
             return ConnectionLoadingPresenter(loader: interactor, navigator: self, dispatcher: lock.observerStore, options: self.lock.options)
         }
         let whitelistForActiveAuth = self.lock.options.enterpriseConnectionUsingActiveAuth

Lock/LockOptions.swift

@@ -51,4 +51,5 @@ struct LockOptions: OptionBuildable {
     var passwordlessMethod: PasswordlessMethod = .code
     var passwordManager: OnePassword = OnePassword()
     var allowShowPassword: Bool = true
+    var configurationBaseURL: URL?
 }

Lock/OptionBuildable.swift

@@ -102,6 +102,9 @@ public protocol OptionBuildable: Options {
 
         /// Should Lock display the option to toggle the visibility of the password field text, will not be visible if password manager is available.  By default is true
     var allowShowPassword: Bool { get set }
+
+        /// Set configuration URL to use for Lock configuration. Required when using Custom Domains
+    var configurationBaseURL: URL? { get set }
 }
 
 extension OptionBuildable {
@@ -132,7 +135,7 @@ public extension OptionBuildable {
             return self.termsOfServiceURL.absoluteString
         }
         set {
-            guard let url = URL(string: newValue) else { return } // FIXME: log error
+            guard let url = URL(string: newValue) else { return }
             self.termsOfServiceURL = url
         }
     }
@@ -143,7 +146,7 @@ public extension OptionBuildable {
             return self.privacyPolicyURL.absoluteString
         }
         set {
-            guard let url = URL(string: newValue) else { return } // FIXME: log error
+            guard let url = URL(string: newValue) else { return }
             self.privacyPolicyURL = url
         }
     }
@@ -155,9 +158,21 @@ public extension OptionBuildable {
             return url.absoluteString
         }
         set {
-            guard let value = newValue, let url = URL(string: value) else { return } // FIXME: log error
+            guard let value = newValue, let url = URL(string: value) else { return }
             self.supportURL = url
         }
     }
 
+        /// Base CDN URL. By default is not set.
+    var configurationBase: String? {
+        get {
+            guard let url = self.configurationBaseURL else { return nil }
+            return url.absoluteString
+        }
+        set {
+            guard let value = newValue, let url = URL(string: value) else { return }
+            self.configurationBaseURL = url
+        }
+    }
+
 }

Lock/Options.swift

@@ -53,4 +53,6 @@ public protocol Options {
     var passwordlessMethod: PasswordlessMethod { get }
     var passwordManager: OnePassword { get }
     var allowShowPassword: Bool { get }
+
+    var configurationBaseURL: URL? { get }
 }

Lock/PasswordlessRouter.swift

@@ -41,7 +41,8 @@ struct PasswordlessRouter: Router {
         let connections = self.lock.connections
         guard !connections.isEmpty else {
             self.lock.logger.debug("No connections configured. Loading application info from Auth0...")
-            let interactor = CDNLoaderInteractor(baseURL: self.lock.authentication.url, clientId: self.lock.authentication.clientId)
+            let baseURL = self.lock.options.configurationBaseURL ?? self.lock.authentication.url
+            let interactor = CDNLoaderInteractor(baseURL: baseURL, clientId: self.lock.authentication.clientId)
             return ConnectionLoadingPresenter(loader: interactor, navigator: self, dispatcher: observerStore, options: self.lock.options)
         }
 

LockTests/OptionsSpec.swift

@@ -101,7 +101,6 @@ class OptionsSpec: QuickSpec {
                 expect(options.autoClose) == true
             }
 
-
             it("should be passwordless emailCode method by default") {
                 expect(options.passwordlessMethod).to(equal(PasswordlessMethod.code))
             }
@@ -125,6 +124,10 @@ class OptionsSpec: QuickSpec {
             it("should have mustAcceptTerms disabled") {
                 expect(options.mustAcceptTerms) == false
             }
+
+            it("should have configurationBaseURL as nil") {
+                expect(options.configurationBaseURL).to(beNil())
+            }
         }
 
         describe("validation") {
@@ -256,6 +259,11 @@ class OptionsSpec: QuickSpec {
                 expect(options.supportURL?.absoluteString) == "https://auth0.com/docs"
             }
 
+            it("should set configurationBaseURL") {
+                options.configurationBase = "https://auth0.customdomain.com"
+                expect(options.configurationBaseURL?.absoluteString) == "https://auth0.customdomain.com"
+            }
+
             it("should ignore invalid support site") {
                 options.supportPage = "not a url"
                 expect(options.supportURL?.absoluteString).to(beNil())

README.md

@@ -158,6 +158,17 @@ Before presenting Lock you can tell it what connections it should display and us
 }
 ```
 
+### Custom Domains
+
+If you are using [Custom Domains](https://auth0.com/docs/custom-domains), you will need to set the `configurationBaseURL` to your Auth0 Domain so the Lock configuration can 
+be read correctly.
+
+```swift
+.withOptions {
+   $0.configurationBase = "https://<YOUR DOMAIN>.auth0.com"
+}
+```
+
 ### Logging
 
 You can easily turn on/off logging capabilities.