Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed social login routes

Browse Source 
Fixes #239
This commit is contained in:
Dan Brown 2016-11-27 19:11:15 +00:00
parent 0fb1fc87c8
commit c403d05755
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Auth/LoginController.php
View File

@ -2,6 +2,7 @@
namespace BookStack\Http\Controllers\Auth; namespace BookStack\Http\Controllers\Auth;
use BookStack\Exceptions\AuthException;
use BookStack\Http\Controllers\Controller; use BookStack\Http\Controllers\Controller;
use BookStack\Repos\UserRepo; use BookStack\Repos\UserRepo;
use BookStack\Services\SocialAuthService; use BookStack\Services\SocialAuthService;

3
app/Http/Controllers/Auth/RegisterController.php
View File

@ -51,7 +51,7 @@ class RegisterController extends Controller
*/ */
public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo) public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
{ {
$this->middleware('guest'); $this->middleware('guest')->except(['socialCallback', 'detachSocialAccount']);
$this->socialAuthService = $socialAuthService; $this->socialAuthService = $socialAuthService;
$this->emailConfirmationService = $emailConfirmationService; $this->emailConfirmationService = $emailConfirmationService;
$this->userRepo = $userRepo; $this->userRepo = $userRepo;
@ -297,5 +297,4 @@ class RegisterController extends Controller
return $this->registerUser($userData, $socialAccount); return $this->registerUser($userData, $socialAccount);
} }
} }

2
routes/web.php
View File

@ -153,7 +153,7 @@ Route::group(['middleware' => 'auth'], function () {
}); });
// Social auth routes // Social auth routes
Route::get('/login/service/{socialDriver}', 'Auth\RegisterController@getSocialLogin'); Route::get('/login/service/{socialDriver}', 'Auth\LoginController@getSocialLogin');
Route::get('/login/service/{socialDriver}/callback', 'Auth\RegisterController@socialCallback'); Route::get('/login/service/{socialDriver}/callback', 'Auth\RegisterController@socialCallback');
Route::get('/login/service/{socialDriver}/detach', 'Auth\RegisterController@detachSocialAccount'); Route::get('/login/service/{socialDriver}/detach', 'Auth\RegisterController@detachSocialAccount');
Route::get('/register/service/{socialDriver}', 'Auth\RegisterController@socialRegister'); Route::get('/register/service/{socialDriver}', 'Auth\RegisterController@socialRegister');