From 2dca088b42ca658362d9798614befd7537a1355f Mon Sep 17 00:00:00 2001
From: Tchoupinax <corentinfiloche@hotmail.fr>
Date: Wed, 15 Jul 2020 09:58:17 +0200
Subject: [PATCH 1/2] fix: add type=text for user_name (password manager)

---
 templates/admin/user/new.tmpl                   | 2 +-
 templates/user/auth/finalize_openid.tmpl        | 2 +-
 templates/user/auth/reset_passwd.tmpl           | 2 +-
 templates/user/auth/signin_inner.tmpl           | 2 +-
 templates/user/auth/signup_inner.tmpl           | 2 +-
 templates/user/auth/signup_openid_connect.tmpl  | 2 +-
 templates/user/auth/signup_openid_register.tmpl | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index 06b7d70efe356..44cd0049b7503 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -30,7 +30,7 @@
 				</div>
 				<div class="required field {{if .Err_UserName}}error{{end}}">
 					<label for="user_name">{{.i18n.Tr "username"}}</label>
-					<input id="user_name" name="user_name" value="{{.user_name}}" autofocus required>
+					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 				</div>
 				<div class="required field {{if .Err_Email}}error{{end}}">
 					<label for="email">{{.i18n.Tr "email"}}</label>
diff --git a/templates/user/auth/finalize_openid.tmpl b/templates/user/auth/finalize_openid.tmpl
index 5c637bd318d16..386b4ed8fa9d0 100644
--- a/templates/user/auth/finalize_openid.tmpl
+++ b/templates/user/auth/finalize_openid.tmpl
@@ -13,7 +13,7 @@
 					{{.CsrfTokenHtml}}
 					<div class="required inline field {{if .Err_UserName}}error{{end}}">
 						<label for="user_name">{{.i18n.Tr "home.uname_holder"}}</label>
-						<input id="user_name" name="user_name" value="{{.user_name}}" autofocus required>
+						<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 					</div>
 					<div class="required inline field {{if .Err_Password}}error{{end}}">
 						<label for="password">{{.i18n.Tr "password"}}</label>
diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl
index 91d5a5ef88dc5..9c78b649750db 100644
--- a/templates/user/auth/reset_passwd.tmpl
+++ b/templates/user/auth/reset_passwd.tmpl
@@ -13,7 +13,7 @@
 					{{if .user_email }}
 						<div class="inline field">
 							<label for="user_name">{{.i18n.Tr "email"}}</label>
-							<input id="user_name" type="text" value="{{ .user_email }}" disabled>
+							<input id="user_name" type="text" type="text" value="{{ .user_email }}" disabled>
 						</div>
 					{{end}}
 					{{if .IsResetForm}}
diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index 9850058e5eaf2..9f6b3da05de5d 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -13,7 +13,7 @@
 			{{.CsrfTokenHtml}}
 			<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
 				<label for="user_name">{{.i18n.Tr "home.uname_holder"}}</label>
-				<input id="user_name" name="user_name" value="{{.user_name}}" autofocus required>
+				<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 			</div>
 			{{if or (not .DisablePassword) .LinkAccountMode}}
 			<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index cdacd910d9b2a..3d9ba17ad7e59 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -19,7 +19,7 @@
 					{{else}}
 						<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
 							<label for="user_name">{{.i18n.Tr "username"}}</label>
-							<input id="user_name" name="user_name" value="{{.user_name}}" autofocus required>
+							<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 						</div>
 						<div class="required inline field {{if .Err_Email}}error{{end}}">
 							<label for="email">{{.i18n.Tr "email"}}</label>
diff --git a/templates/user/auth/signup_openid_connect.tmpl b/templates/user/auth/signup_openid_connect.tmpl
index 72b426f1b8660..9fce212c58cca 100644
--- a/templates/user/auth/signup_openid_connect.tmpl
+++ b/templates/user/auth/signup_openid_connect.tmpl
@@ -14,7 +14,7 @@
 					{{.CsrfTokenHtml}}
 					<div class="required inline field {{if .Err_UserName}}error{{end}}">
 						<label for="user_name">{{.i18n.Tr "home.uname_holder"}}</label>
-						<input id="user_name" name="user_name" value="{{.user_name}}" autofocus required>
+						<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 					</div>
 					<div class="required inline field {{if .Err_Password}}error{{end}}">
 						<label for="password">{{.i18n.Tr "password"}}</label>
diff --git a/templates/user/auth/signup_openid_register.tmpl b/templates/user/auth/signup_openid_register.tmpl
index 67f03a19edd19..861e8139116bc 100644
--- a/templates/user/auth/signup_openid_register.tmpl
+++ b/templates/user/auth/signup_openid_register.tmpl
@@ -14,7 +14,7 @@
 					{{.CsrfTokenHtml}}
 					<div class="required inline field {{if .Err_UserName}}error{{end}}">
 						<label for="user_name">{{.i18n.Tr "username"}}</label>
-						<input id="user_name" name="user_name" value="{{.user_name}}" autofocus required>
+						<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 					</div>
 					<div class="required inline field {{if .Err_Email}}error{{end}}">
 						<label for="email">{{.i18n.Tr "email"}}</label>

From c19b9aa8402aaf374fd454dc233bfa4449fd824e Mon Sep 17 00:00:00 2001
From: Tchoupinax <corentinfiloche@hotmail.fr>
Date: Wed, 15 Jul 2020 15:05:55 +0200
Subject: [PATCH 2/2] Update templates/user/auth/reset_passwd.tmpl

Co-authored-by: jaqra <48099350+jaqra@users.noreply.github.com>
---
 templates/user/auth/reset_passwd.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl
index 9c78b649750db..91d5a5ef88dc5 100644
--- a/templates/user/auth/reset_passwd.tmpl
+++ b/templates/user/auth/reset_passwd.tmpl
@@ -13,7 +13,7 @@
 					{{if .user_email }}
 						<div class="inline field">
 							<label for="user_name">{{.i18n.Tr "email"}}</label>
-							<input id="user_name" type="text" type="text" value="{{ .user_email }}" disabled>
+							<input id="user_name" type="text" value="{{ .user_email }}" disabled>
 						</div>
 					{{end}}
 					{{if .IsResetForm}}