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

Merge branch 'master' of github.com:beyondcode/phunnel

Browse Source
This commit is contained in:
Marcel Pociot
2021-05-28 16:51:58 +02:00
parent a3d1735b6e b44d5f9c46
commit 7f6be8cae2
9 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Commands/ServerAwareCommand.php
View File

@@ -45,7 +45,7 @@ abstract class ServerAwareCommand extends Command
/**
* Try to find the server in the servers array.
* If no array exists at all (when upgrading from v1),
* always return sharedwithexpose.com
* always return sharedwithexpose.com.
*/
if (config('expose.servers') === null) {
return static::DEFAULT_HOSTNAME;
@@ -70,13 +70,12 @@ abstract class ServerAwareCommand extends Command
/**
* Try to find the server in the servers array.
* If no array exists at all (when upgrading from v1),
* always return sharedwithexpose.com
* always return sharedwithexpose.com.
*/
if (config('expose.servers') === null) {
return static::DEFAULT_PORT;
}
$server = $this->option('server');
$host = config('expose.servers.'.$server.'.port');

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

@@ -5,7 +5,6 @@ namespace App\Server\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use GuzzleHttp\Psr7\Message;
use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Ratchet\ConnectionInterface;

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

@@ -49,6 +49,7 @@ class GetSitesController extends AdminController
$users = collect($users);
$sites = collect($sites)->map(function ($site) use ($users) {
$site['user'] = $users->firstWhere('auth_token', $site['auth_token']);
return $site;
})->toArray();

1
app/Server/Http/Controllers/Admin/GetTcpConnectionsController.php
View File

@@ -49,6 +49,7 @@ class GetTcpConnectionsController extends AdminController
$users = collect($users);
$connections = collect($connections)->map(function ($connection) use ($users) {
$connection['user'] = $users->firstWhere('auth_token', $connection['auth_token']);
return $connection;
})->toArray();

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

@@ -4,7 +4,6 @@ namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Server\Configuration;
use App\Server\Connections\ControlConnection;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;

1
app/Server/Http/Controllers/Admin/ListTcpConnectionsController.php
View File

@@ -4,7 +4,6 @@ namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Server\Configuration;
use App\Server\Connections\TcpControlConnection;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;

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

@@ -3,7 +3,6 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;

1
app/Server/UserRepository/DatabaseUserRepository.php
View File

@@ -167,7 +167,6 @@ class DatabaseUserRepository implements UserRepository
$this->database->query('SELECT * FROM users WHERE auth_token IN ('.$authTokenString.')')
->then(function (Result $result) use ($deferred) {
$users = collect($result->rows)->map(function ($user) {
return $this->getUserDetails($user);
})->toArray();

3
tests/Feature/Server/AdminTest.php
View File

@@ -2,15 +2,12 @@
namespace Tests\Feature\Server;
use App\Contracts\ConnectionManager;
use App\Server\Factory;
use Clue\React\Buzz\Browser;
use Clue\React\Buzz\Message\ResponseException;
use GuzzleHttp\Psr7\Response;
use Illuminate\Support\Str;
use Nyholm\Psr7\Request;
use Psr\Http\Message\ResponseInterface;
use Ratchet\Server\IoConnection;
use Tests\Feature\TestCase;
class AdminTest extends TestCase