From 662010fc0f3881d1fd029f040a0053b46c234e71 Mon Sep 17 00:00:00 2001 From: Aliona Date: Thu, 12 Jul 2018 14:39:04 +0300 Subject: [PATCH] Update pull according to comments --- Sources/Extensions/String/String+ConvertToHost.swift | 7 +++---- .../NetworkService/NetworkServiceConfiguration.swift | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Sources/Extensions/String/String+ConvertToHost.swift b/Sources/Extensions/String/String+ConvertToHost.swift index 1232911c..02fdc0af 100644 --- a/Sources/Extensions/String/String+ConvertToHost.swift +++ b/Sources/Extensions/String/String+ConvertToHost.swift @@ -24,10 +24,9 @@ import Foundation extension String { - /** - Extracts host from strings that can be converted to URL. - Causes assertionFailure if string cannot be converted. - */ + /// Extracts host from strings that can be converted to URL. + /// Causes assertionFailure if string cannot be converted. + var asHost: String { guard let host = URL(string: self)?.host else { assertionFailure("Cannot detect host for base URL") diff --git a/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift b/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift index 4fc70091..494072d6 100644 --- a/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift +++ b/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift @@ -60,8 +60,7 @@ public struct NetworkServiceConfiguration { sessionConfiguration.timeoutIntervalForResource = timeoutInterval sessionConfiguration.httpAdditionalHeaders = additionalHttpHeaders - var updatedPolicies: [String: ServerTrustPolicy] = [:] - trustPolicies.forEach { updatedPolicies[$0.key.asHost] = $0.value } + let updatedPolicies = Dictionary(uniqueKeysWithValues: trustPolicies.map { ($0.key.asHost, $0.value) }) serverTrustPolicies = trustPolicies.isEmpty ? [baseUrl.asHost: .disableEvaluation] : updatedPolicies } }