Switch to 443 port

Author: LaurentTreguier

Fyreplace.xcodeproj/project.pbxproj

@@ -738,7 +738,10 @@
 				FYREPLACE_API_HOST_DEV = dev.api.fyreplace.app;
 				FYREPLACE_API_HOST_LOCAL = localhost;
 				FYREPLACE_API_HOST_MAIN = api.fyreplace.app;
-				FYREPLACE_API_PORT = 50051;
+				FYREPLACE_API_PORT_DEFAULT_KEY = FPApiPortLocal;
+				FYREPLACE_API_PORT_DEV = 443;
+				FYREPLACE_API_PORT_LOCAL = 50051;
+				FYREPLACE_API_PORT_MAIN = 443;
 				FYREPLACE_LINK_HOSTS = "fyreplace.app;fyreplace.link";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = FyreplaceLegacy/Config/Info.plist;
@@ -780,7 +783,10 @@
 				FYREPLACE_API_HOST_DEV = dev.api.fyreplace.app;
 				FYREPLACE_API_HOST_LOCAL = localhost;
 				FYREPLACE_API_HOST_MAIN = api.fyreplace.app;
-				FYREPLACE_API_PORT = 50051;
+				FYREPLACE_API_PORT_DEFAULT_KEY = FPApiPortMain;
+				FYREPLACE_API_PORT_DEV = 443;
+				FYREPLACE_API_PORT_LOCAL = 50051;
+				FYREPLACE_API_PORT_MAIN = 443;
 				FYREPLACE_LINK_HOSTS = "fyreplace.app;fyreplace.link";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = FyreplaceLegacy/Config/Info.plist;

FyreplaceLegacy/Sources/Extensions/Bundle.swift

@@ -6,14 +6,18 @@ extension Bundle {
     static let apiHostLocalKey = "FPApiHostLocal"
     static let apiHostDevKey = "FPApiHostDev"
     static let apiHostMainKey = "FPApiHostMain"
-    static let apiPortKey = "FPApiPort"
+    static let apiPortLocalKey = "FPApiPortLocal"
+    static let apiPortDevKey = "FPApiPortDev"
+    static let apiPortMainKey = "FPApiPortMain"
 
     var bundleVersion: String { getString(Self.bundleVersionKey) }
     var apiDefaultHostKey: String { getString(Self.apiHostDefaultKeyKey) }
     var apiHostLocal: String { getString(Self.apiHostLocalKey) }
     var apiHostDev: String { getString(Self.apiHostDevKey) }
     var apiHostMain: String { getString(Self.apiHostMainKey) }
-    var apiPort: Int { getInteger(Self.apiPortKey) }
+    var apiPortLocal: Int { getInteger(Self.apiPortLocalKey) }
+    var apiPortDev: Int { getInteger(Self.apiPortDevKey) }
+    var apiPortMain: Int { getInteger(Self.apiPortMainKey) }
 
     func getString(_ key: String) -> String {
         return Bundle.main.infoDictionary![key] as! String

FyreplaceLegacy/Sources/gRPC/Rpc.swift

@@ -28,9 +28,15 @@ class Rpc: NSObject {
     private func makeChannel() -> ClientConnection {
         let hostKey = UserDefaults.standard.string(forKey: "app:environment") ?? Bundle.main.apiDefaultHostKey
         let host = Bundle.main.getString(hostKey)
+        let port = switch host {
+        case Bundle.main.apiHostLocal: Bundle.main.apiPortLocal
+        case Bundle.main.apiHostDev: Bundle.main.apiPortDev
+        case Bundle.main.apiHostMain: Bundle.main.apiPortMain
+        default: 0
+        }
         let builder = host == Bundle.main.apiHostLocal
             ? ClientConnection.insecure(group: group)
             : ClientConnection.usingPlatformAppropriateTLS(for: group)
-        return builder.connect(host: host, port: Bundle.main.apiPort)
+        return builder.connect(host: host, port: port)
     }
 }