From a688bc507c79967c676d75fd77a59fb2dda4ee7e Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sun, 23 Jan 2022 12:18:32 -0800
Subject: [PATCH] GUACAMOLE-1509: Add name attribute to all applicable fields.

---
 .../src/main/resources/templates/authenticationCodeField.html | 1 +
 .../main/frontend/src/app/form/templates/checkboxField.html   | 1 +
 .../src/main/frontend/src/app/form/templates/dateField.html   | 1 +
 .../src/main/frontend/src/app/form/templates/emailField.html  | 1 +
 .../main/frontend/src/app/form/templates/languageField.html   | 1 +
 .../src/main/frontend/src/app/form/templates/numberField.html | 1 +
 .../main/frontend/src/app/form/templates/passwordField.html   | 1 +
 .../src/main/frontend/src/app/form/templates/selectField.html | 1 +
 .../src/app/form/templates/terminalColorSchemeField.html      | 4 +++-
 .../main/frontend/src/app/form/templates/textAreaField.html   | 1 +
 .../src/main/frontend/src/app/form/templates/textField.html   | 1 +
 .../src/main/frontend/src/app/form/templates/timeField.html   | 1 +
 .../main/frontend/src/app/form/templates/timeZoneField.html   | 1 +
 13 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/extensions/guacamole-auth-totp/src/main/resources/templates/authenticationCodeField.html b/extensions/guacamole-auth-totp/src/main/resources/templates/authenticationCodeField.html
index 30c07f434..7f2a3c485 100644
--- a/extensions/guacamole-auth-totp/src/main/resources/templates/authenticationCodeField.html
+++ b/extensions/guacamole-auth-totp/src/main/resources/templates/authenticationCodeField.html
@@ -41,6 +41,7 @@
     <div class="totp-code">
         <input type="text"
                placeholder="{{'TOTP.FIELD_PLACEHOLDER_CODE' |translate}}"
+               ng-attr-name="{{ field.name }}"
                ng-model="model" autocorrect="off" autocapitalize="off" autofocus>
     </div>
 
diff --git a/guacamole/src/main/frontend/src/app/form/templates/checkboxField.html b/guacamole/src/main/frontend/src/app/form/templates/checkboxField.html
index 80666c018..f0881bd11 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/checkboxField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/checkboxField.html
@@ -1,5 +1,6 @@
 <input type="checkbox"
        ng-attr-id="{{ fieldId }}"
+       ng-attr-name="{{ field.name }}"
        ng-disabled="disabled"
        ng-model="typedValue"
        guac-focus="focused"
diff --git a/guacamole/src/main/frontend/src/app/form/templates/dateField.html b/guacamole/src/main/frontend/src/app/form/templates/dateField.html
index 9048dec36..93a231f35 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/dateField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/dateField.html
@@ -2,6 +2,7 @@
     <input type="date"
            ng-disabled="disabled"
            ng-attr-id="{{ fieldId }}"
+           ng-attr-name="{{ field.name }}"
            ng-model="typedValue"
            ng-model-options="modelOptions"
            guac-lenient-date
diff --git a/guacamole/src/main/frontend/src/app/form/templates/emailField.html b/guacamole/src/main/frontend/src/app/form/templates/emailField.html
index 677abba2f..c5170b796 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/emailField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/emailField.html
@@ -2,6 +2,7 @@
     <input type="email"
            ng-disabled="disabled"
            ng-attr-id="{{ fieldId }}"
+           ng-attr-name="{{ field.name }}"
            ng-model="model"
            ng-hide="readOnly"
            guac-focus="focused"
diff --git a/guacamole/src/main/frontend/src/app/form/templates/languageField.html b/guacamole/src/main/frontend/src/app/form/templates/languageField.html
index 2a22ff27d..8b74b5866 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/languageField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/languageField.html
@@ -1,4 +1,5 @@
 <select guac-focus="focused"
         ng-attr-id="{{ fieldId }}"
+        ng-attr-name="{{ field.name }}"
         ng-model="model"
         ng-options="language.key as language.value for language in languages | toArray | orderBy: key"></select>
diff --git a/guacamole/src/main/frontend/src/app/form/templates/numberField.html b/guacamole/src/main/frontend/src/app/form/templates/numberField.html
index b7666c680..2d270d689 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/numberField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/numberField.html
@@ -1,6 +1,7 @@
 <input type="number"
        ng-disabled="disabled"
        ng-attr-id="{{ fieldId }}"
+       ng-attr-name="{{ field.name }}"
        ng-model="typedValue"
        guac-focus="focused"
        autocorrect="off"
diff --git a/guacamole/src/main/frontend/src/app/form/templates/passwordField.html b/guacamole/src/main/frontend/src/app/form/templates/passwordField.html
index 3e1b2e512..17cfc0a6c 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/passwordField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/passwordField.html
@@ -2,6 +2,7 @@
     <input type="{{passwordInputType}}"
            ng-disabled="disabled"
            ng-attr-id="{{ fieldId }}"
+           ng-attr-name="{{ field.name }}"
            ng-model="model"
            ng-trim="false"
            guac-focus="focused"
diff --git a/guacamole/src/main/frontend/src/app/form/templates/selectField.html b/guacamole/src/main/frontend/src/app/form/templates/selectField.html
index 2c672aa9f..939956bb4 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/selectField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/selectField.html
@@ -1,4 +1,5 @@
 <select ng-attr-id="{{ fieldId }}"
+        ng-attr-name="{{ field.name }}"
         ng-disabled="disabled"
         guac-focus="focused"
         ng-model="model"
diff --git a/guacamole/src/main/frontend/src/app/form/templates/terminalColorSchemeField.html b/guacamole/src/main/frontend/src/app/form/templates/terminalColorSchemeField.html
index a8425e41e..027f4e751 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/terminalColorSchemeField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/terminalColorSchemeField.html
@@ -4,7 +4,9 @@
     }">
 
     <!-- Pre-defined color scheme options -->
-    <select ng-attr-id="{{ fieldId }}" ng-model="selectedColorScheme">
+    <select ng-attr-id="{{ fieldId }}"
+            ng-attr-name="{{ field.name }}"
+            ng-model="selectedColorScheme">
         <option ng-repeat="option in field.options | orderBy: value"
                 ng-value="option">{{ getFieldOption(option) | translate }}</option>
         <option value="custom">{{ 'COLOR_SCHEME.FIELD_OPTION_CUSTOM' | translate }}</option>
diff --git a/guacamole/src/main/frontend/src/app/form/templates/textAreaField.html b/guacamole/src/main/frontend/src/app/form/templates/textAreaField.html
index 9761af77e..74284c73c 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/textAreaField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/textAreaField.html
@@ -1,4 +1,5 @@
 <textarea ng-attr-id="{{ fieldId }}"
+          ng-attr-name="{{ field.name }}"
           ng-model="model"
           ng-disabled="disabled"
           guac-focus="focused"
diff --git a/guacamole/src/main/frontend/src/app/form/templates/textField.html b/guacamole/src/main/frontend/src/app/form/templates/textField.html
index 856ec8d0d..fac7b3818 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/textField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/textField.html
@@ -2,6 +2,7 @@
     <input type="text"
            ng-attr-id="{{ fieldId }}"
            ng-attr-list="{{ dataListId }}"
+           ng-attr-name="{{ field.name }}"
            ng-model="model"
            ng-disabled="disabled"
            guac-focus="focused"
diff --git a/guacamole/src/main/frontend/src/app/form/templates/timeField.html b/guacamole/src/main/frontend/src/app/form/templates/timeField.html
index f7efeb3eb..0b33f5fb1 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/timeField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/timeField.html
@@ -2,6 +2,7 @@
     <input type="time"
            ng-disabled="disabled"
            ng-attr-id="{{ fieldId }}"
+           ng-attr-name="{{ field.name }}"
            ng-model="typedValue"
            ng-model-options="modelOptions"
            guac-focus="focused"
diff --git a/guacamole/src/main/frontend/src/app/form/templates/timeZoneField.html b/guacamole/src/main/frontend/src/app/form/templates/timeZoneField.html
index ecab57db9..690bf68a4 100644
--- a/guacamole/src/main/frontend/src/app/form/templates/timeZoneField.html
+++ b/guacamole/src/main/frontend/src/app/form/templates/timeZoneField.html
@@ -10,6 +10,7 @@
 
     <!-- Time zones within selected region -->
     <select class="time-zone"
+            ng-attr-name="{{ field.name }}"
             ng-disabled="disabled || !region"
             ng-model="model"
             ng-options="timeZone.value as timeZone.key for timeZone in timeZones[region] | toArray | orderBy: key"></select>