pelmen/baton
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'BATON-SEC-003-frontend_dev'

Browse source
This commit is contained in:
Gros Frumos 2026-03-21 08:13:14 +02:00
commit 4b37703335
1 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
frontend/app.js
View file

@ -56,9 +56,14 @@ function _getUserName() {
return _storage.getItem('baton_user_name') || ''; return _storage.getItem('baton_user_name') || '';
} }
function _saveRegistration(name) { function _getApiKey() {
return _storage.getItem('baton_api_key') || '';
}
function _saveRegistration(name, apiKey) {
_storage.setItem('baton_user_name', name); _storage.setItem('baton_user_name', name);
_storage.setItem('baton_registered', '1'); _storage.setItem('baton_registered', '1');
if (apiKey) _storage.setItem('baton_api_key', apiKey);
} }
function _getInitials(name) { function _getInitials(name) {
@ -102,15 +107,17 @@ function _updateUserAvatar() {
// ========== API calls ========== // ========== API calls ==========
async function _apiPost(path, body) { async function _apiPost(path, body, extraHeaders) {
const res = await fetch(path, { const res = await fetch(path, {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json', ...extraHeaders },
body: JSON.stringify(body), body: JSON.stringify(body),
}); });
if (!res.ok) { if (!res.ok) {
const text = await res.text().catch(() => ''); const text = await res.text().catch(() => '');
throw new Error('HTTP ' + res.status + (text ? ': ' + text : '')); const err = new Error('HTTP ' + res.status + (text ? ': ' + text : ''));
err.status = res.status;
throw err;
} }
return res.json(); return res.json();
} }
@ -146,8 +153,8 @@ async function _handleRegister() {
try { try {
const uuid = _getOrCreateUserId(); const uuid = _getOrCreateUserId();
await _apiPost('/api/register', { uuid, name }); const data = await _apiPost('/api/register', { uuid, name });
_saveRegistration(name); _saveRegistration(name, data.api_key);
_updateUserAvatar(); _updateUserAvatar();
_showMain(); _showMain();
} catch (_) { } catch (_) {
@ -179,7 +186,9 @@ async function _handleSignal() {
const body = { user_id: uuid, timestamp: Date.now() }; const body = { user_id: uuid, timestamp: Date.now() };
if (geo) body.geo = geo; if (geo) body.geo = geo;
await _apiPost('/api/signal', body); const apiKey = _getApiKey();
const authHeaders = apiKey ? { Authorization: 'Bearer ' + apiKey } : {};
await _apiPost('/api/signal', body, authHeaders);
_setSosState('success'); _setSosState('success');
_setStatus('Signal sent!', 'success'); _setStatus('Signal sent!', 'success');
@ -187,9 +196,13 @@ async function _handleSignal() {
_setSosState('default'); _setSosState('default');
_setStatus('', ''); _setStatus('', '');
}, 2000); }, 2000);
} catch (_) { } catch (err) {
_setSosState('default'); _setSosState('default');
_setStatus('Error sending. Try again.', 'error'); if (err && err.status === 401) {
_setStatus('Session expired or key is invalid. Please re-register.', 'error');
} else {
_setStatus('Error sending. Try again.', 'error');
}
} }
} }