Enterprise Connection only authentication #336
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,4 +42,4 @@ class ConnectionLoadingPresenter: Presentable, Loggable { | |
| } | ||
| return LoadingView() | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // EnterpriseDomain.swift | ||
| // | ||
| // Copyright (c) 2016 Auth0 (http://auth0.com) | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| import Foundation | ||
|
|
||
| protocol EnterpriseDomain { | ||
|
There was a problem hiding this comment. Let's rename this to |
||
| var email: String? { get } | ||
| var validEmail: Bool { get } | ||
| var validDomain: Bool { get } | ||
|
|
||
| mutating func updateEmail(value: String?) throws | ||
|
|
||
| func requestConnection(callback: (OAuth2AuthenticatableError?) -> ()) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // EnterpriseDomainInteractor.swift | ||
| // | ||
| // Copyright (c) 2016 Auth0 (http://auth0.com) | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| import Foundation | ||
| import Auth0 | ||
|
|
||
| struct EnterpriseDomainInteractor: EnterpriseDomain { | ||
|
|
||
| var email: String? = nil | ||
| var validEmail: Bool = false | ||
| var validDomain: Bool = false | ||
|
|
||
| let connections: Connections | ||
| let emailValidator: InputValidator = EmailValidator() | ||
| let domainValidator: EnterpriseDomainValidator | ||
| let authenticator: OAuth2Authenticatable | ||
|
|
||
| init(connections: Connections, auth: OAuth2Authenticatable) { | ||
| self.connections = connections | ||
| self.domainValidator = EnterpriseDomainValidator(connections: connections.enterprise) | ||
| self.authenticator = auth | ||
| } | ||
|
|
||
| mutating func updateEmail(value: String?) throws { | ||
|
|
||
| validEmail = false | ||
| validDomain = false | ||
|
|
||
| // Validate email | ||
| email = value?.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()) | ||
| if let error = emailValidator.validate(value) { | ||
| throw error | ||
| } | ||
| validEmail = true | ||
|
|
||
| // Validate Enterprise domain | ||
| if let error = domainValidator.validate(self.email) { | ||
| throw error | ||
| } | ||
| validDomain = true | ||
| } | ||
|
|
||
| func requestConnection(callback: (OAuth2AuthenticatableError?) -> ()) { | ||
| guard let _ = self.email else { return callback(.NoConnectionAvailable) } | ||
|
There was a problem hiding this comment. probably best to use There was a problem hiding this comment. It feels less swifty in comparison to guard. However, I also do not like using |
||
| guard let connection = self.domainValidator.enterpriseConnection else { return callback(.NoConnectionAvailable) } | ||
|
|
||
| authenticator.login(connection.name) { error in | ||
| return callback(error) | ||
| } | ||
| callback(nil) | ||
|
There was a problem hiding this comment. Is this right?, shouldn't it be inside of the callback?. Maybe just login like authenticator.login(connection.name, callback);There was a problem hiding this comment. I'll try this it's cleaner. |
||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // EnterpriseDomainPresenter.swift | ||
| // | ||
| // Copyright (c) 2016 Auth0 (http://auth0.com) | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| import Foundation | ||
|
|
||
| class EnterpriseDomainPresenter: Presentable, Loggable { | ||
|
|
||
| var interactor: EnterpriseDomainInteractor | ||
| var customLogger: Logger? | ||
|
|
||
| init(interactor: EnterpriseDomainInteractor) { | ||
| self.interactor = interactor | ||
| } | ||
|
|
||
| var messagePresenter: MessagePresenter? | ||
|
|
||
| var view: View { | ||
| let email = self.interactor.validEmail ? self.interactor.email : nil | ||
| let view = EnterpriseDomainView(email: email) | ||
| let form = view.form | ||
| view.form?.onValueChange = { input in | ||
| self.messagePresenter?.hideCurrent() | ||
|
|
||
| guard case .Email = input.type else { return } | ||
| do { | ||
| try self.interactor.updateEmail(input.text) | ||
| input.showValid() | ||
| } catch { | ||
| input.showError() | ||
| } | ||
| } | ||
|
|
||
| let action = { (button: PrimaryButton) in | ||
| self.messagePresenter?.hideCurrent() | ||
| self.logger.info("Enterprise connection validation: \(self.interactor.email)") | ||
| let interactor = self.interactor | ||
| button.inProgress = true | ||
| interactor.requestConnection { error in | ||
| Queue.main.async { | ||
| button.inProgress = false | ||
| form?.needsToUpdateState() | ||
| if let error = error { | ||
| self.messagePresenter?.showError(error) | ||
| self.logger.error("Failed: \(error)") | ||
| } else { | ||
| self.logger.debug("Launch Web Auth") | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } | ||
| view.primaryButton?.onPress = action | ||
| view.form?.onReturn = {_ in | ||
| guard let button = view.primaryButton else { return } | ||
| action(button) | ||
| } | ||
| return view | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's coalesce into a single
domainparameter of type[String]. And make sure when we parse the info from the CDN we put thedomainone first.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense, I was focusing on AD which is just a comma list in dashboard that presents then first domain in the list as the primary domain. Will change.