feat: align add_policy API with Golang Casbin (#398)

Author: Chimou0

casbin/async_internal_enforcer.py

@@ -117,9 +117,8 @@ async def save_policy(self):
 
     async def _add_policy(self, sec, ptype, rule):
         """async adds a rule to the current policy."""
-        rule_added = self.model.add_policy(sec, ptype, rule)
-        if not rule_added:
-            return rule_added
+        if self.model.has_policy(sec, ptype, rule):
+            return False
 
         if self.adapter and self.auto_save:
             result = await self.adapter.add_policy(sec, ptype, rule)
@@ -136,13 +135,15 @@ async def _add_policy(self, sec, ptype, rule):
                 else:
                     self.watcher.update()
 
+        rule_added = self.model.add_policy(sec, ptype, rule)
+
         return rule_added
 
     async def _add_policies(self, sec, ptype, rules):
         """async adds rules to the current policy."""
-        rules_added = self.model.add_policies(sec, ptype, rules)
-        if not rules_added:
-            return rules_added
+        for rule in rules:
+            if self.model.has_policy(sec, ptype, rule):
+                return False
 
         if self.adapter and self.auto_save:
             if hasattr(self.adapter, "add_policies") is False:
@@ -162,6 +163,8 @@ async def _add_policies(self, sec, ptype, rules):
                 else:
                     self.watcher.update()
 
+        rules_added = self.model.add_policies(sec, ptype, rules)
+
         return rules_added
 
     async def _update_policy(self, sec, ptype, old_rule, new_rule):

casbin/internal_enforcer.py

@@ -22,9 +22,8 @@ class InternalEnforcer(CoreEnforcer):
 
     def _add_policy(self, sec, ptype, rule):
         """adds a rule to the current policy."""
-        rule_added = self.model.add_policy(sec, ptype, rule)
-        if not rule_added:
-            return rule_added
+        if self.model.has_policy(sec, ptype, rule):
+            return False
 
         if self.adapter and self.auto_save:
             if self.adapter.add_policy(sec, ptype, rule) is False:
@@ -36,13 +35,15 @@ def _add_policy(self, sec, ptype, rule):
                 else:
                     self.watcher.update()
 
+        rule_added = self.model.add_policy(sec, ptype, rule)
+
         return rule_added
 
     def _add_policies(self, sec, ptype, rules):
         """adds rules to the current policy."""
-        rules_added = self.model.add_policies(sec, ptype, rules)
-        if not rules_added:
-            return rules_added
+        for rule in rules:
+            if self.model.has_policy(sec, ptype, rule):
+                return False
 
         if self.adapter and self.auto_save:
             if hasattr(self.adapter, "add_policies") is False:
@@ -57,14 +58,12 @@ def _add_policies(self, sec, ptype, rules):
                 else:
                     self.watcher.update()
 
+        rules_added = self.model.add_policies(sec, ptype, rules)
+
         return rules_added
 
     def _add_policies_ex(self, sec, ptype, rules):
         """adds rules to the current policy."""
-        rules_added = self.model.add_policies_ex(sec, ptype, rules)
-        if not rules_added:
-            return rules_added
-
         if self.adapter and self.auto_save:
             if hasattr(self.adapter, "add_policies_ex") is False:
                 return False
@@ -78,6 +77,8 @@ def _add_policies_ex(self, sec, ptype, rules):
                 else:
                     self.watcher.update()
 
+        rules_added = self.model.add_policies_ex(sec, ptype, rules)
+
         return rules_added
 
     def _update_policy(self, sec, ptype, old_rule, new_rule):