eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix the login form

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2023-03-31 16:41:48 +02:00
parent c1595afe2d
commit 9954641e02
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
php/public/forms.js
View file

@ -20,8 +20,10 @@
if (xhr.status === 201) { if (xhr.status === 201) {
window.location.replace(xhr.getResponseHeader('Location')); window.location.replace(xhr.getResponseHeader('Location'));
} else if (xhr.status === 422) { } else if (xhr.status === 422) {
disableSpinner()
showError(xhr.response); showError(xhr.response);
} else if (xhr.status === 500) { } else if (xhr.status === 500) {
disableSpinner()
showError("Server error. Please check the mastercontainer logs for details."); showError("Server error. Please check the mastercontainer logs for details.");
} else { } else {
// If the responose is not one of the above, we should reload to show the latest content // If the responose is not one of the above, we should reload to show the latest content
@ -29,16 +31,12 @@
} }
} }
function disable(element) { function disableSpinnerSpinner() {
document.getElementById('overlay').classList.add('loading'); document.getElementById('overlay').classList.add('loading');
element.classList.add('loading');
element.disabled = true;
} }
function enable(element) { function disableSpinner() {
document.getElementById('overlay').classList.remove('loading'); document.getElementById('overlay').classList.remove('loading');
element.classList.remove('loading');
element.disabled = false;
} }
function initForm(form) { function initForm(form) {
@ -50,11 +48,10 @@
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.addEventListener('load', handleEvent); xhr.addEventListener('load', handleEvent);
xhr.addEventListener('error', () => showError("Failed to talk to server.")); xhr.addEventListener('error', () => showError("Failed to talk to server."));
xhr.addEventListener('load', () => enable(event.submitter)); xhr.addEventListener('error', () => disableSpinner());
xhr.addEventListener('error', () => enable(event.submitter));
xhr.open(form.method, form.getAttribute("action")); xhr.open(form.method, form.getAttribute("action"));
xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
disable(event.submitter); disableSpinnerSpinner();
xhr.send(new URLSearchParams(new FormData(form))); xhr.send(new URLSearchParams(new FormData(form)));
event.preventDefault(); event.preventDefault();
} }

8
php/src/Controller/LoginController.php
View file

@ -21,15 +21,17 @@ class LoginController
public function TryLogin(Request $request, Response $response, array $args) : Response { public function TryLogin(Request $request, Response $response, array $args) : Response {
if (!$this->dockerActionManager->isLoginAllowed()) { if (!$this->dockerActionManager->isLoginAllowed()) {
return $response->withHeader('Location', '/')->withStatus(302); $response->getBody()->write("The login is blocked since Nextcloud is running.");
return $response->withHeader('Location', '/')->withStatus(422);
} }
$password = $request->getParsedBody()['password'] ?? ''; $password = $request->getParsedBody()['password'] ?? '';
if($this->authManager->CheckCredentials($password)) { if($this->authManager->CheckCredentials($password)) {
$this->authManager->SetAuthState(true); $this->authManager->SetAuthState(true);
return $response->withHeader('Location', '/')->withStatus(302); return $response->withHeader('Location', '/')->withStatus(201);
} }
return $response->withHeader('Location', '/')->withStatus(302); $response->getBody()->write("The password is false.");
return $response->withHeader('Location', '/')->withStatus(422);
} }
public function GetTryLogin(Request $request, Response $response, array $args) : Response { public function GetTryLogin(Request $request, Response $response, array $args) : Response {

2
php/templates/login.twig
View file

@ -7,7 +7,7 @@
<h1>Nextcloud AIO Login</h1> <h1>Nextcloud AIO Login</h1>
{% if is_login_allowed == true %} {% if is_login_allowed == true %}
<p>Log in using your Nextcloud AIO password:</p> <p>Log in using your Nextcloud AIO password:</p>
<form method="POST" action="/api/auth/login"> <form method="POST" action="/api/auth/login" class="xhr">
<input type="text" autocomplete="off" name="password" placeholder="Password" /> <input type="text" autocomplete="off" name="password" placeholder="Password" />
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}"> <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}"> <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">