Merge pull request #398 from appwrite/fix-apple-missing-origin

Swift/Apple Header Fixes

Author: abnegate

templates/swift/Sources/Client.swift.twig

@@ -45,10 +45,8 @@ open class Client {
 
     public init() {
         http = Client.createHTTP()
-
-        #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
-        addUserAgent()
-        #endif
+        addUserAgentHeader()
+        addOriginHeader()
     }
 
     private static func createHTTP(
@@ -233,10 +231,6 @@ open class Client {
         convert: (([String: Any]) -> T)? = nil,
         completion: ((Result<T, {{ spec.title | caseUcfirst }}Error>) -> Void)? = nil
     ) {
-        self.headers.merge(headers) { (_, new) in
-            new
-        }
-
         let validParams = params.filter { $0.value != nil }
 
         let queryParameters = method == "GET" && !validParams.isEmpty
@@ -258,7 +252,10 @@ open class Client {
             return
         }
 
-        addHeaders(to: &request)
+        for (key, value) in self.headers.merging(headers, uniquingKeysWith: { $1 }) {
+            request.headers.add(name: key, value: value)
+        }
+
         request.addDomainCookies()
 
         if "GET" == method {
@@ -278,12 +275,6 @@ open class Client {
         execute(request, withSink: sink, convert: convert, completion: completion)
     }
 
-    private func addHeaders(to request: inout HTTPClient.Request) {
-        for (key, value) in self.headers {
-            request.headers.add(name: key, value: value)
-        }
-    }
-
     private func buildBody(
         for request: inout HTTPClient.Request,
         with params: [String: Any?]
@@ -534,50 +525,76 @@ open class Client {
 
         request.headers.remove(name: "content-type")
         if !chunked {
-        request.headers.add(name: "Content-Length", value: bodyBuffer.readableBytes.description)
+            request.headers.add(name: "Content-Length", value: bodyBuffer.readableBytes.description)
         }
         request.headers.add(name: "Content-Type", value: "multipart/form-data;boundary=\"\(Client.boundary)\"")
         request.body = .byteBuffer(bodyBuffer)
     }
 
-    private func addUserAgent() {
+    private func addUserAgentHeader() {
         let packageInfo = OSPackageInfo.get()
-        let deviceInfo = OSDeviceInfo()
-        var device = "";
-        var operatingSystem = ""
+        let device = Client.getDevice()
+
+        #if !os(Linux) && !os(Windows)
+        _ = addHeader(
+            key: "user-agent",
+            value: "\(packageInfo.packageName)/\(packageInfo.version) \(device)"
+        )
+        #endif
+    }
+
+    private func addOriginHeader() {
+        let packageInfo = OSPackageInfo.get()
+        let operatingSystem = Client.getOperatingSystem()
+        _ = addHeader(
+            key: "origin",
+            value: "{{ spec.title | caseLower }}-\(operatingSystem)://\(packageInfo.packageName)"
+        )
+    }
+}
 
+extension Client {
+    private static func getOperatingSystem() -> String {
         #if os(iOS)
-        let iosinfo = deviceInfo.iOSInfo
-        device = "\(iosinfo!.modelIdentifier) iOS/\(iosinfo!.systemVersion)";
-        operatingSystem = "ios"
-        #elseif os(tvOS)
-        let iosinfo = deviceInfo.iOSInfo
-        device = "\(iosinfo!.systemInfo.machine) tvOS/\(iosinfo!.systemVersion)";
-        operatingSystem = "tvos"
+        return "ios"
         #elseif os(watchOS)
-        let iosinfo = deviceInfo.iOSInfo
-        device = "\(iosinfo!.systemInfo.machine) watchOS/\(iosinfo!.systemVersion)";
-        operatingSystem = "watchos"
+        return "watchos"
+        #elseif os(tvOS)
+        return "tvos"
         #elseif os(macOS)
-        let macinfo = deviceInfo.macOSInfo
-        device = "(Macintosh; \(macinfo!.model))"
-        operatingSystem = "macos"
+        return "macos"
         #elseif os(Linux)
-        let lininfo = deviceInfo.linuxInfo
-        device = "(Linux; U; \(lininfo!.id) \(lininfo!.version))"
-        operatingSystem = "linux"
+        return "linux"
         #elseif os(Windows)
-        let wininfo = deviceInfo.windowsInfo
-        device = "(Windows NT; \(wininfo!.computerName))"
-        operatingSystem = "windows"
+        return "windows"
         #endif
+    }
 
-        #if !os(Linux) && !os(Windows)
-        _ = addHeader(
-            key: "user-agent",
-            value: "\(packageInfo.packageName)/\(packageInfo.version) \(device)"
-        )
+    private static func getDevice() -> String {
+        let deviceInfo = OSDeviceInfo()
+        var device = ""
+
+        #if os(iOS)
+        let info = deviceInfo.iOSInfo
+        device = "\(info!.modelIdentifier) iOS/\(info!.systemVersion)"
+        #elseif os(watchOS)
+        let info = deviceInfo.watchOSInfo
+        device = "\(info!.systemInfo.machine) watchOS/\(info!.systemVersion)"
+        #elseif os(tvOS)
+        let info = deviceInfo.tvOSInfo
+        device = "\(info!.systemInfo.machine) tvOS/\(info!.systemVersion)"
+        #elseif os(macOS)
+        let info = deviceInfo.macOSInfo
+        device = "(Macintosh; \(info!.model))"
+        #elseif os(Linux)
+        let info = deviceInfo.linuxInfo
+        device = "(Linux; U; \(info!.id) \(info!.version))"
+        #elseif os(Windows)
+        let info = deviceInfo.windowsInfo
+        device = "(Windows NT; \(info!.computerName))"
         #endif
+
+        return device
     }
 }
 

templates/swift/Sources/PackageInfo/Linux/PackageInfo+Linux.swift

@@ -6,19 +6,18 @@ extension PackageInfo {
         let version = getVersionJson()
 
         return PackageInfo(
-            appName: version["app_name"] as! String,
-            version: version["version"] as! String,
-            buildNumber: version["build_number"] as! String,
-            packageName: "",
-            buildSignature: ""
+            appName: version?["appName"] as? String ?? "",
+            version: version?["version"] as? String ?? "",
+            buildNumber: version?["buildNumber"] as? String ?? "",
+            packageName: version?["packageName"] as? String ?? "",
+            buildSignature: version?["buildSignature"] as? String ?? ""
         )
     }
 
-    private static func getVersionJson() -> [String: Any] {
+    private static func getVersionJson() -> [String: Any]? {
         let exePath = URL(fileURLWithPath: "/proc/self/exe").resolvingSymlinksInPath()
         let appPath = exePath.deletingLastPathComponent()
         let jsonPath = appPath.appendingPathComponent("version.json")
-        return try! JSONSerialization
-            .jsonObject(with: Data(contentsOf: jsonPath)) as! [String: Any]
+        return try? JSONSerialization.jsonObject(with: Data(contentsOf: jsonPath)) as? [String: Any]
     }
 }

templates/swift/Sources/PackageInfo/Windows/PackageInfo+Windows.swift

@@ -1,13 +1,22 @@
 import Foundation
 
-class WindowsPackageInfo : PackageInfo {
+extension PackageInfo {
 
     public static func getWindowsPackage() -> PackageInfo {
-        return WindowsPackageInfo(
-            appName: "",
-            version: "",
-            buildNumber: "",
-            packageName: ""
+        let version = getVersionJson()
+        return PackageInfo(
+            appName: version?["appName"] as? String ?? "",
+            version: version?["version"] as? String ?? "",
+            buildNumber: version?["buildNumber"] as? String ?? "",
+            packageName: version?["packageName"] as? String ?? "",
+            buildSignature: version?["buildSignature"] as? String ?? ""
         )
     }
+
+    private static func getVersionJson() -> [String: Any]? {
+        let exePath = URL(fileURLWithPath: "/proc/self/exe").resolvingSymlinksInPath()
+        let appPath = exePath.deletingLastPathComponent()
+        let jsonPath = appPath.appendingPathComponent("version.json")
+        return try? JSONSerialization.jsonObject(with: Data(contentsOf: jsonPath)) as? [String: Any]
+    }
 }