ci: remove duplicate CI workflow from fork; switch README badge to upstream 'Swift CI (Swift 6)'

Author: zamderax

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 SwiftCasbin
 ====
 
-[![CI](https://github.com/wendylabsinc/SwiftCasbin/actions/workflows/ci.yml/badge.svg)](https://github.com/wendylabsinc/SwiftCasbin/actions/workflows/ci.yml)
+[![CI](https://github.com/casbin/SwiftCasbin/actions/workflows/swift.yml/badge.svg)](https://github.com/casbin/SwiftCasbin/actions/workflows/swift.yml)
 ![Swift 6.0](https://img.shields.io/badge/Swift-6.0-orange)
 ![iOS 18+](https://img.shields.io/badge/iOS-18%2B-blue)
 ![macOS 15+](https://img.shields.io/badge/macOS-15%2B-blue)

README.md

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-extension CoreAPI {
+extension Enforcer {
     //MARK: InternalApi
     func addPolicyInternal(sec: String, ptype: String, rule: [String]) async throws -> Bool {
         let _bool = try await adapter.addPolicy(sec: sec, ptype: ptype, rule: rule)
@@ -21,7 +21,7 @@ extension CoreAPI {
         }
         let ruleAdded = model.addPolicy(sec: sec, ptype: ptype, rule: rule)
         let eventData = EventData.AddPolicy(sec, ptype, rule)
-        return try afterOperatePolicy(sec: sec, oped: ruleAdded, d: eventData, t: ruleAdded)
+        return try await afterOperatePolicy(sec: sec, oped: ruleAdded, d: eventData, t: ruleAdded)
     }
 
     func addPoliciesInternal(sec: String, ptype: String, rules: [[String]]) async throws -> Bool {
@@ -31,7 +31,7 @@ extension CoreAPI {
         }
         let rulesAdded = model.addPolicies(sec: sec, ptype: ptype, rules: rules)
         let eventData = EventData.AddPolicies(sec, ptype, rules)
-        return try afterOperatePolicy(sec: sec, oped: rulesAdded, d: eventData, t: rulesAdded)
+        return try await afterOperatePolicy(sec: sec, oped: rulesAdded, d: eventData, t: rulesAdded)
     }
 
     func removePolicyInternal(sec: String, ptype: String, rule: [String]) async throws -> Bool {
@@ -41,7 +41,7 @@ extension CoreAPI {
         }
         let ruleRemoved = model.removePolicy(sec: sec, ptype: ptype, rule: rule)
         let eventData = EventData.RemovePolicy(sec, ptype, rule)
-        return try afterOperatePolicy(sec: sec, oped: ruleRemoved, d: eventData, t: ruleRemoved)
+        return try await afterOperatePolicy(sec: sec, oped: ruleRemoved, d: eventData, t: ruleRemoved)
     }
 
     func removePoliciesInternal(sec: String, ptype: String, rules: [[String]]) async throws -> Bool {
@@ -51,7 +51,7 @@ extension CoreAPI {
         }
         let rulesRemoved = model.removePolicies(sec: sec, ptype: ptype, rules: rules)
         let eventData = EventData.RemovePolicies(sec, ptype, rules)
-        return try afterOperatePolicy(sec: sec, oped: rulesRemoved, d: eventData, t: rulesRemoved)
+        return try await afterOperatePolicy(sec: sec, oped: rulesRemoved, d: eventData, t: rulesRemoved)
     }
 
     func removeFilteredPolicyInternal(sec: String, ptype: String, fieldIndex: Int, fieldValues: [String]) async throws -> (Bool,[[String]]) {
@@ -61,19 +61,17 @@ extension CoreAPI {
         }
         let (rolesRemoved, rules) = model.removeFilteredPolicy(sec: sec, ptype: ptype, fieldIndex: fieldIndex, fieldValues: fieldValues)
         let eventData = EventData.RemoveFilteredPolicy(sec, ptype, rules)
-        return try afterOperatePolicy(sec: sec, oped: rolesRemoved, d: eventData, t: (rolesRemoved, rules))
+        return try await afterOperatePolicy(sec: sec, oped: rolesRemoved, d: eventData, t: (rolesRemoved, rules))
     }
 
-    private func afterOperatePolicy<T>(sec: String, oped: Bool, d: EventData, t: T) throws -> T {
+    private func afterOperatePolicy<T>(sec: String, oped: Bool, d: EventData, t: T) async throws -> T {
         if oped {
-            emit(e: Event.PolicyChange, d: d)
-            emit(e: Event.ClearCache, d: EventData.ClearCache)
-        }
-        if sec != "g" || !hasAutoBuildRoleLinksEnabled() {
-            return t
+            await emit(e: Event.PolicyChange, d: d)
+            await emit(e: Event.ClearCache, d: EventData.ClearCache)
         }
+        let needsBuild = hasAutoBuildRoleLinksEnabled()
+        if sec != "g" || !needsBuild { return t }
         try buildIncrementalRoleLinks(eventData: d).get()
         return t
     }
 }
-

Sources/Casbin/API/CoreAPI.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-public extension CoreAPI {
+public extension Enforcer {
     //MARK: ManagementAPI
     func addNamedPolicy(ptype: String, params: [String]) async throws -> Bool {
         try await addPolicyInternal(sec: "p", ptype: ptype, rule: params)
@@ -111,7 +111,7 @@ public extension CoreAPI {
 
 }
 
-public extension CoreAPI {
+public extension Enforcer {
     func addPolicy(params: [String]) async throws -> Bool {
         try await addNamedPolicy(ptype: "p", params: params)
     }
@@ -176,4 +176,3 @@ public extension CoreAPI {
     }
 
 }
-

Sources/Casbin/API/InternalAPI.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-public extension CoreAPI {
+public extension Enforcer {
     func addPermission(for user: String, permission: [String]) async throws -> Bool {
         var perm = permission
         perm.insert(user, at: 0)
@@ -53,17 +53,10 @@ public extension CoreAPI {
         return try await removeFilteredGroupingPolicy(fieldIndex: 0, fieldValues: params)
     }
     func getRoles(for name:String,domain:String?) -> [String] {
-        var roles:[String] = []
-        if let ast = model.getModel()["g"]?["g"] {
-            roles = ast.rm.getRoles(name: name, domain: domain)
-        }
-        return roles
+        getRoleManager().getRoles(name: name, domain: domain)
     }
     func getUsers(for name:String,domain:String?) -> [String] {
-        if let ast = model.getModel()["g"]?["g"] {
-            return ast.rm.getUsers(name: name, domain: domain)
-        }
-        return []
+        getRoleManager().getUsers(name: name, domain: domain)
     }
     func hasRole(for name:String,role:String,domain:String?) -> Bool {
         getRoles(for: name, domain: domain).contains(role)

Sources/Casbin/API/ManagementAPI.swift

@@ -32,10 +32,8 @@ extension MemoryAdapter: Adapter {
             for line in policySet {
                 let sec = line[0]
                 let ptype = line[1]
-                let rule = Array(line[1...])
-                if let ast = m.getModel()[sec]?[ptype] {
-                    ast.policy.append(rule)
-                }
+                let ruleValues = Array(line.dropFirst(2))
+                _ = m.addPolicy(sec: sec, ptype: ptype, rule: ruleValues)
             }
         }
     }
@@ -62,9 +60,8 @@ extension MemoryAdapter: Adapter {
                     }
                 }
                 if !isFiltered {
-                    if let ast = m.getModel()[sec]?[ptype] {
-                        ast.policy.append(rule)
-                    }
+                    let ruleValues = Array(rule.dropFirst())
+                    _ = m.addPolicy(sec: sec, ptype: ptype, rule: ruleValues)
                 } else {
                     filtered.withLock { $0 = true }
                 }