MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Account for websocket-resources changes. 

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2014-11-15 09:48:09 -08:00
parent fdb35d4f77
commit 2525304215
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/whispersystems/textsecuregcm/websocket/ConnectListener.java
View File

@ -32,7 +32,7 @@ public class ConnectListener implements WebSocketConnectListener {
@Override @Override
public void onWebSocketConnect(WebSocketSessionContext context) { public void onWebSocketConnect(WebSocketSessionContext context) {
Optional<Account> account = Optional.fromNullable((Account) context.getAuthenticated()); Optional<Account> account = context.getAuthenticated(Account.class);
if (!account.isPresent()) { if (!account.isPresent()) {
logger.debug("WS Connection with no authentication..."); logger.debug("WS Connection with no authentication...");

5
src/test/java/org/whispersystems/textsecuregcm/tests/websocket/WebSocketConnectionTest.java
View File

@ -1,6 +1,5 @@
package org.whispersystems.textsecuregcm.tests.websocket; package org.whispersystems.textsecuregcm.tests.websocket;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.SettableFuture;
import org.eclipse.jetty.websocket.api.UpgradeRequest; import org.eclipse.jetty.websocket.api.UpgradeRequest;
@ -79,7 +78,7 @@ public class WebSocketConnectionTest {
}}); }});
Optional<Account> account = webSocketAuthenticator.authenticate(upgradeRequest); Optional<Account> account = webSocketAuthenticator.authenticate(upgradeRequest);
when(sessionContext.getAuthenticated()).thenReturn(account.orNull()); when(sessionContext.getAuthenticated(Account.class)).thenReturn(account);
connectListener.onWebSocketConnect(sessionContext); connectListener.onWebSocketConnect(sessionContext);
@ -98,7 +97,7 @@ public class WebSocketConnectionTest {
}}); }});
account = webSocketAuthenticator.authenticate(upgradeRequest); account = webSocketAuthenticator.authenticate(upgradeRequest);
when(sessionContext.getAuthenticated()).thenReturn(account.orNull()); when(sessionContext.getAuthenticated(Account.class)).thenReturn(account);
WebSocketClient client = mock(WebSocketClient.class); WebSocketClient client = mock(WebSocketClient.class);
when(sessionContext.getClient()).thenReturn(client); when(sessionContext.getClient()).thenReturn(client);