refactor: extract isValidGroup()

Author: kenjis

src/Authorization/Traits/Authorizable.php

@@ -33,8 +33,6 @@ public function addGroup(string ...$groups): self
     {
         $this->populateGroups();
 
-        $configGroups = $this->getConfigGroups();
-
         $groupCount = count($this->groupCache);
 
         foreach ($groups as $group) {
@@ -46,7 +44,7 @@ public function addGroup(string ...$groups): self
             }
 
             // make sure it's a valid group
-            if (! in_array($group, $configGroups, true)) {
+            if (! $this->isValidGroup($group)) {
                 throw AuthorizationException::forUnknownGroup($group);
             }
 
@@ -61,6 +59,18 @@ 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.
      *
@@ -96,10 +106,8 @@ public function syncGroups(string ...$groups): self
     {
         $this->populateGroups();
 
-        $configGroups = $this->getConfigGroups();
-
         foreach ($groups as $group) {
-            if (! in_array($group, $configGroups, true)) {
+            if (! $this->isValidGroup($group)) {
                 throw AuthorizationException::forUnknownGroup($group);
             }
         }
@@ -398,14 +406,6 @@ private function saveGroupsOrPermissions(string $type, $model, array $cache): vo
         }
     }
 
-    /**
-     * @return list<string>
-     */
-    private function getConfigGroups(): array
-    {
-        return array_keys(setting('AuthGroups.groups'));
-    }
-
     /**
      * @return list<string>
      */

src/Models/UserModel.php

@@ -153,16 +153,27 @@ private function assignIdentities(array $data, array $identities): array
      */
     public function addToDefaultGroup(User $user): void
     {
-        $defaultGroup  = setting('AuthGroups.defaultGroup');
-        $allowedGroups = array_keys(setting('AuthGroups.groups'));
+        $defaultGroup = setting('AuthGroups.defaultGroup');
 
-        if (empty($defaultGroup) || ! in_array($defaultGroup, $allowedGroups, true)) {
+        if (empty($defaultGroup) || ! $this->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();