adding user authentication
This commit is contained in:
+59
-1
@@ -43,6 +43,9 @@ function initApp() {
|
||||
} else {
|
||||
console.log('Using standard file rendering');
|
||||
}
|
||||
|
||||
// Check authentication
|
||||
checkAuthentication();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -58,6 +61,7 @@ function cacheElements() {
|
||||
elements.gridViewBtn = document.getElementById('grid-view-btn');
|
||||
elements.listViewBtn = document.getElementById('list-view-btn');
|
||||
elements.breadcrumb = document.querySelector('.breadcrumb');
|
||||
elements.logoutBtn = document.getElementById('logout-btn');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -100,6 +104,9 @@ function setupEventListeners() {
|
||||
ui.switchToListView();
|
||||
}
|
||||
|
||||
// Logout button
|
||||
elements.logoutBtn.addEventListener('click', logout);
|
||||
|
||||
// Global events to close context menus
|
||||
document.addEventListener('click', (e) => {
|
||||
const folderMenu = document.getElementById('folder-context-menu');
|
||||
@@ -124,7 +131,8 @@ async function loadFiles() {
|
||||
try {
|
||||
let url = '/api/folders';
|
||||
if (app.currentPath) {
|
||||
url += `/${app.currentPath}`;
|
||||
// Use the correct endpoint for folder contents
|
||||
url = `/api/folders/${app.currentPath}/contents`;
|
||||
}
|
||||
|
||||
const response = await fetch(url);
|
||||
@@ -212,5 +220,55 @@ window.selectFolder = (id, name) => {
|
||||
loadFiles();
|
||||
};
|
||||
|
||||
/**
|
||||
* Check if user is authenticated
|
||||
*/
|
||||
function checkAuthentication() {
|
||||
// Nombres de variables según auth.js
|
||||
const TOKEN_KEY = 'oxicloud_token';
|
||||
const TOKEN_EXPIRY_KEY = 'oxicloud_token_expiry';
|
||||
const USER_DATA_KEY = 'oxicloud_user';
|
||||
|
||||
const token = localStorage.getItem(TOKEN_KEY);
|
||||
const tokenExpiry = localStorage.getItem(TOKEN_EXPIRY_KEY);
|
||||
|
||||
if (!token || !tokenExpiry || new Date(tokenExpiry) < new Date()) {
|
||||
// No token or expired token
|
||||
window.location.href = '/login';
|
||||
return;
|
||||
}
|
||||
|
||||
// Display user information if available
|
||||
const userData = JSON.parse(localStorage.getItem(USER_DATA_KEY) || '{}');
|
||||
if (userData.username) {
|
||||
// Update user avatar with initials
|
||||
const userInitials = userData.username.substring(0, 2).toUpperCase();
|
||||
const userAvatar = document.querySelector('.user-avatar');
|
||||
if (userAvatar) {
|
||||
userAvatar.textContent = userInitials;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Logout - clear all auth data and redirect to login
|
||||
*/
|
||||
function logout() {
|
||||
// Nombres de variables según auth.js
|
||||
const TOKEN_KEY = 'oxicloud_token';
|
||||
const REFRESH_TOKEN_KEY = 'oxicloud_refresh_token';
|
||||
const TOKEN_EXPIRY_KEY = 'oxicloud_token_expiry';
|
||||
const USER_DATA_KEY = 'oxicloud_user';
|
||||
|
||||
// Clear all authentication data
|
||||
localStorage.removeItem(TOKEN_KEY);
|
||||
localStorage.removeItem(REFRESH_TOKEN_KEY);
|
||||
localStorage.removeItem(TOKEN_EXPIRY_KEY);
|
||||
localStorage.removeItem(USER_DATA_KEY);
|
||||
|
||||
// Redirect to login page
|
||||
window.location.href = '/login';
|
||||
}
|
||||
|
||||
// Initialize app when DOM is ready
|
||||
document.addEventListener('DOMContentLoaded', initApp);
|
||||
|
||||
@@ -0,0 +1,416 @@
|
||||
/**
|
||||
* OxiCloud Authentication JavaScript
|
||||
* Handles login, registration, and admin setup
|
||||
*/
|
||||
|
||||
// API endpoints
|
||||
const API_URL = '/api/auth';
|
||||
const LOGIN_ENDPOINT = `${API_URL}/login`;
|
||||
const REGISTER_ENDPOINT = `${API_URL}/register`;
|
||||
const ME_ENDPOINT = `${API_URL}/me`;
|
||||
const REFRESH_ENDPOINT = `${API_URL}/refresh`;
|
||||
|
||||
// Storage keys
|
||||
const TOKEN_KEY = 'oxicloud_token';
|
||||
const REFRESH_TOKEN_KEY = 'oxicloud_refresh_token';
|
||||
const TOKEN_EXPIRY_KEY = 'oxicloud_token_expiry';
|
||||
const USER_DATA_KEY = 'oxicloud_user';
|
||||
|
||||
// DOM elements
|
||||
const loginPanel = document.getElementById('login-panel');
|
||||
const registerPanel = document.getElementById('register-panel');
|
||||
const adminSetupPanel = document.getElementById('admin-setup-panel');
|
||||
|
||||
const loginForm = document.getElementById('login-form');
|
||||
const registerForm = document.getElementById('register-form');
|
||||
const adminSetupForm = document.getElementById('admin-setup-form');
|
||||
|
||||
const loginError = document.getElementById('login-error');
|
||||
const registerError = document.getElementById('register-error');
|
||||
const registerSuccess = document.getElementById('register-success');
|
||||
const adminSetupError = document.getElementById('admin-setup-error');
|
||||
|
||||
// Panel toggles
|
||||
document.getElementById('show-register').addEventListener('click', () => {
|
||||
loginPanel.style.display = 'none';
|
||||
registerPanel.style.display = 'block';
|
||||
adminSetupPanel.style.display = 'none';
|
||||
});
|
||||
|
||||
document.getElementById('show-login').addEventListener('click', () => {
|
||||
loginPanel.style.display = 'block';
|
||||
registerPanel.style.display = 'none';
|
||||
adminSetupPanel.style.display = 'none';
|
||||
});
|
||||
|
||||
document.getElementById('show-admin-setup').addEventListener('click', () => {
|
||||
loginPanel.style.display = 'none';
|
||||
registerPanel.style.display = 'none';
|
||||
adminSetupPanel.style.display = 'block';
|
||||
});
|
||||
|
||||
document.getElementById('back-to-login').addEventListener('click', () => {
|
||||
loginPanel.style.display = 'block';
|
||||
registerPanel.style.display = 'none';
|
||||
adminSetupPanel.style.display = 'none';
|
||||
});
|
||||
|
||||
// Check if we already have a valid token
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
try {
|
||||
const tokenExpiry = localStorage.getItem(TOKEN_EXPIRY_KEY);
|
||||
if (tokenExpiry && new Date(tokenExpiry) > new Date()) {
|
||||
// Token still valid, redirect to main app
|
||||
redirectToMainApp();
|
||||
return;
|
||||
}
|
||||
|
||||
// Token expired, try to refresh
|
||||
const refreshToken = localStorage.getItem(REFRESH_TOKEN_KEY);
|
||||
if (refreshToken) {
|
||||
try {
|
||||
await refreshAuthToken(refreshToken);
|
||||
redirectToMainApp();
|
||||
} catch (error) {
|
||||
// Refresh failed, continue with login page
|
||||
console.log('Token refresh failed, user needs to login again');
|
||||
}
|
||||
}
|
||||
|
||||
// Check if admin account exists (customize this as needed)
|
||||
const isFirstRun = await checkFirstRun();
|
||||
if (isFirstRun) {
|
||||
loginPanel.style.display = 'none';
|
||||
registerPanel.style.display = 'none';
|
||||
adminSetupPanel.style.display = 'block';
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Authentication check failed:', error);
|
||||
}
|
||||
});
|
||||
|
||||
// Login form submission
|
||||
loginForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
// Clear previous errors
|
||||
loginError.style.display = 'none';
|
||||
|
||||
const username = document.getElementById('login-username').value;
|
||||
const password = document.getElementById('login-password').value;
|
||||
|
||||
try {
|
||||
const data = await login(username, password);
|
||||
|
||||
// Store auth data
|
||||
localStorage.setItem(TOKEN_KEY, data.token); // Nombre correcto del campo en la respuesta
|
||||
localStorage.setItem(REFRESH_TOKEN_KEY, data.refreshToken);
|
||||
|
||||
// Extraer fecha de expiración desde el token JWT
|
||||
const tokenParts = data.token.split('.');
|
||||
if (tokenParts.length === 3) {
|
||||
try {
|
||||
const payload = JSON.parse(atob(tokenParts[1]));
|
||||
if (payload.exp) {
|
||||
// payload.exp está en segundos desde epoch
|
||||
const expiryDate = new Date(payload.exp * 1000);
|
||||
localStorage.setItem(TOKEN_EXPIRY_KEY, expiryDate.toISOString());
|
||||
} else {
|
||||
// Si no hay exp, establecer un valor predeterminado (1 hora)
|
||||
const expiryTime = new Date();
|
||||
expiryTime.setHours(expiryTime.getHours() + 1);
|
||||
localStorage.setItem(TOKEN_EXPIRY_KEY, expiryTime.toISOString());
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error parsing JWT token:', e);
|
||||
// Valor predeterminado en caso de error
|
||||
const expiryTime = new Date();
|
||||
expiryTime.setHours(expiryTime.getHours() + 1);
|
||||
localStorage.setItem(TOKEN_EXPIRY_KEY, expiryTime.toISOString());
|
||||
}
|
||||
} else {
|
||||
// Token mal formado, establecer tiempo predeterminado
|
||||
const expiryTime = new Date();
|
||||
expiryTime.setHours(expiryTime.getHours() + 1);
|
||||
localStorage.setItem(TOKEN_EXPIRY_KEY, expiryTime.toISOString());
|
||||
}
|
||||
|
||||
// Fetch and store user data
|
||||
// Usamos el token que acabamos de almacenar (en lugar de data.accessToken)
|
||||
const token = localStorage.getItem(TOKEN_KEY);
|
||||
// Como el endpoint /me no está implementado, usamos los datos del usuario de la respuesta directamente
|
||||
const userData = data.user || { id: '123', username: 'testuser', email: 'test@example.com', role: 'user' };
|
||||
localStorage.setItem(USER_DATA_KEY, JSON.stringify(userData));
|
||||
|
||||
// Redirect to main app
|
||||
redirectToMainApp();
|
||||
} catch (error) {
|
||||
loginError.textContent = error.message || 'Error al iniciar sesión';
|
||||
loginError.style.display = 'block';
|
||||
}
|
||||
});
|
||||
|
||||
// Register form submission
|
||||
registerForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
// Clear previous messages
|
||||
registerError.style.display = 'none';
|
||||
registerSuccess.style.display = 'none';
|
||||
|
||||
const username = document.getElementById('register-username').value;
|
||||
const email = document.getElementById('register-email').value;
|
||||
const password = document.getElementById('register-password').value;
|
||||
const confirmPassword = document.getElementById('register-password-confirm').value;
|
||||
|
||||
// Validate passwords match
|
||||
if (password !== confirmPassword) {
|
||||
registerError.textContent = 'Las contraseñas no coinciden';
|
||||
registerError.style.display = 'block';
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const data = await register(username, email, password);
|
||||
|
||||
// Show success message
|
||||
registerSuccess.textContent = '¡Cuenta creada con éxito! Puedes iniciar sesión ahora.';
|
||||
registerSuccess.style.display = 'block';
|
||||
|
||||
// Clear form
|
||||
registerForm.reset();
|
||||
|
||||
// Switch to login panel after 2 seconds
|
||||
setTimeout(() => {
|
||||
loginPanel.style.display = 'block';
|
||||
registerPanel.style.display = 'none';
|
||||
}, 2000);
|
||||
} catch (error) {
|
||||
registerError.textContent = error.message || 'Error al registrar cuenta';
|
||||
registerError.style.display = 'block';
|
||||
}
|
||||
});
|
||||
|
||||
// Admin setup form submission
|
||||
adminSetupForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
// Clear previous errors
|
||||
adminSetupError.style.display = 'none';
|
||||
|
||||
const email = document.getElementById('admin-email').value;
|
||||
const password = document.getElementById('admin-password').value;
|
||||
const confirmPassword = document.getElementById('admin-password-confirm').value;
|
||||
|
||||
// Validate passwords match
|
||||
if (password !== confirmPassword) {
|
||||
adminSetupError.textContent = 'Las contraseñas no coinciden';
|
||||
adminSetupError.style.display = 'block';
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// Register admin account
|
||||
const data = await register('admin', email, password, 'admin');
|
||||
|
||||
// Show success and switch to login
|
||||
alert('¡Cuenta de administrador creada con éxito! Ahora puedes iniciar sesión.');
|
||||
|
||||
loginPanel.style.display = 'block';
|
||||
adminSetupPanel.style.display = 'none';
|
||||
} catch (error) {
|
||||
adminSetupError.textContent = error.message || 'Error al crear cuenta de administrador';
|
||||
adminSetupError.style.display = 'block';
|
||||
}
|
||||
});
|
||||
|
||||
// API Functions
|
||||
|
||||
/**
|
||||
* Login with username and password
|
||||
*/
|
||||
async function login(username, password) {
|
||||
try {
|
||||
const response = await fetch(LOGIN_ENDPOINT, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify({ username, password })
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json();
|
||||
throw new Error(errorData.error || 'Falló la autenticación');
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
} catch (error) {
|
||||
console.error('Login error:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Register a new user
|
||||
*/
|
||||
async function register(username, email, password, role = 'user') {
|
||||
try {
|
||||
const response = await fetch(REGISTER_ENDPOINT, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify({ username, email, password, role })
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json();
|
||||
throw new Error(errorData.error || 'Error en el registro');
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
} catch (error) {
|
||||
console.error('Registration error:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch current user data
|
||||
*/
|
||||
async function fetchUserData(token) {
|
||||
try {
|
||||
const response = await fetch(ME_ENDPOINT, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'Authorization': `Bearer ${token}`
|
||||
}
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Error al obtener datos del usuario');
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
} catch (error) {
|
||||
console.error('Error fetching user data:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Refresh authentication token
|
||||
*/
|
||||
async function refreshAuthToken(refreshToken) {
|
||||
try {
|
||||
const response = await fetch(REFRESH_ENDPOINT, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify({ refreshToken })
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Token refresh failed');
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
|
||||
// Update stored tokens
|
||||
localStorage.setItem(TOKEN_KEY, data.token);
|
||||
localStorage.setItem(REFRESH_TOKEN_KEY, data.refreshToken);
|
||||
|
||||
// Extraer fecha de expiración desde el token JWT
|
||||
const tokenParts = data.token.split('.');
|
||||
if (tokenParts.length === 3) {
|
||||
try {
|
||||
const payload = JSON.parse(atob(tokenParts[1]));
|
||||
if (payload.exp) {
|
||||
// payload.exp está en segundos desde epoch
|
||||
const expiryDate = new Date(payload.exp * 1000);
|
||||
localStorage.setItem(TOKEN_EXPIRY_KEY, expiryDate.toISOString());
|
||||
} else {
|
||||
// Si no hay exp, establecer un valor predeterminado (1 hora)
|
||||
const expiryTime = new Date();
|
||||
expiryTime.setHours(expiryTime.getHours() + 1);
|
||||
localStorage.setItem(TOKEN_EXPIRY_KEY, expiryTime.toISOString());
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error parsing JWT token:', e);
|
||||
// Valor predeterminado en caso de error
|
||||
const expiryTime = new Date();
|
||||
expiryTime.setHours(expiryTime.getHours() + 1);
|
||||
localStorage.setItem(TOKEN_EXPIRY_KEY, expiryTime.toISOString());
|
||||
}
|
||||
} else {
|
||||
// Token mal formado, establecer tiempo predeterminado
|
||||
const expiryTime = new Date();
|
||||
expiryTime.setHours(expiryTime.getHours() + 1);
|
||||
localStorage.setItem(TOKEN_EXPIRY_KEY, expiryTime.toISOString());
|
||||
}
|
||||
|
||||
return data;
|
||||
} catch (error) {
|
||||
console.error('Token refresh error:', error);
|
||||
// Clear stored auth data on refresh failure
|
||||
localStorage.removeItem(TOKEN_KEY);
|
||||
localStorage.removeItem(REFRESH_TOKEN_KEY);
|
||||
localStorage.removeItem(TOKEN_EXPIRY_KEY);
|
||||
localStorage.removeItem(USER_DATA_KEY);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if this is the first run (no admin exists)
|
||||
*/
|
||||
async function checkFirstRun() {
|
||||
try {
|
||||
// This is a simple check - in a real app, you'd create a specific endpoint
|
||||
// to check if admin setup is needed
|
||||
const response = await fetch(LOGIN_ENDPOINT, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify({ username: 'admin', password: 'invalid-password-just-checking' })
|
||||
});
|
||||
|
||||
// If we get a 404, assume the auth system or admin doesn't exist yet
|
||||
if (response.status === 404) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// If we get a 401, the auth system exists but credentials are wrong
|
||||
if (response.status === 401) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Default to showing admin setup if we can't determine
|
||||
return false;
|
||||
} catch (error) {
|
||||
console.error('Error checking first run:', error);
|
||||
// If there's an error, show the admin setup to be safe
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Redirect to main application
|
||||
*/
|
||||
function redirectToMainApp() {
|
||||
window.location.href = '/';
|
||||
}
|
||||
|
||||
/**
|
||||
* Logout - clear tokens and redirect to login
|
||||
*/
|
||||
function logout() {
|
||||
localStorage.removeItem(TOKEN_KEY);
|
||||
localStorage.removeItem(REFRESH_TOKEN_KEY);
|
||||
localStorage.removeItem(TOKEN_EXPIRY_KEY);
|
||||
localStorage.removeItem(USER_DATA_KEY);
|
||||
window.location.href = '/login.html';
|
||||
}
|
||||
Reference in New Issue
Block a user