Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 11:14:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for logining in via web

Browse Source
This commit is contained in:
David Bomba 2019-05-22 13:43:51 +10:00
parent 1c48c51407
commit c25e2e6a6d
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,7 +191,9 @@ class LoginController extends BaseController
Auth::login($account->default_company->owner(), true); Auth::login($account->default_company->owner(), true);
return redirect($this->redirectTo); $cookie = cookie('db', $account->default_company->db);
return redirect($this->redirectTo)->withCookie($cookie);
} }

5
app/Http/Kernel.php
View File

@ -56,7 +56,10 @@ class Kernel extends HttpKernel
'db' => [ 'db' => [
\App\Http\Middleware\SetDb::class, \App\Http\Middleware\SetDb::class,
], ],
'url-db' => [ 'web_db' => [
\App\Http\Middleware\SetWebDb::class,
],
'url_db' => [
\App\Http\Middleware\UrlSetDb::class, \App\Http\Middleware\UrlSetDb::class,
] ]
]; ];

1
app/Http/Middleware/setDb.php
View File

@ -46,6 +46,7 @@ class SetDb
return response()->json(json_encode($error, JSON_PRETTY_PRINT) ,403); return response()->json(json_encode($error, JSON_PRETTY_PRINT) ,403);
} }
return $next($request); return $next($request);

4
routes/web.php
View File

@ -37,7 +37,7 @@ Route::get('auth/{provider}', 'Auth\LoginController@redirectToProvider');
* Authenticated User Routes * Authenticated User Routes
*/ */
Route::group(['middleware' => ['auth:user', 'db']], function () { Route::group(['middleware' => ['auth:user', 'web_db']], function () {
Route::resource('dashboard', 'DashboardController'); // name = (dashboard. index / create / show / update / destroy / edit Route::resource('dashboard', 'DashboardController'); // name = (dashboard. index / create / show / update / destroy / edit
@ -88,7 +88,7 @@ Route::group(['middleware' => ['auth:user', 'db']], function () {
/* /*
* Inbound routes requiring DB Lookup * Inbound routes requiring DB Lookup
*/ */
Route::group(['middleware' => ['url-db']], function () { Route::group(['middleware' => ['url_db']], function () {
Route::get('/user/confirm/{confirmation_code}', 'UserController@confirm'); Route::get('/user/confirm/{confirmation_code}', 'UserController@confirm');