refactor: use GroupModel::isValidGroup()

codeigniter4 · Aug 20, 2024 · 7ae3ff5 · 7ae3ff5
1 parent e79bf78
commit 7ae3ff5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 27 deletions.
diff --git a/src/Authorization/Traits/Authorizable.php b/src/Authorization/Traits/Authorizable.php
@@ -43,8 +43,11 @@ public function addGroup(string ...$groups): self
                 continue;
             }
 
+            /** @var GroupModel $groupModel */
+            $groupModel = model(GroupModel::class);
+
             // make sure it's a valid group
-            if (! $this->isValidGroup($group)) {
+            if (! $groupModel->isValidGroup($group)) {
                 throw AuthorizationException::forUnknownGroup($group);
             }
 
@@ -59,18 +62,6 @@ public function addGroup(string ...$groups): self
         return $this;
     }
 
-    /**
-     * @TODO duplicate of UserModel::isValidGroup()
-     *
-     * @param non-empty-string $group
-     */
-    private function isValidGroup(string $group): bool
-    {
-        $allowedGroups = array_keys(setting('AuthGroups.groups'));
-
-        return (bool) (in_array($group, $allowedGroups, true));
-    }
-
     /**
      * Removes one or more groups from the user.
      *
@@ -106,8 +97,11 @@ public function syncGroups(string ...$groups): self
     {
         $this->populateGroups();
 
+        /** @var GroupModel $groupModel */
+        $groupModel = model(GroupModel::class);
+
         foreach ($groups as $group) {
-            if (! $this->isValidGroup($group)) {
+            if (! $groupModel->isValidGroup($group)) {
                 throw AuthorizationException::forUnknownGroup($group);
             }
         }

diff --git a/src/Models/UserModel.php b/src/Models/UserModel.php
@@ -155,25 +155,16 @@ public function addToDefaultGroup(User $user): void
     {
         $defaultGroup = setting('AuthGroups.defaultGroup');
 
-        if (empty($defaultGroup) || ! $this->isValidGroup($defaultGroup)) {
+        /** @var GroupModel $groupModel */
+        $groupModel = model(GroupModel::class);
+
+        if (empty($defaultGroup) || ! $groupModel->isValidGroup($defaultGroup)) {
             throw new InvalidArgumentException(lang('Auth.unknownGroup', [$defaultGroup ?? '--not found--']));
         }
 
         $user->addGroup($defaultGroup);
     }
 
-    /**
-     * @TODO duplicate of Authorizable::isValidGroup()
-     *
-     * @param non-empty-string $group
-     */
-    private function isValidGroup(string $group): bool
-    {
-        $allowedGroups = array_keys(setting('AuthGroups.groups'));
-
-        return (bool) (in_array($group, $allowedGroups, true));
-    }
-
     public function fake(Generator &$faker): User
     {
         $this->checkReturnType();