StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Push 'Account' and 'Security' pages as well as 'My Servers'

Browse source
This commit is contained in:
Dane Everitt 2017-01-15 14:09:57 -05:00
parent 1c85b1fbc4
commit 2fc852c6a4
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
19 changed files with 1068 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Base/SecurityController.php
View file

@ -79,7 +79,9 @@ class SecurityController extends Controller
public function setTotp(Request $request)
{
if (! $request->has('token')) {
return response(null, 500);
return response()->json([
'error' => 'Request is missing token parameter.'
], 500);
}
$user = $request->user();
@ -101,7 +103,7 @@ class SecurityController extends Controller
if (! $request->has('token')) {
Alert::danger('Missing required `token` field in request.')->flash();
return redirect()->route('account.totp');
return redirect()->route('account.security');
}
$user = $request->user();

3
app/Http/Routes/BaseRoutes.php
View file

@ -64,9 +64,11 @@ class BaseRoutes
'uses' => 'Base\AccountController@index',
]);
$router->post('/password', [
'as' => 'account.password',
'uses' => 'Base\AccountController@password',
]);
$router->post('/email', [
'as' => 'account.email',
'uses' => 'Base\AccountController@email',
]);
});
@ -113,6 +115,7 @@ class BaseRoutes
'uses' => 'Base\SecurityController@revoke',
]);
$router->put('/totp', [
'as' => 'account.security.totp',
'uses' => 'Base\SecurityController@generateTotp',
]);
$router->post('/totp', [

1
app/Http/Routes/ServerRoutes.php
View file

@ -153,6 +153,7 @@ class ServerRoutes
$router->group(['prefix' => 'ajax'], function ($server) use ($router) {
// Returns Server Status
$router->get('status', [
'as' => 'server.ajax.status',
'uses' => 'Server\AjaxController@getStatus',
]);