Improvements to change/forgot password

framework/core/src/Console/SeedCommand.php

@@ -41,8 +41,8 @@ class SeedCommand extends Command
      */
     public function fire()
     {
-        $this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\DiscussionsTableSeeder']);
         $this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\UsersTableSeeder']);
+        $this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\DiscussionsTableSeeder']);
     }
 
     /**

framework/core/src/Core.php

@@ -11,6 +11,10 @@ class Core
 
     public static function config($key, $default = null)
     {
+        if (! static::isInstalled()) {
+            return $default;
+        }
+
         if (is_null($value = DB::table('config')->where('key', $key)->pluck('value'))) {
             $value = $default;
         }

framework/core/src/Core/Handlers/Commands/RequestPasswordResetCommandHandler.php

@@ -1,10 +1,11 @@
 <?php namespace Flarum\Core\Handlers\Commands;
 
 use Flarum\Core\Commands\RequestPasswordResetCommand;
-use Flarum\Core\Models\ResetToken;
+use Flarum\Core\Models\PasswordToken;
 use Flarum\Core\Repositories\UserRepositoryInterface;
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Flarum\Core;
 
 class RequestPasswordResetCommandHandler
 {
@@ -34,15 +35,16 @@ class RequestPasswordResetCommandHandler
             throw new ModelNotFoundException;
         }
 
-        $token = ResetToken::generate($user->id);
+        $token = PasswordToken::generate($user->id);
         $token->save();
 
         $data = [
             'username' => $user->username,
-            'url' => route('flarum.forum.resetPassword', ['token' => $token->id])
+            'url' => route('flarum.forum.resetPassword', ['token' => $token->id]),
+            'forumTitle' => Core::config('forum_title')
         ];
 
-        $this->mailer->send(['text' => 'flarum::emails.reset'], $data, function ($message) use ($user) {
+        $this->mailer->send(['text' => 'flarum::emails.resetPassword'], $data, function ($message) use ($user) {
             $message->to($user->email);
             $message->subject('Reset Your Password');
         });

framework/core/src/Core/Models/AccessToken.php

@@ -16,18 +16,28 @@ class AccessToken extends Model
      */
     public $incrementing = false;
 
+    /**
+     * The attributes that should be mutated to dates.
+     *
+     * @var array
+     */
+    protected $dates = ['created_at', 'expires_at'];
+
     /**
      * Generate an access token for the specified user.
      *
      * @param  int  $userId
+     * @param  int  $minutes
      * @return static
      */
-    public static function generate($userId)
+    public static function generate($userId, $minutes = 60)
     {
         $token = new static;
 
         $token->id = str_random(40);
         $token->user_id = $userId;
+        $token->created_at = time();
+        $token->expires_at = time() + $minutes * 60;
 
         return $token;
     }

framework/core/src/Core/Models/PasswordToken.php

@@ -1,13 +1,13 @@
 <?php namespace Flarum\Core\Models;
 
-class ResetToken extends Model
+class PasswordToken extends Model
 {
     /**
      * The table associated with the model.
      *
      * @var string
      */
-    protected $table = 'reset_tokens';
+    protected $table = 'password_tokens';
 
     /**
      * Use a custom primary key for this model.
@@ -28,6 +28,7 @@ class ResetToken extends Model
 
         $token->id = str_random(40);
         $token->user_id = $userId;
+        $token->created_at = time();
 
         return $token;
     }

framework/core/src/Forum/Actions/ResetPasswordAction.php

@@ -1,6 +1,6 @@
 <?php namespace Flarum\Forum\Actions;
 
-use Flarum\Core\Models\ResetToken;
+use Flarum\Core\Models\PasswordToken;
 use Illuminate\Http\Request;
 
 class ResetPasswordAction extends BaseAction
@@ -9,7 +9,7 @@ class ResetPasswordAction extends BaseAction
     {
         $token = array_get($routeParams, 'token');
 
-        $token = ResetToken::findOrFail($token);
+        $token = PasswordToken::findOrFail($token);
 
         return view('flarum::reset')->with('token', $token->id);
     }

framework/core/src/Forum/Actions/SavePasswordAction.php

@@ -1,6 +1,6 @@
 <?php namespace Flarum\Forum\Actions;
 
-use Flarum\Core\Models\ResetToken;
+use Flarum\Core\Models\PasswordToken;
 use Flarum\Core\Commands\EditUserCommand;
 use Illuminate\Http\Request;
 
@@ -8,7 +8,7 @@ class SavePasswordAction extends BaseAction
 {
     public function handle(Request $request, $routeParams = [])
     {
-        $token = ResetToken::findOrFail($request->get('token'));
+        $token = PasswordToken::findOrFail($request->get('token'));
 
         $password = $request->get('password');
         $confirmation = $request->get('password_confirmation');