fixing login
Deploy / deploy (push) Successful in 38s

This commit is contained in:
2026-05-07 19:54:10 +02:00
parent 9638f782c9
commit 68ab026f97
6 changed files with 171 additions and 163 deletions
+71 -24
View File
@@ -43,6 +43,7 @@ document.addEventListener('DOMContentLoaded', () => {
document.getElementById('saveLink').addEventListener('click', saveLink);
document.getElementById('saveShape').addEventListener('click', saveShape);
document.getElementById('addUserBtn').addEventListener('click', addUser);
document.getElementById('logoutBtn').addEventListener('click', logout);
document.getElementById('teamFilter').addEventListener('change', renderTimeline);
document.getElementById('searchEvents').addEventListener('input', renderTimeline);
document.getElementById('shapeOpacity').addEventListener('input', (e) => {
@@ -892,43 +893,89 @@ let currentRole = null;
async function checkSession() {
try {
const res = await fetch('/api/session');
if (res.redirected || !res.ok) {
window.location.replace('/login.php');
return;
}
const data = await res.json();
if (data.loggedin) {
currentUser = data.username;
currentRole = data.role;
document.getElementById('userDisplay').textContent = data.username;
if (data.role === 'admin' || data.admin_count === 0) {
if (data.role === 'admin') {
document.getElementById('settingsBtn').classList.remove('d-none');
}
document.getElementById('loginOverlay').style.display = 'none';
return;
}
} catch (_) {}
// Show login overlay
document.getElementById('loginOverlay').style.display = 'flex';
}
async function performLogin(authToken) {
const errEl = document.getElementById('loginError');
const sucEl = document.getElementById('loginSuccess');
errEl.style.display = 'none';
sucEl.style.display = 'none';
try {
const res = await fetch('/api/login', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ auth_token: authToken })
});
const data = await res.json();
if (data.status === 'success') {
currentUser = data.username;
currentRole = data.role;
document.getElementById('userDisplay').textContent = data.username;
if (data.role === 'admin') document.getElementById('settingsBtn').classList.remove('d-none');
document.getElementById('loginOverlay').style.display = 'none';
// Clean URL
window.history.replaceState({}, '', '/');
// Reload data
loadTeams().then(() => loadEvents());
loadNetworkData();
} else {
window.location.replace('/login.php');
errEl.textContent = data.error || 'Login failed';
errEl.style.display = 'block';
}
} catch (e) {
// Retry once after a brief delay in case of transient network issue
setTimeout(async () => {
try {
const res = await fetch('/api/session');
if (!res.ok || res.redirected) throw new Error();
const data = await res.json();
if (data.loggedin) {
currentUser = data.username;
currentRole = data.role;
document.getElementById('userDisplay').textContent = data.username;
if (data.role === 'admin' || data.admin_count === 0) {
document.getElementById('settingsBtn').classList.remove('d-none');
}
return;
}
} catch (_) {}
window.location.replace('/login.php');
}, 500);
errEl.textContent = 'Connection error';
errEl.style.display = 'block';
}
}
async function logout() {
await apiFetch('logout', { method: 'POST' });
currentUser = null;
currentRole = null;
document.getElementById('settingsBtn').classList.add('d-none');
document.getElementById('userDisplay').textContent = '';
document.getElementById('loginOverlay').style.display = 'flex';
}
// Check for auth token in URL on page load
document.addEventListener('DOMContentLoaded', () => {
const params = new URLSearchParams(window.location.search);
const authToken = params.get('auth');
if (authToken) {
// Show a loading state on overlay
document.getElementById('loginOverlay').style.display = 'flex';
document.querySelector('#loginOverlay .btn').textContent = 'Authenticating...';
performLogin(authToken);
}
checkSession().then(() => {
// Init canvas and load data
canvas = document.getElementById('networkCanvas');
ctx = canvas.getContext('2d');
resizeCanvas();
loadTeams().then(() => loadEvents());
loadNetworkData();
document.getElementById('loginBtn').addEventListener('click', () => {
const callbackUrl = window.location.origin + '/?auth_callback=1';
window.location.href = 'https://auth.jakach.ch/?send_to=' + encodeURIComponent(callbackUrl);
});
async function loadUsers() {
const list = document.getElementById('userList');
try {
+16 -1
View File
@@ -36,7 +36,7 @@
<div class="ms-auto d-flex align-items-center">
<span class="text-secondary small me-2" id="userDisplay"></span>
<button class="btn btn-outline-secondary btn-sm me-2 d-none" id="settingsBtn" data-bs-toggle="modal" data-bs-target="#settingsModal" title="Settings"><i class="fas fa-cog"></i></button>
<a href="/logout.php" class="btn btn-outline-secondary btn-sm"><i class="fas fa-sign-out-alt"></i></a>
<button class="btn btn-outline-secondary btn-sm" id="logoutBtn"><i class="fas fa-sign-out-alt"></i></button>
</div>
</div>
</div>
@@ -375,6 +375,21 @@
</div>
</div>
<!-- ==================== LOGIN OVERLAY ==================== -->
<div id="loginOverlay" style="position:fixed;top:0;left:0;width:100%;height:100%;background:#0a0e1a;z-index:9999;display:flex;align-items:center;justify-content:center;">
<div style="text-align:center;max-width:400px;padding:2rem;">
<i class="fas fa-globe text-primary mb-3" style="font-size:2.5rem;"></i>
<h1 class="fw-bold mb-1">Neptune</h1>
<p class="text-secondary mb-4">Cybersecurity Incident Journal</p>
<div id="loginError" class="alert alert-danger py-2 small" style="display:none;"></div>
<div id="loginSuccess" class="alert alert-success py-2 small" style="display:none;"></div>
<button id="loginBtn" class="btn btn-primary w-100 py-2 mb-2">
<i class="fas fa-right-to-bracket me-2"></i>Log in with Jakach Auth
</button>
<small class="text-secondary">First user automatically becomes admin</small>
</div>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
<script src="assets/js/app.js"></script>
</body>