auth additions
This commit is contained in:
14
auth.js
14
auth.js
@@ -118,7 +118,8 @@ export function initAuth() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
export function checkAuthentication() {
|
export function checkAuthentication() {
|
||||||
sendRequest("checkAuth.php")
|
// Return the promise from sendRequest
|
||||||
|
return sendRequest("checkAuth.php")
|
||||||
.then(data => {
|
.then(data => {
|
||||||
if (data.setup) {
|
if (data.setup) {
|
||||||
window.setupMode = true;
|
window.setupMode = true;
|
||||||
@@ -128,7 +129,7 @@ export function checkAuthentication() {
|
|||||||
toggleVisibility("mainOperations", false);
|
toggleVisibility("mainOperations", false);
|
||||||
document.querySelector(".header-buttons").style.visibility = "hidden";
|
document.querySelector(".header-buttons").style.visibility = "hidden";
|
||||||
toggleVisibility("addUserModal", true);
|
toggleVisibility("addUserModal", true);
|
||||||
return;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
window.setupMode = false;
|
window.setupMode = false;
|
||||||
}
|
}
|
||||||
@@ -137,7 +138,7 @@ export function checkAuthentication() {
|
|||||||
toggleVisibility("mainOperations", true);
|
toggleVisibility("mainOperations", true);
|
||||||
toggleVisibility("uploadFileForm", true);
|
toggleVisibility("uploadFileForm", true);
|
||||||
toggleVisibility("fileListContainer", true);
|
toggleVisibility("fileListContainer", true);
|
||||||
// Check admin status to determine if Add/Remove User buttons should be shown.
|
// Show Add/Remove User buttons if admin.
|
||||||
if (data.isAdmin) {
|
if (data.isAdmin) {
|
||||||
const addUserBtn = document.getElementById("addUserBtn");
|
const addUserBtn = document.getElementById("addUserBtn");
|
||||||
const removeUserBtn = document.getElementById("removeUserBtn");
|
const removeUserBtn = document.getElementById("removeUserBtn");
|
||||||
@@ -150,6 +151,7 @@ export function checkAuthentication() {
|
|||||||
if (removeUserBtn) removeUserBtn.style.display = "none";
|
if (removeUserBtn) removeUserBtn.style.display = "none";
|
||||||
}
|
}
|
||||||
document.querySelector(".header-buttons").style.visibility = "visible";
|
document.querySelector(".header-buttons").style.visibility = "visible";
|
||||||
|
return true;
|
||||||
} else {
|
} else {
|
||||||
showToast("Please log in to continue.");
|
showToast("Please log in to continue.");
|
||||||
toggleVisibility("loginForm", true);
|
toggleVisibility("loginForm", true);
|
||||||
@@ -157,9 +159,13 @@ export function checkAuthentication() {
|
|||||||
toggleVisibility("uploadFileForm", false);
|
toggleVisibility("uploadFileForm", false);
|
||||||
toggleVisibility("fileListContainer", false);
|
toggleVisibility("fileListContainer", false);
|
||||||
document.querySelector(".header-buttons").style.visibility = "hidden";
|
document.querySelector(".header-buttons").style.visibility = "hidden";
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => console.error("Error checking authentication:", error));
|
.catch(error => {
|
||||||
|
console.error("Error checking authentication:", error);
|
||||||
|
return false;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
window.checkAuthentication = checkAuthentication;
|
window.checkAuthentication = checkAuthentication;
|
||||||
|
|
||||||
|
|||||||
@@ -168,7 +168,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- File List Section -->
|
<!-- File List Section -->
|
||||||
<div id="fileListContainer">
|
<div id="fileListContainer" style="display: none;">
|
||||||
<h2 id="fileListTitle">Files in (Root)</h2>
|
<h2 id="fileListTitle">Files in (Root)</h2>
|
||||||
<div id="fileListActions" class="file-list-actions">
|
<div id="fileListActions" class="file-list-actions">
|
||||||
<button id="deleteSelectedBtn" class="btn action-btn" style="display: none;">
|
<button id="deleteSelectedBtn" class="btn action-btn" style="display: none;">
|
||||||
|
|||||||
15
main.js
15
main.js
@@ -15,12 +15,9 @@ import {
|
|||||||
displayFilePreview,
|
displayFilePreview,
|
||||||
renameFile
|
renameFile
|
||||||
} from './fileManager.js';
|
} from './fileManager.js';
|
||||||
import {
|
import { loadFolderTree } from './folderManager.js';
|
||||||
loadFolderTree,
|
|
||||||
loadFolderList
|
|
||||||
} from './folderManager.js';
|
|
||||||
import { initUpload } from './upload.js';
|
import { initUpload } from './upload.js';
|
||||||
import { initAuth } from './auth.js';
|
import { initAuth, checkAuthentication } from './auth.js';
|
||||||
|
|
||||||
// Expose functions for inline handlers.
|
// Expose functions for inline handlers.
|
||||||
window.sendRequest = sendRequest;
|
window.sendRequest = sendRequest;
|
||||||
@@ -44,10 +41,16 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
showToast(message);
|
showToast(message);
|
||||||
sessionStorage.removeItem("welcomeMessage");
|
sessionStorage.removeItem("welcomeMessage");
|
||||||
}
|
}
|
||||||
|
checkAuthentication().then(authenticated => {
|
||||||
|
if (authenticated) {
|
||||||
window.currentFolder = "root";
|
window.currentFolder = "root";
|
||||||
window.updateFileActionButtons = updateFileActionButtons;
|
|
||||||
loadFileList(window.currentFolder);
|
loadFileList(window.currentFolder);
|
||||||
initFileActions();
|
initFileActions();
|
||||||
initUpload();
|
initUpload();
|
||||||
loadFolderTree();
|
loadFolderTree();
|
||||||
|
} else {
|
||||||
|
console.warn("User not authenticated. Data loading deferred.");
|
||||||
|
// Optionally redirect to login
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user