refactor(acl): drop Group class and use an unique user bucket

src/Helpers/helpers.php

@@ -72,7 +72,7 @@ function human_diff($time)
      * @return string
      * @throws \Seat\Services\Exceptions\EveImageException
      */
-    function img(string $type, string $variation, $id, int $size, array $attr, $lazy = true)
+    function img(string $type, string $variation, $id, int $size, array $attr = [], $lazy = true)
     {
 
         $image = (new \Seat\Services\Image\Eve($type, $variation, (int) $id, $size, $attr, $lazy))

src/Image/Eve.php

@@ -82,7 +82,7 @@ class Eve
      * @param bool $lazy
      * @throws \Seat\Services\Exceptions\EveImageException
      */
-    public function __construct(string $type, string $variation, int $id, int $size, array $attr, bool $lazy = true)
+    public function __construct(string $type, string $variation, int $id, int $size, array $attr = [], bool $lazy = true)
     {
 
         // Validate the arguments
@@ -209,8 +209,6 @@ public function html()
      */
     public function url($size)
     {
-
         return sprintf('%s/%s/%d/%s?size=%d', $this->img_server, $this->type, $this->id, $this->variation, $size);
-
     }
 }

src/Repositories/Configuration/UserRespository.php

@@ -61,7 +61,7 @@ public function getAllFullUsers() : Builder
     public function getFullUser($user_id)
     {
 
-        return UserModel::with('group', 'group.users', 'group.roles.permissions')
+        return UserModel::with('refresh_tokens', 'characters', 'roles.permissions')
             ->where('id', $user_id)
             ->first();
     }

src/Settings/Settings.php

@@ -82,9 +82,9 @@ public static function get($name, $for_id = null)
             $value = (new static::$model);
 
             // If we are not in the global scope, add a constraint
-            // to be user group specific.
+            // to be user user specific.
             if (static::$scope != 'global')
-                $value = $value->where('group_id', self::get_affected_id($for_id));
+                $value = $value->where('user_id', self::get_affected_id($for_id));
 
             // Retrieve the value
             $value = $value->where('name', $name)
@@ -118,7 +118,7 @@ public static function get_key_prefix($name, $for_id = null)
         if (is_null(static::$prefix))
             throw new SettingException('No prefix defined. Have you extended and declared $prefix?');
 
-        // Prefix user keys with group_id
+        // Prefix user keys with user_id
         if (static::$scope != 'global')
             return implode('.', [$for_id, static::$prefix, $name]);
 
@@ -127,7 +127,7 @@ public static function get_key_prefix($name, $for_id = null)
     }
 
     /**
-     * Determine the effected group id.
+     * Determine the effected user id.
      *
      * If this is for a specific id use that, otherwise
      * assume the currently logged in user's id. If we
@@ -146,7 +146,7 @@ public static function get_affected_id($for_id)
             return $for_id;
 
         if (is_null($for_id))
-            return auth()->user()->group->id;
+            return auth()->user()->id;
 
         return $for_id;
     }
@@ -165,9 +165,9 @@ public static function set($name, $value, $for_id = null)
         $db = (new static::$model);
 
         // If we are not in the global scope, add a constraint
-        // to be user group specific.
+        // to be user specific.
         if (static::$scope != 'global')
-            $db = $db->where('group_id', self::get_affected_id($for_id));
+            $db = $db->where('user_id', self::get_affected_id($for_id));
 
         // Retrieve the value
         $db = $db->where('name', $name)
@@ -189,7 +189,7 @@ public static function set($name, $value, $for_id = null)
         // Again, if we are not in the global context, then
         // we need to constrain this setting to a user.
         if (static::$scope != 'global')
-            $db->group_id = self::get_affected_id($for_id);
+            $db->user_id = self::get_affected_id($for_id);
 
         $db->save();