From 9e26e2482051ed29978c4a173b29efefcf575eef Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Sat, 17 Jun 2023 06:52:30 +0000
Subject: [PATCH 01/12] show AIO password

Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/public/forms.js      | 6 ++++++
 php/templates/login.twig | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/php/public/forms.js b/php/public/forms.js
index 28c46a77..b3896469 100644
--- a/php/public/forms.js
+++ b/php/public/forms.js
@@ -39,6 +39,12 @@
     document.getElementById('overlay').classList.remove('loading');
   }
 
+  function mirrorPassword() {
+    var Password = document.getElementById("Password");
+    var mirroredPassword = document.getElementById("mirroredPassword");
+    mirroredPassword.innerText = Password.value;
+  }
+
   function initForm(form) {
     function submit(event)
     {
diff --git a/php/templates/login.twig b/php/templates/login.twig
index 5659c4db..674b8b2e 100644
--- a/php/templates/login.twig
+++ b/php/templates/login.twig
@@ -8,9 +8,10 @@
             {% if is_login_allowed == true %}
                 <p>Log in using your Nextcloud AIO password:</p>
                 <form method="POST" action="/api/auth/login" class="xhr">
-                    <input type="text" autocomplete="off" name="password" placeholder="Password" />
+                    <input name="password" placeholder="Password" autocomplete="on" type="password" wfd-id="id0" id="Password" oninput="mirrorPassword()">
                     <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                     <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
+                    <a>Password: </a><a id="mirroredPassword"></a><br><br>
                     <input type="submit" class="button" value="Log in" />
                 </form>
             {% else %}

From ae1d14dbc53144afcc64450ca2459d0e16a8733a Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Sat, 17 Jun 2023 08:57:06 +0200
Subject: [PATCH 02/12] reorder options

Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/templates/login.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/templates/login.twig b/php/templates/login.twig
index 674b8b2e..447ef0e9 100644
--- a/php/templates/login.twig
+++ b/php/templates/login.twig
@@ -8,7 +8,7 @@
             {% if is_login_allowed == true %}
                 <p>Log in using your Nextcloud AIO password:</p>
                 <form method="POST" action="/api/auth/login" class="xhr">
-                    <input name="password" placeholder="Password" autocomplete="on" type="password" wfd-id="id0" id="Password" oninput="mirrorPassword()">
+                    <input type="password" autocomplete="on" name="password" placeholder="Password" wfd-id="id0" id="Password" oninput="mirrorPassword()">
                     <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                     <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
                     <a>Password: </a><a id="mirroredPassword"></a><br><br>

From e8ed7aa236e301f356c2523b9f5cc0b3afcd789a Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Sat, 24 Jun 2023 02:29:09 +0200
Subject: [PATCH 03/12] Update forms.js

Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/public/forms.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/php/public/forms.js b/php/public/forms.js
index b3896469..c3cd3c85 100644
--- a/php/public/forms.js
+++ b/php/public/forms.js
@@ -39,10 +39,13 @@
     document.getElementById('overlay').classList.remove('loading');
   }
 
-  function mirrorPassword() {
+  function showPassword() {
     var Password = document.getElementById("Password");
-    var mirroredPassword = document.getElementById("mirroredPassword");
-    mirroredPassword.innerText = Password.value;
+    if (Password.value !== "" && x.type === "password") {
+      Password.type = "text";
+    } else {
+      Password.type = "password";
+    }
   }
 
   function initForm(form) {

From a77df43dff9a6da562c0530e8eaabb1f783e3b25 Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Sat, 24 Jun 2023 02:31:03 +0200
Subject: [PATCH 04/12] update

Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/templates/login.twig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/php/templates/login.twig b/php/templates/login.twig
index 447ef0e9..b8418f0e 100644
--- a/php/templates/login.twig
+++ b/php/templates/login.twig
@@ -8,10 +8,9 @@
             {% if is_login_allowed == true %}
                 <p>Log in using your Nextcloud AIO password:</p>
                 <form method="POST" action="/api/auth/login" class="xhr">
-                    <input type="password" autocomplete="on" name="password" placeholder="Password" wfd-id="id0" id="Password" oninput="mirrorPassword()">
+                    <input type="password" autocomplete="current-password" name="password" placeholder="Password" wfd-id="id0" id="Password" oninput="showPassword()">
                     <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                     <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
-                    <a>Password: </a><a id="mirroredPassword"></a><br><br>
                     <input type="submit" class="button" value="Log in" />
                 </form>
             {% else %}

From f8d02440c18935b151bcca105f42333e3e9441b1 Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Sat, 24 Jun 2023 02:33:01 +0200
Subject: [PATCH 05/12] fix js

Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/public/forms.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/public/forms.js b/php/public/forms.js
index c3cd3c85..04fa4b0a 100644
--- a/php/public/forms.js
+++ b/php/public/forms.js
@@ -41,7 +41,7 @@
 
   function showPassword() {
     var Password = document.getElementById("Password");
-    if (Password.value !== "" && x.type === "password") {
+    if (Password.value !== "" && Password.type === "password") {
       Password.type = "text";
     } else {
       Password.type = "password";

From 13a9b9beafd00e176accd985e3b1c73ead1c10e4 Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Sun, 25 Jun 2023 17:04:00 +0200
Subject: [PATCH 06/12] Update containers.twig

Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/templates/containers.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 2e8e5d52..04a3aa68 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -509,8 +509,8 @@
                                 <summary>Click here to change your AIO password</summary><br />
                                 You can change your AIO password below:<br><br />
                                 <form method="POST" action="/api/configuration" class="xhr">
-                                    <input type="text" autocomplete="current-password" name="current-master-password" placeholder="Your current AIO password"/>
-                                    <input type="text" autocomplete="new-password" name="new-master-password" placeholder="Your new AIO password"/>
+                                    <input type="password" autocomplete="current-password" name="current-master-password" placeholder="Your current AIO password" id="current-master-password" oninput="showPassword('current-master-password')">
+                                    <input type="password" autocomplete="new-password" name="new-master-password" placeholder="Your new AIO password" id="new-master-password" oninput="showPassword('new-master-password')">
                                     <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                                     <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
                                     <input class="button" type="submit" value="Submit password change" />

From 203b7cb3fc2e38045657d970cf7797d8ffb20e13 Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Mon, 26 Jun 2023 12:26:48 +0200
Subject: [PATCH 07/12] Update php/templates/login.twig

Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/templates/login.twig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/php/templates/login.twig b/php/templates/login.twig
index b8418f0e..2b9c8af3 100644
--- a/php/templates/login.twig
+++ b/php/templates/login.twig
@@ -8,7 +8,8 @@
             {% if is_login_allowed == true %}
                 <p>Log in using your Nextcloud AIO password:</p>
                 <form method="POST" action="/api/auth/login" class="xhr">
-                    <input type="password" autocomplete="current-password" name="password" placeholder="Password" wfd-id="id0" id="Password" oninput="showPassword()">
+                    <input type="password" autocomplete="current-password" name="password" placeholder="Password" id="passwordInput" oninput="showPassword('passwordInput')">
+
                     <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                     <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
                     <input type="submit" class="button" value="Log in" />

From 620c72de23dce326e110557d3d8f9d22e6e5965c Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Mon, 26 Jun 2023 12:26:56 +0200
Subject: [PATCH 08/12] Update php/public/forms.js

Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/public/forms.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/php/public/forms.js b/php/public/forms.js
index 04fa4b0a..940e4ee3 100644
--- a/php/public/forms.js
+++ b/php/public/forms.js
@@ -39,12 +39,12 @@
     document.getElementById('overlay').classList.remove('loading');
   }
 
-  function showPassword() {
-    var Password = document.getElementById("Password");
-    if (Password.value !== "" && Password.type === "password") {
-      Password.type = "text";
-    } else {
-      Password.type = "password";
+  function showPassword(id) {
+    let passwordField = document.getElementById(id);
+    if (passwordField.value !== "" && passwordField.type !== "text") {
+      passwordField.type = "text";
+    } else if (passwordField.value === "" && passwordField.type !== "password") {
+      passwordField.type = "password";
     }
   }
 

From 1ba0f1b7a3b9be5f456ee3a192c65cb90fc3ab56 Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Mon, 26 Jun 2023 15:12:01 +0200
Subject: [PATCH 09/12] Update php/templates/login.twig

Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/templates/login.twig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/php/templates/login.twig b/php/templates/login.twig
index 2b9c8af3..0b515d25 100644
--- a/php/templates/login.twig
+++ b/php/templates/login.twig
@@ -8,7 +8,8 @@
             {% if is_login_allowed == true %}
                 <p>Log in using your Nextcloud AIO password:</p>
                 <form method="POST" action="/api/auth/login" class="xhr">
-                    <input type="password" autocomplete="current-password" name="password" placeholder="Password" id="passwordInput" oninput="showPassword('passwordInput')">
+                    <input type="password" autocomplete="current-password" name="password" placeholder="Password" id="master-password" oninput="showPassword('master-password')">
+
 
                     <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                     <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">

From 559101a3089c2a9592eccbfb57c0434459178805 Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Mon, 26 Jun 2023 15:13:14 +0200
Subject: [PATCH 10/12] Update php/templates/login.twig

Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/templates/login.twig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/php/templates/login.twig b/php/templates/login.twig
index 0b515d25..4ddd1257 100644
--- a/php/templates/login.twig
+++ b/php/templates/login.twig
@@ -10,7 +10,6 @@
                 <form method="POST" action="/api/auth/login" class="xhr">
                     <input type="password" autocomplete="current-password" name="password" placeholder="Password" id="master-password" oninput="showPassword('master-password')">
 
-
                     <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                     <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
                     <input type="submit" class="button" value="Log in" />

From dd02dc82a5fe8a45b6598a6e4399ba99883534bb Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Mon, 26 Jun 2023 17:42:33 +0200
Subject: [PATCH 11/12] Update php/public/forms.js

Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/public/forms.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/public/forms.js b/php/public/forms.js
index 940e4ee3..52c72b92 100644
--- a/php/public/forms.js
+++ b/php/public/forms.js
@@ -41,7 +41,7 @@
 
   function showPassword(id) {
     let passwordField = document.getElementById(id);
-    if (passwordField.value !== "" && passwordField.type !== "text") {
+    if (passwordField.type === "password" && passwordField.value !== "") {
       passwordField.type = "text";
     } else if (passwordField.value === "" && passwordField.type !== "password") {
       passwordField.type = "password";

From a5a1ea504a656894d8b474752cadbaff8eaa3043 Mon Sep 17 00:00:00 2001
From: Zoey <zoey@z0ey.de>
Date: Mon, 26 Jun 2023 17:42:46 +0200
Subject: [PATCH 12/12] Update php/public/forms.js

Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
---
 php/public/forms.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/public/forms.js b/php/public/forms.js
index 52c72b92..dde9a1ef 100644
--- a/php/public/forms.js
+++ b/php/public/forms.js
@@ -43,7 +43,7 @@
     let passwordField = document.getElementById(id);
     if (passwordField.type === "password" && passwordField.value !== "") {
       passwordField.type = "text";
-    } else if (passwordField.value === "" && passwordField.type !== "password") {
+    } else if (passwordField.type === "text" && passwordField.value === "") {
       passwordField.type = "password";
     }
   }