From 2525304215a9f27d354d9a24b2237727f0c294f9 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sat, 15 Nov 2014 09:48:09 -0800
Subject: [PATCH] Account for websocket-resources changes.

// FREEBIE
---
 .../textsecuregcm/websocket/ConnectListener.java             | 2 +-
 .../tests/websocket/WebSocketConnectionTest.java             | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/whispersystems/textsecuregcm/websocket/ConnectListener.java b/src/main/java/org/whispersystems/textsecuregcm/websocket/ConnectListener.java
index 9e4c2c87d..c56a2cc6a 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/websocket/ConnectListener.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/websocket/ConnectListener.java
@@ -32,7 +32,7 @@ public class ConnectListener implements WebSocketConnectListener {
 
   @Override
   public void onWebSocketConnect(WebSocketSessionContext context) {
-    Optional<Account> account = Optional.fromNullable((Account) context.getAuthenticated());
+    Optional<Account> account = context.getAuthenticated(Account.class);
 
     if (!account.isPresent()) {
       logger.debug("WS Connection with no authentication...");
diff --git a/src/test/java/org/whispersystems/textsecuregcm/tests/websocket/WebSocketConnectionTest.java b/src/test/java/org/whispersystems/textsecuregcm/tests/websocket/WebSocketConnectionTest.java
index 7b2ba931c..5e98ce110 100644
--- a/src/test/java/org/whispersystems/textsecuregcm/tests/websocket/WebSocketConnectionTest.java
+++ b/src/test/java/org/whispersystems/textsecuregcm/tests/websocket/WebSocketConnectionTest.java
@@ -1,6 +1,5 @@
 package org.whispersystems.textsecuregcm.tests.websocket;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.SettableFuture;
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
@@ -79,7 +78,7 @@ public class WebSocketConnectionTest {
     }});
 
     Optional<Account> account = webSocketAuthenticator.authenticate(upgradeRequest);
-    when(sessionContext.getAuthenticated()).thenReturn(account.orNull());
+    when(sessionContext.getAuthenticated(Account.class)).thenReturn(account);
 
     connectListener.onWebSocketConnect(sessionContext);
 
@@ -98,7 +97,7 @@ public class WebSocketConnectionTest {
     }});
 
     account = webSocketAuthenticator.authenticate(upgradeRequest);
-    when(sessionContext.getAuthenticated()).thenReturn(account.orNull());
+    when(sessionContext.getAuthenticated(Account.class)).thenReturn(account);
 
     WebSocketClient client = mock(WebSocketClient.class);
     when(sessionContext.getClient()).thenReturn(client);