From 65901a422c96e8977862609ce4a647a1a52d498f Mon Sep 17 00:00:00 2001
From: Sergey Vinogradov <mr.vursen@gmail.com>
Date: Fri, 1 Nov 2024 12:14:17 +0400
Subject: [PATCH] fix: exclude unchecked checkboxes from login form submissions
 (#8068) (#8071)

---
 packages/login/package.json                   |  1 +
 packages/login/src/vaadin-login-form-mixin.js | 12 ++++
 packages/login/test/login-submit-lit.test.js  |  1 +
 .../login/test/login-submit-polymer.test.js   |  1 +
 packages/login/test/login-submit.common.js    | 59 ++++++++++++++++---
 5 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/packages/login/package.json b/packages/login/package.json
index b56895726f..4c708119f4 100644
--- a/packages/login/package.json
+++ b/packages/login/package.json
@@ -49,6 +49,7 @@
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
+    "@vaadin/checkbox": "~24.4.12",
     "@vaadin/testing-helpers": "^0.6.0",
     "sinon": "^13.0.2"
   },
diff --git a/packages/login/src/vaadin-login-form-mixin.js b/packages/login/src/vaadin-login-form-mixin.js
index 11611d42f7..e4a5c05067 100644
--- a/packages/login/src/vaadin-login-form-mixin.js
+++ b/packages/login/src/vaadin-login-form-mixin.js
@@ -5,6 +5,10 @@
  */
 import { LoginMixin } from './vaadin-login-mixin.js';
 
+function isCheckbox(field) {
+  return (field.inputElement || field).type === 'checkbox';
+}
+
 /**
  * @polymerMixin
  * @mixes LoginMixin
@@ -63,6 +67,10 @@ export const LoginFormMixin = (superClass) =>
         detail.custom = {};
 
         fields.forEach((field) => {
+          if (isCheckbox(field) && !field.checked) {
+            return;
+          }
+
           detail.custom[field.name] = field.value;
         });
       }
@@ -91,6 +99,10 @@ export const LoginFormMixin = (superClass) =>
 
       if (this._customFields.length) {
         this._customFields.forEach((field) => {
+          if (isCheckbox(field) && !field.checked) {
+            return;
+          }
+
           formData.append(field.name, field.value);
         });
       }
diff --git a/packages/login/test/login-submit-lit.test.js b/packages/login/test/login-submit-lit.test.js
index eb1a834e31..914e5d605c 100644
--- a/packages/login/test/login-submit-lit.test.js
+++ b/packages/login/test/login-submit-lit.test.js
@@ -1,3 +1,4 @@
+import '@vaadin/checkbox/vaadin-lit-checkbox.js';
 import '../src/vaadin-lit-login-form.js';
 import '../src/vaadin-lit-login-overlay.js';
 import './login-submit.common.js';
diff --git a/packages/login/test/login-submit-polymer.test.js b/packages/login/test/login-submit-polymer.test.js
index d763881ce8..216ab47900 100644
--- a/packages/login/test/login-submit-polymer.test.js
+++ b/packages/login/test/login-submit-polymer.test.js
@@ -1,3 +1,4 @@
+import '@vaadin/checkbox';
 import '../src/vaadin-login-form.js';
 import '../src/vaadin-login-overlay.js';
 import './login-submit.common.js';
diff --git a/packages/login/test/login-submit.common.js b/packages/login/test/login-submit.common.js
index c0675c3fbc..4bbae7f76a 100644
--- a/packages/login/test/login-submit.common.js
+++ b/packages/login/test/login-submit.common.js
@@ -98,17 +98,18 @@ describe('login form submit', () => {
     beforeEach(async () => {
       overlay = fixtureSync(`
         <vaadin-login-overlay opened>
-          <input name="foo" value="bar" slot="custom-form-area">
-          <vaadin-text-field name="code" value="1234" slot="custom-form-area"></vaadin-text-field>
+          <input name="nativeCheckbox" type="checkbox" slot="custom-form-area">
+          <vaadin-checkbox name="vaadinCheckbox" slot="custom-form-area"></vaadin-checkbox>
+          <input name="nativeTextField" value="bar" slot="custom-form-area">
+          <vaadin-text-field name="vaadinTextField" value="1234" slot="custom-form-area"></vaadin-text-field>
         </vaadin-login-overlay>
       `);
       await nextRender();
       login = overlay.$.vaadinLoginForm;
     });
 
-    it('should add values of fields in the custom form area to the login event detail', () => {
+    it('should include values of text fields in login event detail', () => {
       const loginSpy = sinon.spy();
-
       overlay.addEventListener('login', loginSpy);
 
       const { vaadinLoginUsername } = fillUsernameAndPassword(login);
@@ -117,8 +118,38 @@ describe('login form submit', () => {
       expect(loginSpy.called).to.be.true;
 
       const { detail } = loginSpy.firstCall.args[0];
-      expect(detail.custom.foo).to.be.equal('bar');
-      expect(detail.custom.code).to.be.equal('1234');
+      expect(detail.custom.nativeTextField).to.be.equal('bar');
+      expect(detail.custom.vaadinTextField).to.be.equal('1234');
+    });
+
+    it('should not include values of unchecked checkboxes in login event detail', () => {
+      const loginSpy = sinon.spy();
+      overlay.addEventListener('login', loginSpy);
+
+      const { vaadinLoginUsername } = fillUsernameAndPassword(login);
+      enter(vaadinLoginUsername);
+      expect(loginSpy.called).to.be.true;
+
+      const event = loginSpy.firstCall.args[0];
+      expect(event.detail.custom).to.not.have.property('nativeCheckbox');
+      expect(event.detail.custom).to.not.have.property('vaadinCheckbox');
+    });
+
+    it('should include values of checked checkboxes in login event detail', () => {
+      const loginSpy = sinon.spy();
+      overlay.addEventListener('login', loginSpy);
+
+      const { vaadinLoginUsername } = fillUsernameAndPassword(login);
+
+      login.querySelector('[name=nativeCheckbox]').checked = true;
+      login.querySelector('[name=vaadinCheckbox]').checked = true;
+
+      enter(vaadinLoginUsername);
+      expect(loginSpy.called).to.be.true;
+
+      const event = loginSpy.firstCall.args[0];
+      expect(event.detail.custom.nativeCheckbox).to.equal('on');
+      expect(event.detail.custom.vaadinCheckbox).to.equal('on');
     });
 
     describe('form submit', () => {
@@ -127,8 +158,20 @@ describe('login form submit', () => {
         await nextRender();
       });
 
-      it('should submit values of fields in the custom form area to the native form', (done) => {
-        testFormSubmitValues(false, true, done, { foo: 'bar', code: '1234' });
+      it('should submit values of text fields in custom form area to the native form', (done) => {
+        testFormSubmitValues(false, true, done, { nativeTextField: 'bar', vaadinTextField: '1234' });
+      });
+
+      it('should submit values of checkboxes in custom form area to the native form when checked', (done) => {
+        login.querySelector('[name=nativeCheckbox]').checked = true;
+        login.querySelector('[name=vaadinCheckbox]').checked = true;
+
+        testFormSubmitValues(false, true, done, {
+          nativeCheckbox: 'on',
+          vaadinCheckbox: 'on',
+          nativeTextField: 'bar',
+          vaadinTextField: '1234',
+        });
       });
     });
   });