Skip to content

Handshake middleware for server #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 21 commits into from
+358 −15
Closed

Handshake middleware for server #224

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5df35d6
handshake middleware was added for server
Feb 17, 2017
8f46553
middleware fabric partly
Feb 17, 2017
e2afa63
middleware factory done
Feb 20, 2017
b63368d
fix
Feb 20, 2017
b6c66df
fix
Feb 20, 2017
f7ecd3f
update Middleware class
Feb 20, 2017
0edc7c7
ClientRejectedEvent update
Feb 20, 2017
ddbdbfe
upd
Feb 20, 2017
57aa6c5
fix config middleware
Feb 20, 2017
1c2a388
fix config middleware
Feb 20, 2017
1e3af3a
middleware fixes
Feb 20, 2017
4c3306b
middleware fix
Feb 20, 2017
ffe74e3
middleware interface to abstract
Feb 21, 2017
86a91f2
middleware update
Feb 21, 2017
254eb38
WebsocketAuthenticationProvider to WebsocketAuthenticationProviderInt…
Feb 21, 2017
7f4ce2e
WebsocketAuthenticationProvider fix
Feb 21, 2017
b2b64ed
WebsocketAuthenticationProvider fix
Feb 21, 2017
8d743dc
WebSocketServer constructor update
Mar 2, 2017
c24eabc
Handshake middleware example for OAuth
Mar 2, 2017
9b195a0
config fix - handshake_middleware is not necessary
Mar 22, 2017
36ddf3a
annotation fix
Mar 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WebsocketAuthenticationProvider fix
  • Loading branch information
valentint committed Feb 21, 2017
commit b2b64ed1d8258159495342f03e8dd519a064f307
10 changes: 7 additions & 3 deletions Client/Auth/WebsocketAuthenticationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,15 @@ protected function getToken(ConnectionInterface $connection)
}
}

if (null === $token && !$this->tokenStorage->getToken()) {
$token = new AnonymousToken($this->firewalls[0], 'anon-' . $connection->WAMP->sessionId);
if (null === $token) {
if (!$this->tokenStorage->getToken()) {
$token = new AnonymousToken($this->firewalls[0], 'anon-' . $connection->WAMP->sessionId);
} else {
$token = $this->tokenStorage->getToken();
}
}

if ($token && $this->tokenStorage->getToken() !== $token) {
if ($this->tokenStorage->getToken() !== $token) {
$this->tokenStorage->setToken($token);
}

Expand Down