[PAS-418] Fix issue with server unreachable error url

Passbolt/PassboltPackage/Sources/SharedUIComponents/ServerNotReachable/ServerNotReachableController.swift

@@ -71,7 +71,11 @@ extension ServerNotReachableController: UIController {
     cancellables: Cancellables
   ) -> Self {
     var urlComponents: URLComponents? = context.flatMap { URLComponents(url: $0, resolvingAgainstBaseURL: true) }
+    urlComponents?.user = nil
     urlComponents?.path = ""
+    urlComponents?.query = nil
+    urlComponents?.fragment = nil
+
     return Self(
       serverURL: (urlComponents?.string).map(URLString.init(rawValue:))
     )

Passbolt/PassboltPackage/Tests/NetworkClientTests/NetworkRequestTests.swift

@@ -141,6 +141,74 @@ final class NetworkRequestTests: XCTestCase {
     XCTAssertEqual(completionError?.identifier, .httpError)
   }
 
+  func test_request_withHTTPErrorCannotConnect_failsWithServerNotReachableError() {
+    let url: URL = .init(string: "https://passbolt.com")!
+    networking.execute = { _, _ -> AnyPublisher<HTTPResponse, HTTPError> in
+      Fail<HTTPResponse, HTTPError>(error: .cannotConnect(url))
+        .eraseToAnyPublisher()
+    }
+
+    request = prepareRequest()
+    var completionError: TheError? = nil
+
+    request
+      .make(using: .sample)
+      .sink(
+        receiveCompletion: { completion in
+          switch completion {
+          case .finished:
+            XCTFail("Unexpected behaviour")
+
+          case let .failure(error):
+            completionError = error
+          }
+        },
+        receiveValue: { _ in
+          XCTFail("Unexpected behaviour")
+        }
+      )
+      .store(in: cancellables)
+
+    sessionSubject.send(NetworkSessionVariable(domain: "https://passbolt.com"))
+
+    XCTAssertEqual(completionError?.identifier, .serverNotReachable)
+    XCTAssertEqual(completionError?.url, url)
+  }
+
+  func test_request_withHTTPErrorTimeout_failsWithServerNotReachableError() {
+    let url: URL = .init(string: "https://passbolt.com")!
+    networking.execute = { _, _ -> AnyPublisher<HTTPResponse, HTTPError> in
+      Fail<HTTPResponse, HTTPError>(error: .timeout(url))
+        .eraseToAnyPublisher()
+    }
+
+    request = prepareRequest()
+    var completionError: TheError? = nil
+
+    request
+      .make(using: .sample)
+      .sink(
+        receiveCompletion: { completion in
+          switch completion {
+          case .finished:
+            XCTFail("Unexpected behaviour")
+
+          case let .failure(error):
+            completionError = error
+          }
+        },
+        receiveValue: { _ in
+          XCTFail("Unexpected behaviour")
+        }
+      )
+      .store(in: cancellables)
+
+    sessionSubject.send(NetworkSessionVariable(domain: "https://passbolt.com"))
+
+    XCTAssertEqual(completionError?.identifier, .serverNotReachable)
+    XCTAssertEqual(completionError?.url, url)
+  }
+
   func test_requestBodyAndResponseBody_withBodyMirroring_areEqual() {
     networking.execute = { request, _ -> AnyPublisher<HTTPResponse, HTTPError> in
       Just(

Passbolt/PassboltPackage/Tests/SharedUIComponentsTests/ServerNotReachableControllerTests.swift

@@ -0,0 +1,89 @@
+//
+// Passbolt - Open source password manager for teams
+// Copyright (c) 2021 Passbolt SA
+//
+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
+// Public License (AGPL) as published by the Free Software Foundation version 3.
+//
+// The name "Passbolt" is a registered trademark of Passbolt SA, and Passbolt SA hereby declines to grant a trademark
+// license to "Passbolt" pursuant to the GNU Affero General Public License version 3 Section 7(e), without a separate
+// agreement with Passbolt SA.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License along with this program. If not,
+// see GNU Affero General Public License v3 (http://www.gnu.org/licenses/agpl-3.0.html).
+//
+// @copyright     Copyright (c) Passbolt SA (https://www.passbolt.com)
+// @license       https://opensource.org/licenses/AGPL-3.0 AGPL License
+// @link          https://www.passbolt.com Passbolt (tm)
+// @since         v1.0
+//
+
+import Features
+import TestExtensions
+import UIComponents
+import XCTest
+
+@testable import SharedUIComponents
+
+// swift-format-ignore: AlwaysUseLowerCamelCase, NeverUseImplicitlyUnwrappedOptionals
+final class ServerNotReachableControllerTests: TestCase {
+
+  func test_serverURL_hasCorrectValue_whenProvided_withValidURL() {
+    let controller: ServerNotReachableController = testInstance(
+      context: .init(string: "https://passbolt.com:443")
+    )
+
+    XCTAssertEqual(controller.serverURL, "https://passbolt.com:443")
+  }
+
+  func test_serverURL_hasCorrectValue_whenProvided_withValidURL_containingAllUnnecessaryComponents() {
+    let controller: ServerNotReachableController = testInstance(
+      context: .init(string: "https://user@passbolt.com:443/path?query=1#fragment")
+    )
+
+    XCTAssertEqual(controller.serverURL, "https://passbolt.com:443")
+  }
+
+  func test_serverURL_doesNotContainUser_whenProvided_withValidURL_containingUser() {
+    let controller: ServerNotReachableController = testInstance(
+      context: .init(string: "https://user@passbolt.com:443")
+    )
+
+    XCTAssertEqual(controller.serverURL, "https://passbolt.com:443")
+  }
+
+  func test_serverURL_doesNotContainPath_whenProvided_withValidURL_containingPath() {
+    let controller: ServerNotReachableController = testInstance(
+      context: .init(string: "https://passbolt.com:443/path")
+    )
+
+    XCTAssertEqual(controller.serverURL, "https://passbolt.com:443")
+  }
+
+  func test_serverURL_doesNotContainQuery_whenProvided_withValidURL_containingQuery() {
+    let controller: ServerNotReachableController = testInstance(
+      context: .init(string: "https://passbolt.com:443?query=1")
+    )
+
+    XCTAssertEqual(controller.serverURL, "https://passbolt.com:443")
+  }
+
+  func test_serverURL_doesNotContainFragment_whenProvided_withValidURL_containingQuery() {
+    let controller: ServerNotReachableController = testInstance(
+      context: .init(string: "https://passbolt.com:443#fragment")
+    )
+
+    XCTAssertEqual(controller.serverURL, "https://passbolt.com:443")
+  }
+
+  func test_serverURL_isEmpty_whenProvided_withInvalidURL() {
+    let controller: ServerNotReachableController = testInstance(
+      context: .init(string: ":)//passboltcom/?fragment")
+    )
+
+    XCTAssertTrue(controller.serverURL?.rawValue.isEmpty ?? false)
+  }
+}