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

Use existing sessionid on login if available

Browse Source
This commit is contained in:
Adam
2019-01-28 08:59:57 -05:00
parent 63c3937f87
commit c62941855d
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
http-api/src/main/java/net/runelite/http/api/account/AccountClient.java
View File

@@ -56,6 +56,7 @@ public class AccountClient
HttpUrl url = RuneLiteAPI.getApiBase().newBuilder() HttpUrl url = RuneLiteAPI.getApiBase().newBuilder()
.addPathSegment("account") .addPathSegment("account")
.addPathSegment("login") .addPathSegment("login")
.addQueryParameter("uuid", uuid.toString())
.build(); .build();
logger.debug("Built URI: {}", url); logger.debug("Built URI: {}", url);

4
http-service/src/main/java/net/runelite/http/service/account/AccountService.java
View File

@@ -136,10 +136,8 @@ public class AccountService
} }
@RequestMapping("/login") @RequestMapping("/login")
public OAuthResponse login() public OAuthResponse login(@RequestParam UUID uuid)
{ {
UUID uuid = UUID.randomUUID();
State state = new State(); State state = new State();
state.setUuid(uuid); state.setUuid(uuid);
state.setApiVersion(RuneLiteAPI.getVersion()); state.setApiVersion(RuneLiteAPI.getVersion());

6
runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
View File

@@ -31,6 +31,7 @@ import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.time.Instant; import java.time.Instant;
import java.util.UUID;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import lombok.Getter; import lombok.Getter;
@@ -59,7 +60,6 @@ public class SessionManager
private final EventBus eventBus; private final EventBus eventBus;
private final ConfigManager configManager; private final ConfigManager configManager;
private final WSClient wsClient; private final WSClient wsClient;
private final AccountClient loginClient = new AccountClient();
@Inject @Inject
private SessionManager(ConfigManager configManager, EventBus eventBus, WSClient wsClient) private SessionManager(ConfigManager configManager, EventBus eventBus, WSClient wsClient)
@@ -184,6 +184,10 @@ public class SessionManager
public void login() public void login()
{ {
// If a session is already open, use that id. Otherwise generate a new id.
UUID uuid = wsClient.getSessionId() != null ? wsClient.getSessionId() : UUID.randomUUID();
AccountClient loginClient = new AccountClient(uuid);
final OAuthResponse login; final OAuthResponse login;
try try

3
runelite-client/src/main/java/net/runelite/client/ws/WSClient.java
View File

@@ -25,13 +25,13 @@
package net.runelite.client.ws; package net.runelite.client.ws;
import com.google.gson.Gson; import com.google.gson.Gson;
import java.time.Duration;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.UUID; import java.util.UUID;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.RuneLiteAPI;
@@ -52,6 +52,7 @@ public class WSClient extends WebSocketListener implements AutoCloseable
private final Collection<Class<? extends WebsocketMessage>> messages = new HashSet<>(); private final Collection<Class<? extends WebsocketMessage>> messages = new HashSet<>();
private volatile Gson gson; private volatile Gson gson;
@Getter
private UUID sessionId; private UUID sessionId;
private WebSocket webSocket; private WebSocket webSocket;