Fix auth token localStorage key consistency
- Dashboard, viewer, and native viewer all now use guruconnect_token - Fixed loadMachines() to include Authorization header
This commit is contained in:
@@ -817,7 +817,10 @@
|
|||||||
|
|
||||||
async function loadMachines() {
|
async function loadMachines() {
|
||||||
try {
|
try {
|
||||||
const response = await fetch("/api/sessions");
|
const token = localStorage.getItem("guruconnect_token");
|
||||||
|
const response = await fetch("/api/sessions", {
|
||||||
|
headers: { "Authorization": "Bearer " + token }
|
||||||
|
});
|
||||||
machines = await response.json();
|
machines = await response.json();
|
||||||
|
|
||||||
// Update counts based on is_online status
|
// Update counts based on is_online status
|
||||||
@@ -994,7 +997,7 @@
|
|||||||
|
|
||||||
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
|
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
|
||||||
const serverUrl = encodeURIComponent(protocol + "//" + window.location.host + "/ws/viewer");
|
const serverUrl = encodeURIComponent(protocol + "//" + window.location.host + "/ws/viewer");
|
||||||
const token = localStorage.getItem("authToken");
|
const token = localStorage.getItem("guruconnect_token");
|
||||||
const protocolUrl = `guruconnect://view/${connectSessionId}?server=${serverUrl}&token=${encodeURIComponent(token)}`;
|
const protocolUrl = `guruconnect://view/${connectSessionId}?server=${serverUrl}&token=${encodeURIComponent(token)}`;
|
||||||
|
|
||||||
// Try to launch the protocol handler
|
// Try to launch the protocol handler
|
||||||
@@ -1152,7 +1155,7 @@
|
|||||||
|
|
||||||
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
|
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
|
||||||
const viewerName = user?.name || user?.email || "Technician";
|
const viewerName = user?.name || user?.email || "Technician";
|
||||||
const token = localStorage.getItem("authToken");
|
const token = localStorage.getItem("guruconnect_token");
|
||||||
const wsUrl = `${protocol}//${window.location.host}/ws/viewer?session_id=${sessionId}&viewer_name=${encodeURIComponent(viewerName)}&token=${encodeURIComponent(token)}`;
|
const wsUrl = `${protocol}//${window.location.host}/ws/viewer?session_id=${sessionId}&viewer_name=${encodeURIComponent(viewerName)}&token=${encodeURIComponent(token)}`;
|
||||||
|
|
||||||
console.log("Connecting chat to:", wsUrl);
|
console.log("Connecting chat to:", wsUrl);
|
||||||
|
|||||||
@@ -175,7 +175,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get viewer name from localStorage (same as dashboard)
|
// Get viewer name from localStorage (same as dashboard)
|
||||||
const user = JSON.parse(localStorage.getItem('user') || 'null');
|
const user = JSON.parse(localStorage.getItem('guruconnect_user') || 'null');
|
||||||
const viewerName = user?.name || user?.email || 'Technician';
|
const viewerName = user?.name || user?.email || 'Technician';
|
||||||
|
|
||||||
// State
|
// State
|
||||||
@@ -597,7 +597,7 @@
|
|||||||
|
|
||||||
function connect() {
|
function connect() {
|
||||||
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
|
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
|
||||||
const token = localStorage.getItem('authToken');
|
const token = localStorage.getItem('guruconnect_token');
|
||||||
if (!token) {
|
if (!token) {
|
||||||
updateStatus('error', 'Not authenticated');
|
updateStatus('error', 'Not authenticated');
|
||||||
document.getElementById('overlay-text').textContent = 'Not logged in. Please log in first.';
|
document.getElementById('overlay-text').textContent = 'Not logged in. Please log in first.';
|
||||||
|
|||||||
Reference in New Issue
Block a user