Add getAuthIdentifierName to Authenticable trait

illuminate · Sep 17, 2015 · d9a25bf · d9a25bf
1 parent a18938f
commit d9a25bf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/Authenticatable.php b/Authenticatable.php
@@ -4,6 +4,16 @@
 
 trait Authenticatable
 {
+    /**
+     * Get the name of the unique identifier for the user.
+     *
+     * @return string
+     */
+    public function getAuthIdentifierName()
+    {
+        return $this->getKeyName();
+    }
+
     /**
      * Get the unique identifier for the user.
      *

diff --git a/EloquentUserProvider.php b/EloquentUserProvider.php
@@ -59,7 +59,7 @@ public function retrieveByToken($identifier, $token)
         $model = $this->createModel();
 
         return $model->newQuery()
-            ->where($model->getKeyName(), $identifier)
+            ->where($model->getAuthIdentifierName(), $identifier)
             ->where($model->getRememberTokenName(), $token)
             ->first();
     }

diff --git a/GenericUser.php b/GenericUser.php
@@ -24,14 +24,26 @@ public function __construct(array $attributes)
         $this->attributes = $attributes;
     }
 
+    /**
+     * Get the name of the unique identifier for the user.
+     *
+     * @return string
+     */
+    public function getAuthIdentifierName()
+    {
+        return 'id';
+    }
+
     /**
      * Get the unique identifier for the user.
      *
      * @return mixed
      */
     public function getAuthIdentifier()
     {
-        return $this->attributes['id'];
+        $name = $this->getAuthIdentifierName();
+
+        return $this->attributes[$name];
     }
 
     /**