PM-8018: Fix error if self-hosted URL ends with a trailing slash (#734)

Author: matt-livefront

BitwardenShared/Core/Platform/Extensions/URL.swift

@@ -93,12 +93,18 @@ extension URL {
     }
 
     /// Returns a sanitized version of the URL. This will add a https scheme to the URL if the
-    /// scheme is missing.
+    /// scheme is missing and remove a trailing slash.
     var sanitized: URL {
-        guard absoluteString.starts(with: "https://") || absoluteString.starts(with: "http://") else {
-            return URL(string: "https://" + absoluteString) ?? self
+        let stringUrl = if absoluteString.hasSuffix("/") {
+            String(absoluteString.dropLast())
+        } else {
+            absoluteString
+        }
+
+        guard stringUrl.starts(with: "https://") || stringUrl.starts(with: "http://") else {
+            return URL(string: "https://" + stringUrl) ?? self
         }
-        return self
+        return URL(string: stringUrl) ?? self
     }
 
     // MARK: Methods

BitwardenShared/Core/Platform/Extensions/URLTests.swift

@@ -82,6 +82,18 @@ class URLTests: BitwardenTestCase {
         )
     }
 
+    /// `sanitized` removes a trailing slash from the URL.
+    func test_sanitized_trailingSlash() {
+        XCTAssertEqual(
+            URL(string: "https://bitwarden.com/")?.sanitized,
+            URL(string: "https://bitwarden.com")
+        )
+        XCTAssertEqual(
+            URL(string: "example.com/")?.sanitized,
+            URL(string: "https://example.com")
+        )
+    }
+
     /// `sanitized` returns the URL unchanged if it's valid and contains a scheme.
     func test_sanitized_validURL() {
         XCTAssertEqual(

BitwardenShared/Core/Platform/Models/Domain/EnvironmentUrlData.swift

@@ -109,7 +109,7 @@ extension EnvironmentUrlData {
         // which includes the `#` symbol. Since the `#` character is a critical portion of these urls, we use String
         // concatenation to get around this limitation.
         if let baseUrl = webVault ?? base,
-           let url = URL(string: baseUrl.absoluteString.appending("/#/\(additionalPath)")) {
+           let url = URL(string: baseUrl.sanitized.absoluteString.appending("/#/\(additionalPath)")) {
             return url
         }
         return nil

BitwardenShared/Core/Platform/Models/Domain/EnvironmentUrls.swift

@@ -43,11 +43,11 @@ extension EnvironmentUrls {
     ///
     init(environmentUrlData: EnvironmentUrlData) {
         if let base = environmentUrlData.base {
-            apiURL = base.appendingPathComponent("/api")
+            apiURL = base.appendingPathComponent("api")
             baseURL = base
-            eventsURL = base.appendingPathComponent("/events")
-            iconsURL = base.appendingPathComponent("/icons")
-            identityURL = base.appendingPathComponent("/identity")
+            eventsURL = base.appendingPathComponent("events")
+            iconsURL = base.appendingPathComponent("icons")
+            identityURL = base.appendingPathComponent("identity")
             webVaultURL = base
         } else {
             apiURL = environmentUrlData.api ?? URL(string: "https://api.bitwarden.com")!

BitwardenShared/Core/Platform/Models/Domain/EnvironmentUrlsTests.swift

@@ -27,6 +27,28 @@ class EnvironmentUrlsTests: BitwardenTestCase {
         )
     }
 
+    /// `init(environmentUrlData:)` sets the URLs from the base URL which includes a trailing slash.
+    func test_init_environmentUrlData_baseUrlWithTrailingSlash() {
+        let subject = EnvironmentUrls(
+            environmentUrlData: EnvironmentUrlData(base: URL(string: "https://example.com/")!)
+        )
+        XCTAssertEqual(
+            subject,
+            EnvironmentUrls(
+                apiURL: URL(string: "https://example.com/api")!,
+                baseURL: URL(string: "https://example.com/")!,
+                eventsURL: URL(string: "https://example.com/events")!,
+                iconsURL: URL(string: "https://example.com/icons")!,
+                identityURL: URL(string: "https://example.com/identity")!,
+                importItemsURL: URL(string: "https://example.com/#/tools/import")!,
+                recoveryCodeURL: URL(string: "https://example.com/#/recover-2fa")!,
+                sendShareURL: URL(string: "https://example.com/#/send")!,
+                settingsURL: URL(string: "https://example.com/#/settings")!,
+                webVaultURL: URL(string: "https://example.com/")!
+            )
+        )
+    }
+
     /// `init(environmentUrlData:)` sets the URLs based on the corresponding URL if there isn't a base URL.
     func test_init_environmentUrlData_custom() {
         let subject = EnvironmentUrls(