daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-05-28 06:20:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: hide deSEC password field until email-already-registered 422 error"

Browse Source 
This reverts commit f0fb065dc2.
This commit is contained in:
Simon L.
2026-04-26 18:25:43 +02:00
parent 11d8050085
commit 2b78dcc9cc
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
php/public/forms.js
View File

@@ -16,21 +16,13 @@
setTimeout(toast.remove.bind(toast), 10000)
}
function handleEvent(e, form) {
function handleEvent(e) {
const xhr = e.target;
if (xhr.status === 201) {
window.location.replace(xhr.getResponseHeader('Location'));
} else if (xhr.status === 422) {
disableSpinner()
showError(xhr.response);
if (form) {
const revealSelector = form.dataset.revealOnError;
const revealWhen = form.dataset.revealWhen;
if (revealSelector && (!revealWhen || xhr.response.includes(revealWhen))) {
const target = document.querySelector(revealSelector);
if (target) target.style.display = '';
}
}
} else if (xhr.status === 500) {
showError("Server error. Please check the mastercontainer logs for details. This page will reload after 10s automatically. Then you can check the mastercontainer logs.");
// Reload after 10s since it is expected that the updated view is shown (e.g. after starting containers)
@@ -58,7 +50,7 @@
lastError.remove()
}
let xhr = new XMLHttpRequest();
xhr.addEventListener('load', function(e) { handleEvent(e, form); });
xhr.addEventListener('load', handleEvent);
xhr.addEventListener('error', () => showError("Failed to talk to server."));
xhr.addEventListener('error', () => disableSpinner());
xhr.open(form.method, form.getAttribute("action"));

8
php/templates/includes/desec-register.twig
View File

@@ -12,14 +12,12 @@
</form>
{% else %}
<p>Please enter your email address. You can also enter a desired subdomain slug (the part before <code>.dedyn.io</code>); leave it blank for a random one.</p>
<form method="POST" action="api/desec/register" class="xhr" data-reveal-on-error="#desec-password-field" data-reveal-when="already registered at deSEC">
<p>If you already have a deSEC account for this email address, enter your deSEC password in the optional password field below to log in with it instead of creating a new account.</p>
<form method="POST" action="api/desec/register" class="xhr">
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input type="email" name="desec_email" placeholder="your@email.com" required />
<div id="desec-password-field" style="display:none">
<p>This email address is already registered at deSEC. Enter your deSEC password below to log in with it instead of creating a new account.</p>
<input type="password" name="desec_password" placeholder="deSEC password" autocomplete="current-password" />
</div>
<input type="password" name="desec_password" placeholder="deSEC password (only if already registered)" autocomplete="current-password" />
<input type="text" name="desec_slug" placeholder="my-nextcloud (optional)" pattern="[a-z0-9]([a-z0-9\-]{0,61}[a-z0-9])?" title="Only lowercase letters, digits and hyphens (1–63 characters). No leading or trailing hyphen." />
<input type="submit" value="Register free domain via deSEC" />
</form>