@capacitor/ios 3.5.1 → 3.6.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.6.0](https://github.com/ionic-team/capacitor/compare/3.5.1...3.6.0) (2022-06-17)
+
+
+### Bug Fixes
+
+* **ios:** Use `URL(fileURLWithPath:)` instead of `URL(string:)` ([#5603](https://github.com/ionic-team/capacitor/issues/5603)) ([5fac1b2](https://github.com/ionic-team/capacitor/commit/5fac1b2da5aa5882087716cb2aa862d89173f4a1))
+
+
+### Features
+
+* **iOS, Android:** add AppUUID Lib for plugins ([#5690](https://github.com/ionic-team/capacitor/issues/5690)) ([05e76cf](https://github.com/ionic-team/capacitor/commit/05e76cf526a44e07fa75f9482fa2223a13918638))
+
+
+
+
+
 ## [3.5.1](https://github.com/ionic-team/capacitor/compare/3.5.0...3.5.1) (2022-05-04)
 
 **Note:** Version bump only for package @capacitor/ios

package/Capacitor/Capacitor/AppUUID.swift

@@ -0,0 +1,53 @@
+import CommonCrypto
+import Foundation
+
+private func hexString(_ iterator: Array<UInt8>.Iterator) -> String {
+    return iterator.map { String(format: "%02x", $0) }.joined()
+}
+
+extension Data {
+    public var sha256: String {
+        var digest = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
+        self.withUnsafeBytes { bytes in
+            _ = CC_SHA256(bytes.baseAddress, CC_LONG(self.count), &digest)
+        }
+        return hexString(digest.makeIterator())
+    }
+}
+
+public class AppUUID {
+    private static let key: String = "CapacitorAppUUID"
+
+    public static func getAppUUID() -> String {
+        assertAppUUID()
+        return readUUID()
+    }
+
+    public static func regenerateAppUUID() {
+        let uuid = generateUUID()
+        writeUUID(uuid)
+    }
+
+    private static func assertAppUUID() {
+        let uuid = readUUID()
+        if uuid == "" {
+            regenerateAppUUID()
+        }
+    }
+
+    private static func generateUUID() -> String {
+        let uuid: String = UUID.init().uuidString
+        return uuid.data(using: .utf8)!.sha256
+    }
+
+    private static func readUUID() -> String {
+        let defaults = UserDefaults.standard
+        return defaults.string(forKey: key) ?? ""
+    }
+
+    private static func writeUUID(_ uuid: String) {
+        let defaults = UserDefaults.standard
+        defaults.set(uuid, forKey: key)
+    }
+
+}

package/Capacitor/Capacitor/Router.swift

@@ -10,18 +10,20 @@ import Foundation
 
 public protocol Router {
     func route(for path: String) -> String
+    var basePath: String { get set }
 }
 
 // swiftlint:disable:next type_name
 internal struct _Router: Router {
+    var basePath: String = ""
     func route(for path: String) -> String {
-        let pathUrl = URL(string: path)
+        let pathUrl = URL(fileURLWithPath: path)
        
-        // if the pathUrl is null, then it is an invalid url (meaning it is empty or just plain invalid) then we want to route to /index.html
-        if pathUrl?.pathExtension.isEmpty ?? true {
-            return "/index.html"
+        // If there's no path extension it also means the path is empty or a SPA route
+        if pathUrl.pathExtension.isEmpty {
+            return basePath + "/index.html"
         }
         
-        return path
+        return basePath + path
     }
 }

package/Capacitor/Capacitor/WebViewAssetHandler.swift

@@ -3,8 +3,7 @@ import MobileCoreServices
 
 @objc(CAPWebViewAssetHandler)
 internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
-    private let router: Router
-    private var basePath: String = ""
+    private var router: Router
     
     init(router: Router) {
         self.router = router
@@ -12,19 +11,18 @@ internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
     }
 
     func setAssetPath(_ assetPath: String) {
-        self.basePath = assetPath
+        router.basePath = assetPath
     }
 
     func webView(_ webView: WKWebView, start urlSchemeTask: WKURLSchemeTask) {
-        var startPath = self.basePath
+        let startPath: String
         let url = urlSchemeTask.request.url!
         let stringToLoad = url.path
         
-        let resolvedRoute = router.route(for: stringToLoad)
         if stringToLoad.starts(with: CapacitorBridge.fileStartIdentifier) {
             startPath = stringToLoad.replacingOccurrences(of: CapacitorBridge.fileStartIdentifier, with: "")
         } else {
-            startPath.append(resolvedRoute)
+            startPath = router.route(for: stringToLoad)
         }
         
         let localUrl = URL.init(string: url.absoluteString)!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -24,10 +24,10 @@
     "xc:build:CapacitorCordova": "cd CapacitorCordova && xcodebuild && cd .."
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.5.0"
+    "@capacitor/core": "^3.6.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "009064dbf01cbc5900bbc16053b6d7535ad4c2b4"
+  "gitHead": "1e06a199a44bb5321f0fb48b5fbca961cc1dbb50"
 }