ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

party: no longer use account session id

Browse Source 
This is no longer required because the oauth responses don't come back via websocket anymore
This commit is contained in:
Adam
2022-06-10 16:03:55 -04:00
parent 05567739b9
commit 169ec74a01
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runelite-client/src/main/java/net/runelite/client/party/PartyService.java
View File

@@ -44,8 +44,6 @@ import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.ItemComposition; import net.runelite.api.ItemComposition;
import net.runelite.client.account.AccountSession;
import net.runelite.client.account.SessionManager;
import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.chat.QueuedMessage; import net.runelite.client.chat.QueuedMessage;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
@@ -72,7 +70,6 @@ public class PartyService
private final Client client; private final Client client;
private final WSClient wsClient; private final WSClient wsClient;
private final SessionManager sessionManager;
private final EventBus eventBus; private final EventBus eventBus;
private final ChatMessageManager chat; private final ChatMessageManager chat;
private final List<PartyMember> members = new ArrayList<>(); private final List<PartyMember> members = new ArrayList<>();
@@ -83,11 +80,10 @@ public class PartyService
private String partyPassphrase; private String partyPassphrase;
@Inject @Inject
private PartyService(final Client client, final WSClient wsClient, final SessionManager sessionManager, final EventBus eventBus, final ChatMessageManager chat) private PartyService(final Client client, final WSClient wsClient, final EventBus eventBus, final ChatMessageManager chat)
{ {
this.client = client; this.client = client;
this.wsClient = wsClient; this.wsClient = wsClient;
this.sessionManager = sessionManager;
this.eventBus = eventBus; this.eventBus = eventBus;
this.chat = chat; this.chat = chat;
eventBus.register(this); eventBus.register(this);
@@ -169,12 +165,7 @@ public class PartyService
if (partyId == null) if (partyId == null)
{ {
// close the websocket if the session id isn't for an account wsClient.changeSession(null);
if (sessionManager.getAccountSession() == null)
{
wsClient.changeSession(null);
}
eventBus.post(new PartyChanged(partyPassphrase, partyId)); eventBus.post(new PartyChanged(partyPassphrase, partyId));
return; return;
} }
@@ -182,10 +173,7 @@ public class PartyService
// If there isn't already a session open, open one // If there isn't already a session open, open one
if (!wsClient.sessionExists()) if (!wsClient.sessionExists())
{ {
AccountSession accountSession = sessionManager.getAccountSession(); wsClient.changeSession(UUID.randomUUID());
// Use the existing account session, if it exists, otherwise generate a new session id
UUID uuid = accountSession != null ? accountSession.getUuid() : UUID.randomUUID();
wsClient.changeSession(uuid);
} }
eventBus.post(new PartyChanged(partyPassphrase, partyId)); eventBus.post(new PartyChanged(partyPassphrase, partyId));