From 6352060da32a81a3772d1c88ac00db07d796e28e Mon Sep 17 00:00:00 2001
From: Aleksandr Gumroian <aleksandr.gumroian@nic.cz>
Date: Mon, 9 Dec 2024 16:50:29 +0100
Subject: [PATCH 1/2] Add encryption selection to WiFiGuestForm

---
 src/common/WiFiSettings/WiFiGuestForm.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/common/WiFiSettings/WiFiGuestForm.js b/src/common/WiFiSettings/WiFiGuestForm.js
index 49d34de..05483e9 100644
--- a/src/common/WiFiSettings/WiFiGuestForm.js
+++ b/src/common/WiFiSettings/WiFiGuestForm.js
@@ -9,9 +9,10 @@ import React from "react";
 
 import PropTypes from "prop-types";
 
-import { HELP_TEXTS } from "./constants";
+import { HELP_TEXTS, ENCRYPTIONMODES } from "./constants";
 import WiFiQRCode from "./WiFiQRCode";
 import PasswordInput from "../../bootstrap/PasswordInput";
+import Select from "../../bootstrap/Select";
 import Switch from "../../bootstrap/Switch";
 import TextInput from "../../bootstrap/TextInput";
 
@@ -21,6 +22,7 @@ WifiGuestForm.propTypes = {
         SSID: PropTypes.string.isRequired,
         password: PropTypes.string.isRequired,
         enabled: PropTypes.bool.isRequired,
+        encryption: PropTypes.string.isRequired,
     }),
     formErrors: PropTypes.shape({
         SSID: PropTypes.string,
@@ -89,6 +91,20 @@ export default function WifiGuestForm({
                         }))}
                         {...props}
                     />
+                    <Select
+                        label={_("Encryption")}
+                        choices={ENCRYPTIONMODES}
+                        helpText={HELP_TEXTS.wpa3}
+                        value={formData.encryption}
+                        onChange={setFormValue((value) => ({
+                            devices: {
+                                [formData.id]: {
+                                    guest_wifi: { encryption: { $set: value } },
+                                },
+                            },
+                        }))}
+                        {...props}
+                    />
                 </>
             ) : null}
         </>

From ee6865e3bb5d9efb8559ff0acfe5c3391c61ba75 Mon Sep 17 00:00:00 2001
From: Aleksandr Gumroian <aleksandr.gumroian@nic.cz>
Date: Mon, 9 Dec 2024 16:51:08 +0100
Subject: [PATCH 2/2] Update Snapshots

---
 .../__snapshots__/WiFiSettings.test.js.snap   | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
index 8b14453..fed84c1 100644
--- a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
+++ b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
@@ -339,7 +339,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 - First value
 + Second value
 
-@@ -524,10 +524,87 @@
+@@ -524,10 +524,124 @@
             <small>
               Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to access the internet, but aren't allowed to access other devices and the configuration interface of the router. Parameters of the guest network can be set in the Guest network tab.
             </small>
@@ -421,13 +421,50 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +             WPA2/3 pre-shared key, that is required to connect to the network.
 +           </small>
 +         </div>
++       </div>
++       <div
++         class="mb-3"
++       >
++         <label
++           class="form-label"
++           for="14"
++         >
++           Encryption
++         </label>
++         <select
++           class="form-select"
++           id="14"
++         >
++           <option
++             value="WPA3"
++           >
++             WPA3 only
++           </option>
++           <option
++             value="WPA2/3"
++           >
++             WPA3 with WPA2 as fallback (default)
++           </option>
++           <option
++             value="WPA2"
++           >
++             WPA2 only
++           </option>
++         </select>
++         <div
++           class="form-text"
++         >
++           <small>
++             The WPA3 standard is the new most secure encryption method that is suggested to be used with any device that supports it. The older devices without WPA3 support require older WPA2. If you experience issues with connecting older devices, try to enable WPA2.
++           </small>
++         </div>
 +       </div>
         <hr />
         <div
           class="form-check form-switch mb-3 d-flex align-items-center"
         >
           <input
-@@ -550,10 +627,11 @@
+@@ -550,10 +664,11 @@
         <div
           class="text-end"
         >