Force https for jetpack sites (#16279)

Author: adborbas

Modules/Sources/Networking/Model/Site.swift

@@ -333,6 +333,19 @@ public enum SiteVisibility: Int, Codable, GeneratedFakeable {
 ///
 public extension Site {
 
+    private var jetpackCanonicalURL: String {
+        guard let originalURL = URL(string: url),
+              originalURL.scheme?.lowercased() == "http"
+        else {
+            return url
+        }
+
+        var components = URLComponents(url: originalURL, resolvingAgainstBaseURL: false)
+        components?.scheme = "https"
+
+        return components?.string ?? url
+    }
+
     /// Returns the TimeZone using the gmtOffset
     ///
     var siteTimezone: TimeZone {
@@ -347,7 +360,7 @@ public extension Site {
     }
 
     func toJetpackSite() -> JetpackSite {
-        JetpackSite(siteID: siteID, siteAddress: url, applicationPasswordAvailable: applicationPasswordAvailable)
+        JetpackSite(siteID: siteID, siteAddress: jetpackCanonicalURL, applicationPasswordAvailable: applicationPasswordAvailable)
     }
 }
 

Modules/Tests/NetworkingTests/Model/SiteTests.swift

@@ -0,0 +1,28 @@
+import Foundation
+import Testing
+@testable import Networking
+@testable import NetworkingCore
+
+struct SiteTests {
+
+    @Test(arguments: [
+        "http://awesomesite.com",
+        "http://awesomesite.com/",
+        "http://awesomesite.whatever.com",
+        "HTTP://awesomesite.com",
+        "http://192.168.0.12",
+        "https://awesomesite.com"
+    ])
+    private func forcingHttpsForJetpack(siteAddress: String) {
+        let site = Site.defaultMock().copy(url: siteAddress)
+        let jetpack = site.toJetpackSite()
+
+        #expect(jetpack.siteAddress.isHttpsScheme)
+    }
+}
+
+fileprivate extension String {
+    var isHttpsScheme: Bool {
+        return URL(string: self)?.scheme?.lowercased() == "https"
+    }
+}

RELEASE-NOTES.txt

@@ -3,7 +3,7 @@
 
 23.6
 -----
-
+- [*] Handle sites configured with `http` siteAddress.
 
 23.5
 -----