Skip to content

Check FES when loading inbox #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomholub merged 2 commits into from
Jun 10, 2021
Merged

Check FES when loading inbox #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2361dfd
Checking FES availability on InboxViewController;
Jun 9, 2021
aa14ded
Fixed getActiveFesUrlForCurrentUser passing parameter name;
Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion FlowCrypt/Controllers/Inbox/InboxViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ final class InboxViewController: ASDKViewController<ASDisplayNode> {

private let messageProvider: MessagesListProvider
private let decorator: InboxViewDecoratorType
private let enterpriseServerApi: EnterpriseServerApiType
private let refreshControl = UIRefreshControl()
private let tableNode: ASTableNode
private lazy var composeButton = ComposeButtonNode { [weak self] in
Expand All @@ -63,11 +64,13 @@ final class InboxViewController: ASDKViewController<ASDisplayNode> {
init(
_ viewModel: InboxViewModel,
messageProvider: MessagesListProvider = MailProvider.shared.messageListProvider,
decorator: InboxViewDecoratorType = InboxViewDecorator()
decorator: InboxViewDecoratorType = InboxViewDecorator(),
enterpriseServerApi: EnterpriseServerApiType = EnterpriseServerApi()
) {
self.viewModel = viewModel
self.messageProvider = messageProvider
self.decorator = decorator
self.enterpriseServerApi = enterpriseServerApi
tableNode = TableNode()

super.init(node: ASDisplayNode())
Expand All @@ -88,6 +91,7 @@ final class InboxViewController: ASDKViewController<ASDisplayNode> {
setupUI()
setupNavigationBar()
fetchAndRenderEmails(nil)
checkFES()
}

override func viewWillAppear(_ animated: Bool) {
Expand Down Expand Up @@ -241,6 +245,14 @@ extension InboxViewController {
showAlert(error: error, message: "message_failed_load".localized)
}
}

private func checkFES() {
enterpriseServerApi.getActiveFesUrlForCurrentUser()
.then(on: .main) { [weak self] urlString in
guard let urlString = urlString else { return }
self?.showToast("FES at \(urlString) not supported on iOS yet")
}
}
}

// MARK: - Action handlers
Expand Down
10 changes: 10 additions & 0 deletions FlowCrypt/Functionality/Services/EnterpriseServerApi.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Promises

protocol EnterpriseServerApiType {
func getActiveFesUrl(for email: String) -> Promise<String?>
func getActiveFesUrlForCurrentUser() -> Promise<String?>
}

class EnterpriseServerApi: EnterpriseServerApiType {
Expand All @@ -21,6 +22,15 @@ class EnterpriseServerApi: EnterpriseServerApiType {
static let serviceNeededValue = "enterprise-server"
}

func getActiveFesUrlForCurrentUser() -> Promise<String?> {
guard let email = DataService.shared.currentUser?.email else {
return Promise<String?> { resolve, _ in
resolve(nil)
}
}
return getActiveFesUrl(for: email)
}

func getActiveFesUrl(for email: String) -> Promise<String?> {
Promise<String?> { resolve, _ in
guard let userDomain = email.recipientDomain,
Expand Down