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/expose

Browse Source
This commit is contained in:
Marcel Pociot
2022-03-04 17:35:57 +01:00
parent c2b0b62a8b 428356badb
commit 119d0826e4
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Server/Http/Controllers/ControlMessageController.php
View File

@@ -12,7 +12,6 @@ use App\Server\Exceptions\NoFreePortAvailable;
use Illuminate\Support\Arr;
use Ratchet\ConnectionInterface;
use Ratchet\WebSocket\MessageComponentInterface;
use React\EventLoop\LoopInterface;
use React\Promise\Deferred;
use React\Promise\PromiseInterface;
use function React\Promise\reject;
@@ -151,7 +150,8 @@ class ControlMessageController implements MessageComponentInterface
});
}
protected function resolveConnectionMessage($connectionInfo, $user) {
protected function resolveConnectionMessage($connectionInfo, $user)
{
$deferred = new Deferred();
$connectionMessageResolver = config('expose.admin.messages.resolve_connection_message')($connectionInfo, $user);
@@ -163,6 +163,7 @@ class ControlMessageController implements MessageComponentInterface
});
} else {
$connectionInfo->message = $connectionMessageResolver;
return \React\Promise\resolve($connectionInfo);
}
@@ -188,7 +189,7 @@ class ControlMessageController implements MessageComponentInterface
return $this->resolveConnectionMessage($connectionInfo, $user);
})
->then(function ($connectionInfo) use ($data, $connection, $user) {
->then(function ($connectionInfo) use ($connection, $user) {
$connection->send(json_encode([
'event' => 'authenticated',
'data' => [

3
app/Server/Support/RetrieveWelcomeMessageFromApi.php
View File

@@ -3,9 +3,8 @@
namespace App\Server\Support;
use App\Server\Connections\ControlConnection;
use Exception;
use Psr\Http\Message\ResponseInterface;
use Clue\React\Buzz\Browser;
use Psr\Http\Message\ResponseInterface;
class RetrieveWelcomeMessageFromApi
{