add user-agent header. closes #242

amahi · Jul 2, 2020 · 5de9127 · 5de9127
1 parent 1c71a76
commit 5de9127
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/AmahiAnywhere/AmahiAnywhere/Utils/Network.swift b/AmahiAnywhere/AmahiAnywhere/Utils/Network.swift
@@ -16,13 +16,33 @@ public class Network {
 
     static let shared = Network()
 
+    //eg. iOS/10_1
+       func deviceVersion() -> String {
+           let currentDevice = UIDevice.current
+           return "\(currentDevice.systemName)/\(currentDevice.systemVersion)"
+       }
+       //eg. iPhone5,2
+       func deviceName() -> String {
+           var sysinfo = utsname()
+           uname(&sysinfo)
+           return String(bytes: Data(bytes: &sysinfo.machine, count: Int(_SYS_NAMELEN)), encoding: .ascii)!.trimmingCharacters(in: .controlCharacters)
+       }
+       //eg. MyApp/1
+       func appNameAndVersion() -> String {
+           let dictionary = Bundle.main.infoDictionary!
+           let version = dictionary["CFBundleShortVersionString"] as! String
+           let name = dictionary["CFBundleName"] as! String
+           return "\(name)/\(version)"
+       }
+
     private func getDefaultHeaders() -> HTTPHeaders {
         return [
-            "Accept": "application/json"
-            // TODO: Add User-Agent header
+            "Accept": "application/json",
+            "User-Agent": "\(appNameAndVersion()) \(deviceName()) \(deviceVersion())"
         ]
     }
 
+
     private func getFinalHeaders(_ headers: HTTPHeaders) -> HTTPHeaders {
         var finalHeaders = getDefaultHeaders()
         for (key, value) in headers {