Updating the Auth Models

ARCANESOFT · Sep 24, 2016 · a4bd787 · a4bd787
1 parent c6081b4
commit a4bd787
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 16 deletions.
diff --git a/src/Models/Permission.php b/src/Models/Permission.php
@@ -21,7 +21,7 @@ class Permission extends BasePermissionModel
      */
     public function getHashedIdAttribute()
     {
-        return hasher()->encode($this->id);
+        return self::hasher()->encode($this->id);
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -39,7 +39,7 @@ public function getHashedIdAttribute()
      */
     public static function firstHashedOrFail($hashedId)
     {
-        $id = head(hasher()->decode($hashedId));
+        $id = self::hasher()->decode($hashedId);
 
         return self::where('id', $id)->firstOrFail();
     }
@@ -67,4 +67,18 @@ public function hasGroup()
     {
         return $this->group_id !== 0;
     }
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Other Functions
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Get the hasher.
+     *
+     * @return \Arcanedev\Hasher\Contracts\HashManager
+     */
+    protected static function hasher()
+    {
+        return hasher();
+    }
 }
diff --git a/src/Models/PermissionsGroup.php b/src/Models/PermissionsGroup.php
@@ -23,7 +23,7 @@ class PermissionsGroup extends BasePermissionsGroupModel
      */
     public function getHashedIdAttribute()
     {
-        return hasher()->encode($this->id);
+        return self::hasher()->encode($this->id);
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -41,8 +41,22 @@ public function getHashedIdAttribute()
      */
     public static function firstHashedOrFail($hashedId)
     {
-        $id = head(hasher()->decode($hashedId));
+        $id = self::hasher()->decode($hashedId);
 
         return self::where('id', $id)->firstOrFail();
     }
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Other Functions
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Get the hasher.
+     *
+     * @return \Arcanedev\Hasher\Contracts\HashManager
+     */
+    protected static function hasher()
+    {
+        return hasher();
+    }
 }
diff --git a/src/Models/Role.php b/src/Models/Role.php
@@ -9,8 +9,9 @@
  * @package  Arcanesoft\Auth\Models
  * @author   ARCANEDEV <[email protected]>
  *
- * @method static \Illuminate\Database\Eloquent\Builder  admins()
- * @method static \Illuminate\Database\Eloquent\Builder  members()
+ * @method static \Illuminate\Database\Eloquent\Builder  admin()
+ * @method static \Illuminate\Database\Eloquent\Builder  moderator()
+ * @method static \Illuminate\Database\Eloquent\Builder  member()
  */
 class Role extends BaseRoleModel
 {
@@ -33,7 +34,7 @@ class Role extends BaseRoleModel
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeAdmins(Builder $query)
+    public function scopeAdmin(Builder $query)
     {
         return $query->where('slug', Role::ADMINISTRATOR);
     }
@@ -57,7 +58,7 @@ public function scopeModerator(Builder $query)
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeMembers(Builder $query)
+    public function scopeMember(Builder $query)
     {
         return $query->where('slug', Role::MEMBER);
     }
@@ -73,7 +74,7 @@ public function scopeMembers(Builder $query)
      */
     public function getHashedIdAttribute()
     {
-        return hasher()->encode($this->id);
+        return self::hasher()->encode($this->id);
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -91,7 +92,7 @@ public function getHashedIdAttribute()
      */
     public static function firstHashedOrFail($hashedId)
     {
-        $id = head(hasher()->decode($hashedId));
+        $id = self::hasher()->decode($hashedId);
 
         return self::where('id', $id)->firstOrFail();
     }
@@ -105,4 +106,18 @@ public function makeSlugName($value)
     {
         return $this->slugify($value);
     }
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Other Functions
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Get the hasher.
+     *
+     * @return \Arcanedev\Hasher\Contracts\HashManager
+     */
+    protected static function hasher()
+    {
+        return hasher();
+    }
 }
diff --git a/src/Models/User.php b/src/Models/User.php
@@ -23,7 +23,7 @@ class User extends BaseUserModel
      */
     public function getHashedIdAttribute()
     {
-        return hasher()->encode($this->id);
+        return self::hasher()->encode($this->id);
     }
 
     /**
@@ -33,7 +33,7 @@ public function getHashedIdAttribute()
      */
     public function getFullNameAttribute()
     {
-        $fullName = trim($this->first_name . ' ' . $this->last_name);
+        $fullName = trim("{$this->first_name} {$this->last_name}");
 
         return empty($fullName) ? $this->username : $fullName;
     }
@@ -77,11 +77,9 @@ public function getSinceDateAttribute()
      */
     public static function firstHashedOrFail($hashedId)
     {
-        $id = head(hasher()->decode($hashedId));
+        $id = self::hasher()->decode($hashedId);
 
-        return self::withTrashed()
-            ->where('id', $id)
-            ->firstOrFail();
+        return self::withTrashed()->where('id', $id)->firstOrFail();
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -117,4 +115,18 @@ public function isMember()
     {
         return $this->hasRoleSlug(Role::MEMBER);
     }
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Other Functions
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Get the hasher.
+     *
+     * @return \Arcanedev\Hasher\Contracts\HashManager
+     */
+    protected static function hasher()
+    {
+        return hasher();
+    }
 }