Merge branch 'master' into reply-like

Author: BobbyBorisov

.env.example

@@ -1,7 +1,7 @@
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://laravelio.app
+APP_URL=http://laravelio.test
 
 DB_DATABASE=homestead
 DB_USERNAME=homestead
@@ -15,4 +15,4 @@ MAIL_PASSWORD=null
 
 GITHUB_ID=
 GITHUB_SECRET=
-GITHUB_URL=http://laravelio.app/auth/github
+GITHUB_URL=http://laravelio.test/auth/github

Homestead.yaml.example

@@ -11,7 +11,7 @@ folders:
         to: /home/vagrant/Code/laravelio
 sites:
     -
-        map: laravelio.app
+        map: laravelio.test
         to: /home/vagrant/Code/laravelio/public
 databases:
     - homestead

app/Http/Controllers/Auth/GithubController.php

@@ -4,6 +4,7 @@
 
 use Auth;
 use App\User;
+use Laravel\Socialite\Two\InvalidStateException;
 use Socialite;
 use App\Social\GithubUser;
 use App\Jobs\UpdateProfile;
@@ -27,7 +28,13 @@ public function redirectToProvider()
      */
     public function handleProviderCallback()
     {
-        $socialiteUser = Socialite::driver('github')->user();
+        try {
+            $socialiteUser = Socialite::driver('github')->user();
+        } catch (InvalidStateException $exception) {
+            $this->error('errors.github_invalid_state');
+
+            return redirect()->route('login');
+        }
 
         try {
             $user = User::findByGithubId($socialiteUser->getId());

database/factories/ReplyFactory.php

@@ -4,11 +4,11 @@
 use App\Models\Reply;
 use App\Models\Thread;
 
-$factory->define(Reply::class, function (Faker\Generator $faker) {
+$factory->define(Reply::class, function (Faker\Generator $faker, array $attributes = []) {
     return [
         'body' => $faker->text(),
-        'author_id' => factory(User::class)->create()->id(),
-        'replyable_id' => factory(Thread::class)->create()->id(),
+        'author_id' => $attributes['author_id'] ?? factory(User::class)->create()->id(),
+        'replyable_id' =>  $attributes['replyable_id'] ?? factory(Thread::class)->create()->id(),
         'replyable_type' => Thread::TABLE,
         'ip' => $faker->ipv4,
     ];

database/factories/ThreadFactory.php

@@ -3,12 +3,12 @@
 use App\User;
 use App\Models\Thread;
 
-$factory->define(Thread::class, function (Faker\Generator $faker) {
+$factory->define(Thread::class, function (Faker\Generator $faker, array $attributes = []) {
     return [
         'subject' => $faker->text(20),
         'body' => $faker->text,
         'slug' => $faker->slug,
-        'author_id' => factory(User::class)->create()->id(),
+        'author_id' => $attributes['author_id'] ?? factory(User::class)->create()->id(),
         'ip' => $faker->ipv4,
     ];
 });

phpunit.xml

@@ -27,7 +27,7 @@
         <env name="CACHE_DRIVER" value="array"/>
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
-        <env name="MAIL_DRIVER" value="log"/>
+        <env name="MAIL_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
     </php>

readme.md

@@ -37,20 +37,20 @@ The following tools are required in order to start the installation.
 2. Run `composer start`
 4. Run `vagrant up`
 5. SSH into your Vagrant box, go to `/home/vagrant/Code/laravelio` and run `composer setup`
-6. Add `192.168.10.10 laravelio.app` to your computer's `/etc/hosts` file
+6. Add `192.168.10.10 laravelio.test` to your computer's `/etc/hosts` file
 7. Setup a working e-mail driver like [Mailtrap](https://mailtrap.io/)
 8. (optional) Set up Github authentication (see below)
 
-You can now visit the app in your browser by visiting [http://laravelio.app](http://laravelio.app). If you seeded the database you can login into a test account with `johndoe` & `password`.
+You can now visit the app in your browser by visiting [http://laravelio.test](http://laravelio.test). If you seeded the database you can login into a test account with `johndoe` & `password`.
 
 ### Github Authentication (optional)
 
-To get Github authentication to work locally, you'll need to [register a new OAuth application on Github](https://github.com/settings/applications/new). Use `http://lio.app` for the homepage url and `http://lio.app/auth/github` for the callback url. When you've created the app, fill in the ID and secret in your `.env` file in the env variables below. You should now be able to authentication with Github.
+To get Github authentication to work locally, you'll need to [register a new OAuth application on Github](https://github.com/settings/applications/new). Use `http://laravelio.test` for the homepage url and `http://laravelio.test/auth/github` for the callback url. When you've created the app, fill in the ID and secret in your `.env` file in the env variables below. You should now be able to authentication with Github.
 
 ```
 GITHUB_ID=
 GITHUB_SECRET=
-GITHUB_URL=http://laravelio.app/auth/github
+GITHUB_URL=http://laravelio.test/auth/github
 ```
 
 ## Maintainers

resources/lang/en/errors.php

@@ -5,6 +5,7 @@
     'banned' => 'This account is banned.',
     'fields' => 'Something went wrong. Please review the fields below.',
     'unconfirmed' => '<a href="'.route('email.send_confirmation').'" class="alert-link">Please confirm your email address first.</a>',
+    'github_invalid_state' => 'The request timed out. Please try again.',
     'github_account_too_young' => 'Your Github account needs to be older than 2 weeks in order to register.',
 
 ];

routes/web.php

@@ -14,7 +14,6 @@
 
     // Registration
     Route::get('register', ['as' => 'register', 'uses' => 'RegisterController@showRegistrationForm']);
-    Route::get('signup', 'RegisterController@redirectToRegistrationForm'); // BC for old links
     Route::post('register', ['as' => 'register.post', 'uses' => 'RegisterController@register']);
 
     // Password reset