[Client] Prioritize sessionID from URL over sessionStorage if present

Senryoku · Oct 13, 2023 · 157d619 · 157d619
1 parent c326c4a
commit 157d619
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/client/src/App.ts b/client/src/App.ts
@@ -230,7 +230,12 @@ export default defineComponent({
 		if (windowSpecificDataStr) {
 			try {
 				const windowSpecificData = JSON.parse(windowSpecificDataStr);
-				if (windowSpecificData.userName && windowSpecificData.userID && windowSpecificData.sessionID) {
+				if (
+					windowSpecificData.userName &&
+					windowSpecificData.userID &&
+					windowSpecificData.sessionID &&
+					(!urlParamSession || sessionID === windowSpecificData.sessionID) // Prioritize sessionID from URL if present
+				) {
 					userName = windowSpecificData.userName;
 					userID = windowSpecificData.userID;
 					sessionID = windowSpecificData.sessionID;