Fix auth and password resetting

Author: duxet

src/Jenssegers/Mongodb/Auth/DatabaseReminderRepository.php

@@ -0,0 +1,41 @@
+<?php namespace Jenssegers\Mongodb\Auth;
+
+use DateTime;
+use MongoDate;
+
+class DatabaseTokenRepository extends \Illuminate\Auth\Passwords\DatabaseTokenRepository {
+
+	/**
+	 * Build the record payload for the table.
+	 *
+	 * @param  string  $email
+	 * @param  string  $token
+	 * @return array
+	 */
+	protected function getPayload($email, $token)
+	{
+		return ['email' => $email, 'token' => $token, 'created_at' => new MongoDate];
+	}
+
+	/**
+	 * Determine if the token has expired.
+	 *
+	 * @param  array  $token
+	 * @return bool
+	 */
+	protected function tokenExpired($token)
+	{
+		// Convert MongoDate to a date string.
+		if ($token['created_at'] instanceof MongoDate)
+		{
+			$date = new DateTime;
+
+			$date->setTimestamp($token['created_at']->sec);
+
+			$token['created_at'] = $date->format('Y-m-d H:i:s');
+		}
+
+		return parent::tokenExpired($token);
+	}
+
+}

src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php

@@ -0,0 +1,27 @@
+<?php namespace Jenssegers\Mongodb\Auth;
+
+use Jenssegers\Mongodb\Auth\DatabaseTokenRepository as DbRepository;
+
+class PasswordResetServiceProvider extends \Illuminate\Auth\Passwords\PasswordResetServiceProvider {
+
+	/**
+	 * Register the token repository implementation.
+	 *
+	 * @return void
+	 */
+	protected function registerTokenRepository()
+	{
+		$this->app->singleton('auth.password.tokens', function($app)
+		{
+			$connection = $app['db']->connection();
+			// The database token repository is an implementation of the token repository
+			// interface, and is responsible for the actual storing of auth tokens and
+			// their e-mail addresses. We will inject this table and hash key to it.
+			$table = $app['config']['auth.password.table'];
+			$key = $app['config']['app.key'];
+			$expire = $app['config']->get('auth.password.expire', 60);
+			return new DbRepository($connection, $table, $key, $expire);
+		});
+	}
+
+}

src/Jenssegers/Mongodb/Auth/PasswordResetServiceProvider.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Auth\Passwords\PasswordBroker;
+
 class AuthTest extends TestCase {
 
     public function tearDown()
@@ -23,7 +25,10 @@ public function testAuthAttempt()
     public function testRemind()
     {
         $mailer = Mockery::mock('Illuminate\Mail\Mailer');
-        $this->app->instance('mailer', $mailer);
+        $tokens = $this->app->make('auth.password.tokens');
+        $users = $this->app['auth']->driver()->getProvider();
+
+        $broker = new PasswordBroker($tokens, $users, $mailer, '');
 
         $user = User::create(array(
             'name' => 'John Doe',
@@ -32,10 +37,10 @@ public function testRemind()
         ));
 
         $mailer->shouldReceive('send')->once();
-        Password::remind(array('email' => '[email protected]'));
+        $broker->sendResetLink(array('email' => '[email protected]'));
 
-        $this->assertEquals(1, DB::collection('password_reminders')->count());
-        $reminder = DB::collection('password_reminders')->first();
+        $this->assertEquals(1, DB::collection('password_resets')->count());
+        $reminder = DB::collection('password_resets')->first();
         $this->assertEquals('[email protected]', $reminder['email']);
         $this->assertNotNull($reminder['token']);
         $this->assertInstanceOf('MongoDate', $reminder['created_at']);
@@ -47,49 +52,14 @@ public function testRemind()
             'token' => $reminder['token']
         );
 
-        $response = Password::reset($credentials, function($user, $password)
-        {
-            $user->password = Hash::make($password);
-            $user->save();
-        });
-
-        $this->assertEquals('reminders.reset', $response);
-        $this->assertEquals(0, DB::collection('password_reminders')->count());
-    }
-
-    public function testDeprecatedRemind()
-    {
-        $mailer = Mockery::mock('Illuminate\Mail\Mailer');
-        $this->app->instance('mailer', $mailer);
-
-        $user = User::create(array(
-            'name' => 'John Doe',
-            'email' => '[email protected]',
-            'password' => Hash::make('foobar')
-        ));
-
-        $mailer->shouldReceive('send')->once();
-        Password::remind(array('email' => '[email protected]'));
-
-        DB::collection('password_reminders')->update(array('created_at' => new DateTime));
-        $reminder = DB::collection('password_reminders')->first();
-        $this->assertTrue(is_array($reminder['created_at']));
-
-        $credentials = array(
-            'email' => '[email protected]',
-            'password' => 'foobar',
-            'password_confirmation' => 'foobar',
-            'token' => $reminder['token']
-        );
-
-        $response = Password::reset($credentials, function($user, $password)
+        $response = $broker->reset($credentials, function($user, $password)
         {
-            $user->password = Hash::make($password);
+            $user->password = bcrypt($password);
             $user->save();
         });
 
-        $this->assertEquals('reminders.reset', $response);
-        $this->assertEquals(0, DB::collection('password_reminders')->count());
+        $this->assertEquals('passwords.reset', $response);
+        $this->assertEquals(0, DB::collection('password_resets')->count());
     }
 
 }

src/Jenssegers/Mongodb/Auth/ReminderServiceProvider.php

@@ -11,7 +11,7 @@ protected function getPackageProviders()
     {
         return array(
             'Jenssegers\Mongodb\MongodbServiceProvider',
-            'Jenssegers\Mongodb\Auth\ReminderServiceProvider',
+            'Jenssegers\Mongodb\Auth\PasswordResetServiceProvider',
         );
     }
 
@@ -36,7 +36,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('database.connections.mysql', $config['connections']['mysql']);
         $app['config']->set('database.connections.mongodb', $config['connections']['mongodb']);
 
-        // overwrite cache configuration
+        $app['config']->set('auth.model', 'User');
         $app['config']->set('cache.driver', 'array');
     }
 

tests/AuthTest.php

@@ -2,14 +2,14 @@
 
 use Jenssegers\Mongodb\Model as Eloquent;
 
-use Illuminate\Auth\UserTrait;
-use Illuminate\Auth\UserInterface;
-use Illuminate\Auth\Reminders\RemindableTrait;
-use Illuminate\Auth\Reminders\RemindableInterface;
+use Illuminate\Auth\Authenticatable;
+use Illuminate\Auth\Passwords\CanResetPassword;
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 
-class User extends Eloquent implements UserInterface, RemindableInterface {
+class User extends Eloquent implements AuthenticatableContract, CanResetPasswordContract  {
 
-    use UserTrait, RemindableTrait;
+    use Authenticatable, CanResetPassword;
 
 	protected $dates = array('birthday', 'entry.date');
 	protected static $unguarded = true;