bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-13 13:35:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Marcel Pociot
2020-06-17 10:35:07 +00:00
committed by StyleCI Bot
parent 0e33bc7d99
commit 83676deddb
56 changed files with 189 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Server/Http/Controllers/Admin/AdminController.php
View File

@@ -4,10 +4,10 @@ namespace App\Server\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Ratchet\ConnectionInterface;
use function GuzzleHttp\Psr7\str;
abstract class AdminController extends Controller
{
@@ -16,17 +16,19 @@ abstract class AdminController extends Controller
try {
$authorization = Str::after($request->header('Authorization'), 'Basic ');
$authParts = explode(':', base64_decode($authorization), 2);
list($user, $password) = $authParts;
[$user, $password] = $authParts;
if (! $this->credentialsAreAllowed($user, $password)) {
throw new \InvalidArgumentException('Invalid Login');
}
return true;
} catch (\Throwable $e) {
$httpConnection->send(str(new Response(401, [
'WWW-Authenticate' => 'Basic realm="Expose"'
'WWW-Authenticate' => 'Basic realm="Expose"',
])));
}
return false;
}

10
app/Server/Http/Controllers/Admin/DeleteUsersController.php
View File

@@ -3,16 +3,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class DeleteUsersController extends AdminController
{
@@ -29,7 +21,7 @@ class DeleteUsersController extends AdminController
public function handle(Request $request, ConnectionInterface $httpConnection)
{
$this->userRepository->deleteUser($request->get('id'))
->then(function() use ($httpConnection) {
->then(function () use ($httpConnection) {
$httpConnection->send(respond_json(['deleted' => true], 200));
$httpConnection->close();
});

8
app/Server/Http/Controllers/Admin/DisconnectSiteController.php
View File

@@ -3,15 +3,9 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class DisconnectSiteController extends AdminController
{
@@ -37,7 +31,7 @@ class DisconnectSiteController extends AdminController
}
$httpConnection->send(respond_json([
'sites' => $this->connectionManager->getConnections()
'sites' => $this->connectionManager->getConnections(),
]));
}
}

4
app/Server/Http/Controllers/Admin/GetSettingsController.php
View File

@@ -6,10 +6,6 @@ use App\Contracts\ConnectionManager;
use App\Server\Configuration;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class GetSettingsController extends AdminController
{

7
app/Server/Http/Controllers/Admin/GetSitesController.php
View File

@@ -3,14 +3,9 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class GetSitesController extends AdminController
{
@@ -33,7 +28,7 @@ class GetSitesController extends AdminController
$site['id'] = $siteId;
return $site;
})->values()
})->values(),
])
);
}

7
app/Server/Http/Controllers/Admin/GetUsersController.php
View File

@@ -3,15 +3,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class GetUsersController extends AdminController
{

7
app/Server/Http/Controllers/Admin/ListSitesController.php
View File

@@ -3,14 +3,9 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class ListSitesController extends AdminController
{
@@ -30,7 +25,7 @@ class ListSitesController extends AdminController
$sites = $this->getView($httpConnection, 'server.sites.index', [
'scheme' => $this->configuration->port() === 443 ? 'https' : 'http',
'configuration' => $this->configuration,
'sites' => $this->connectionManager->getConnections()
'sites' => $this->connectionManager->getConnections(),
]);
$httpConnection->send(

7
app/Server/Http/Controllers/Admin/ListUsersController.php
View File

@@ -3,15 +3,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class ListUsersController extends AdminController
{

5
app/Server/Http/Controllers/Admin/RedirectToUsersController.php
View File

@@ -2,19 +2,18 @@
namespace App\Server\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Ratchet\ConnectionInterface;
use function GuzzleHttp\Psr7\str;
class RedirectToUsersController extends AdminController
{
public function handle(Request $request, ConnectionInterface $httpConnection)
{
$httpConnection->send(str(new Response(301, [
'Location' => '/sites'
'Location' => '/sites',
])));
}
}

4
app/Server/Http/Controllers/Admin/ShowSettingsController.php
View File

@@ -6,10 +6,6 @@ use App\Contracts\ConnectionManager;
use App\Server\Configuration;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class ShowSettingsController extends AdminController
{

10
app/Server/Http/Controllers/Admin/StoreSettingsController.php
View File

@@ -2,18 +2,10 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class StoreSettingsController extends AdminController
{
@@ -27,7 +19,7 @@ class StoreSettingsController extends AdminController
public function handle(Request $request, ConnectionInterface $httpConnection)
{
config()->set('expose.admin.validate_auth_tokens', (bool)$request->get('validate_auth_tokens'));
config()->set('expose.admin.validate_auth_tokens', (bool) $request->get('validate_auth_tokens'));
$messages = $request->get('messages');

10
app/Server/Http/Controllers/Admin/StoreUsersController.php
View File

@@ -3,17 +3,11 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Ratchet\ConnectionInterface;
use Twig\Environment;
use Twig\Loader\ArrayLoader;
use function GuzzleHttp\Psr7\str;
use function GuzzleHttp\Psr7\stream_for;
class StoreUsersController extends AdminController
{
@@ -44,7 +38,7 @@ class StoreUsersController extends AdminController
$insertData = [
'name' => $request->get('name'),
'auth_token' => (string)Str::uuid()
'auth_token' => (string) Str::uuid(),
];
$this->userRepository