Skip to content

Couldn't parse org rules #420

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 5 commits into from
Jul 30, 2021
Merged

Couldn't parse org rules #420

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a68e01d
Tolerating not found, timeout, service unavailable errors in Enterpri…
Jul 29, 2021
934951c
Fixed error handling for getting FES url;
Jul 29, 2021
1671691
Fixed timeout for enterprise api;
Jul 30, 2021
50ba157
Added more tolerated errors for FES url fetching;
Jul 30, 2021
8d8a48e
Merge branch 'master' into feature/issue-408-couldnt-parse-organisati…
tomholub Jul 30, 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
41 changes: 35 additions & 6 deletions FlowCrypt/Functionality/Services/EnterpriseServerApi.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ extension EnterpriseServerApiError: LocalizedError {
class EnterpriseServerApi: EnterpriseServerApiType {

private enum Constants {
/// 404 - Not Found
static let getToleratedHTTPStatuses = [404]
/// -1001 - request timed out, -1003 - сannot resolve host, -1004 - can't conenct to hosts,
/// -1005 - network connection lost, -1006 - dns lookup failed, -1007 - too many redirects
/// -1008 - resource unavailable
static let getToleratedNSErrorCodes = [-1001, -1003, -1004, -1005, -1006, -1007, -1008]
static let getActiveFesTimeout: TimeInterval = 4

static let serviceKey = "service"
Expand Down Expand Up @@ -69,9 +75,18 @@ class EnterpriseServerApi: EnterpriseServerApiType {
body: nil
)

let response = try? awaitPromise(URLSession.shared.call(request))
guard let safeReponse = response,
let responseDictionary = try? safeReponse.data.toDict(),
let response = try awaitPromise(
URLSession.shared.call(
request,
tolerateStatus: Constants.getToleratedHTTPStatuses
)
)

if Constants.getToleratedHTTPStatuses.contains(response.status) {
resolve(nil)
}

guard let responseDictionary = try? response.data.toDict(),
let service = responseDictionary[Constants.serviceKey] as? String,
service == Constants.serviceNeededValue else {
resolve(nil)
Expand All @@ -81,6 +96,14 @@ class EnterpriseServerApi: EnterpriseServerApiType {
resolve(urlString)
}
.timeout(Constants.getActiveFesTimeout)
.recover { error -> String? in
if let httpError = error as? HttpErr,
let nsError = httpError.error as NSError?,
Constants.getToleratedNSErrorCodes.contains(nsError.code) {
return nil
}
throw error
}
.recoverFromTimeOut(result: nil)
}

Expand All @@ -90,6 +113,12 @@ class EnterpriseServerApi: EnterpriseServerApiType {
reject(EnterpriseServerApiError.emailFormat)
return
}

guard try awaitPromise(self.getActiveFesUrl(for: email)) != nil else {
resolve(.empty)
return
}

if Configuration.publicEmailProviderDomains.contains(userDomain) {
resolve(.empty)
return
Expand All @@ -99,12 +128,12 @@ class EnterpriseServerApi: EnterpriseServerApiType {
method: .get,
body: nil
)
let response = try? awaitPromise(URLSession.shared.call(request))
let safeReponse = try awaitPromise(URLSession.shared.call(request))

let decoder = JSONDecoder()
decoder.keyDecodingStrategy = .convertFromSnakeCase

guard let safeReponse = response,
let clientConfiguration = (try? decoder.decode(
guard let clientConfiguration = (try? decoder.decode(
ClientConfigurationContainer.self,
from: safeReponse.data
))?.clientConfiguration
Expand Down