From 4a4b5e05576c68b382e5a6b19638da785cc81c45 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Sun, 24 May 2015 22:09:13 +0200
Subject: Using email as id; User & PasswordReminder

---
 .../BotleaguesApi/ActivationCodeAuthenticationProvider.php           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/CamilStaps/BotleaguesApi/ActivationCodeAuthenticationProvider.php')

diff --git a/src/CamilStaps/BotleaguesApi/ActivationCodeAuthenticationProvider.php b/src/CamilStaps/BotleaguesApi/ActivationCodeAuthenticationProvider.php
index 049dfc4..3fe3ee0 100644
--- a/src/CamilStaps/BotleaguesApi/ActivationCodeAuthenticationProvider.php
+++ b/src/CamilStaps/BotleaguesApi/ActivationCodeAuthenticationProvider.php
@@ -31,10 +31,9 @@ class ActivationCodeAuthenticationProvider implements Provider {
      */
     public function authenticate(Request $request, Route $route) {
         $user = User::findOrFail($request->route('user'));
-        $passwordReminder = PasswordReminder::find($request->route('password_reminder'));
+        $passwordReminder = PasswordReminder::findOrFail($request->route('password_reminder'));
 
-        if (!empty($user) && !empty($passwordReminder) && $passwordReminder->userId == $user->id) {
-            $passwordReminder->useToken();
+        if (!empty($user) && !empty($passwordReminder) && $passwordReminder->userId == $user->id && $passwordReminder->isValid()) {
             Auth::login($user);
             return Auth::user();
         }
-- 
cgit v1.2.3