Skip to content

Commit 0299be7

Browse files
ChristopheBtaylorotwell
authored andcommitted
Remove hardcoded fields 'id' and 'remember_token' in DatabaseUserProvider (#21749)
* Remove hardcoded field 'id' in DatabaseUserProvider * Remove hardcoded field 'remember_token' in DatabaseUserProvider
1 parent 1556b50 commit 0299be7

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/Illuminate/Auth/DatabaseUserProvider.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,12 @@ public function retrieveById($identifier)
6868
*/
6969
public function retrieveByToken($identifier, $token)
7070
{
71-
$user = $this->conn->table($this->table)->find($identifier);
71+
$user = $this->getGenericUser(
72+
$this->conn->table($this->table)->find($identifier)
73+
);
7274

73-
return $user && $user->remember_token && hash_equals($user->remember_token, $token)
74-
? $this->getGenericUser($user) : null;
75+
return $user && $user->getRememberToken() && hash_equals($user->getRememberToken(), $token)
76+
? $user : null;
7577
}
7678

7779
/**
@@ -84,8 +86,8 @@ public function retrieveByToken($identifier, $token)
8486
public function updateRememberToken(UserContract $user, $token)
8587
{
8688
$this->conn->table($this->table)
87-
->where('id', $user->getAuthIdentifier())
88-
->update(['remember_token' => $token]);
89+
->where($user->getAuthIdentifierName(), $user->getAuthIdentifier())
90+
->update([$user->getRememberTokenName() => $token]);
8991
}
9092

9193
/**

0 commit comments

Comments
 (0)