foris 6.11.1 → 6.11.2-beta.187b6872

package/common/WiFiSettings/WiFiForm.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2026 CZ.NIC z.s.p.o. (https://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -9,7 +9,10 @@ import React from "react";
 
 import PropTypes from "prop-types";
 
-import { HELP_TEXTS, HTMODES, BANDS, ENCRYPTIONMODES } from "./constants";
+import { HELP_TEXTS, HTMODES, BANDS } from "./constants";
+import getEncryptionChoices, {
+    getSupportedEncryption,
+} from "./encryptionHelpers";
 import WifiGuestForm from "./WiFiGuestForm";
 import WiFiQRCode from "./WiFiQRCode";
 import PasswordInput from "../../bootstrap/PasswordInput";
@@ -170,15 +173,27 @@ function DeviceForm({
                             // Get the last item in the available HT modes for the selected band
                             const bestHtmode =
                                 selectedBand.available_htmodes.slice(-1)[0];
+                            // The band limits the encryption, both for the
+                            // main and for the guest network
                             const deviceUpdate = {
                                 band: { $set: value },
                                 channel: { $set: "0" },
                                 htmode: { $set: bestHtmode },
+                                encryption: {
+                                    $set: getSupportedEncryption(
+                                        value,
+                                        formData.encryption
+                                    ),
+                                },
+                                guest_wifi: {
+                                    encryption: {
+                                        $set: getSupportedEncryption(
+                                            value,
+                                            formData.guest_wifi.encryption
+                                        ),
+                                    },
+                                },
                             };
-                            // The 6 GHz band supports only WPA3
-                            if (value === "6g") {
-                                deviceUpdate.encryption = { $set: "WPA3" };
-                            }
                             return {
                                 devices: {
                                     [deviceIndex]: deviceUpdate,
@@ -215,7 +230,10 @@ function DeviceForm({
 
                     <Select
                         label={_("Encryption")}
-                        choices={getEncryptionChoices(formData)}
+                        choices={getEncryptionChoices(
+                            formData.band,
+                            formData.encryption
+                        )}
                         helpText={HELP_TEXTS.wpa3}
                         value={formData.encryption}
                         onChange={setFormValue((value) => ({
@@ -255,6 +273,7 @@ function DeviceForm({
                                 ...formData.guest_wifi,
                             }}
                             formErrors={formErrors.guest_wifi || {}}
+                            band={formData.band}
                             setFormValue={setFormValue}
                             {...props}
                         />
@@ -306,15 +325,3 @@ function getBandChoices(device) {
         value: availableBand.band,
     }));
 }
-
-function getEncryptionChoices(device) {
-    if (device.encryption === "custom") {
-        ENCRYPTIONMODES.custom = _("Custom");
-    }
-    if (device.band === "6g") {
-        return {
-            WPA3: ENCRYPTIONMODES.WPA3,
-        };
-    }
-    return ENCRYPTIONMODES;
-}

package/common/WiFiSettings/WiFiGuestForm.js

@@ -9,7 +9,8 @@ import React from "react";
 
 import PropTypes from "prop-types";
 
-import { HELP_TEXTS, ENCRYPTIONMODES } from "./constants";
+import { HELP_TEXTS } from "./constants";
+import getEncryptionChoices from "./encryptionHelpers";
 import WiFiQRCode from "./WiFiQRCode";
 import PasswordInput from "../../bootstrap/PasswordInput";
 import Select from "../../bootstrap/Select";
@@ -30,6 +31,8 @@ WifiGuestForm.propTypes = {
     }),
     setFormValue: PropTypes.func.isRequired,
     deviceIndex: PropTypes.string,
+    /** Band of the device the guest network shares the radio with. */
+    band: PropTypes.string,
 };
 
 export default function WifiGuestForm({
@@ -37,6 +40,7 @@ export default function WifiGuestForm({
     formErrors,
     setFormValue,
     deviceIndex,
+    band,
     ...props
 }) {
     return (
@@ -93,7 +97,10 @@ export default function WifiGuestForm({
                     />
                     <Select
                         label={_("Encryption")}
-                        choices={ENCRYPTIONMODES}
+                        choices={getEncryptionChoices(
+                            band,
+                            formData.encryption
+                        )}
                         helpText={HELP_TEXTS.wpa3}
                         value={formData.encryption}
                         onChange={setFormValue((value) => ({

package/common/WiFiSettings/WiFiSettings.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2026 CZ.NIC z.s.p.o. (https://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -9,6 +9,7 @@ import React from "react";
 
 import PropTypes from "prop-types";
 
+import { getSupportedEncryption } from "./encryptionHelpers";
 import ResetWiFiSettings from "./ResetWiFiSettings";
 import WiFiForm from "./WiFiForm";
 import ForisForm from "../../form/components/ForisForm";
@@ -43,6 +44,20 @@ function WiFiSettings({ ws, endpoint, resetEndpoint, hasGuestNetwork }) {
 function prepData(formData) {
     formData.devices.forEach((device, idx) => {
         formData.devices[idx].channel = device.channel.toString();
+
+        // A device can be delivered by the API on a band which doesn't
+        // support its encryption (e.g. WPA2/3 on 6 GHz). Such a value is not
+        // among the choices of the select, so the select falls back to
+        // displaying its first choice while the form keeps (and submits) the
+        // unsupported one.
+        formData.devices[idx].encryption = getSupportedEncryption(
+            device.band,
+            device.encryption
+        );
+        formData.devices[idx].guest_wifi.encryption = getSupportedEncryption(
+            device.band,
+            device.guest_wifi.encryption
+        );
     });
     return formData;
 }
@@ -58,8 +73,20 @@ function prepDataToSubmit(formData) {
             return;
         }
 
-        if (!device.guest_wifi.enabled)
+        if (!device.guest_wifi.enabled) {
             formData.devices[idx].guest_wifi = { enabled: false };
+        } else {
+            formData.devices[idx].guest_wifi.encryption =
+                getSupportedEncryption(
+                    device.band,
+                    device.guest_wifi.encryption
+                );
+        }
+
+        formData.devices[idx].encryption = getSupportedEncryption(
+            device.band,
+            device.encryption
+        );
 
         if (device.encryption === "WPA2") {
             delete formData.devices[idx].ieee80211w_disabled;

package/common/WiFiSettings/encryptionHelpers.js

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2019-2026 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ *
+ * This is free software, licensed under the GNU General Public License v3.
+ * See /LICENSE for more information.
+ */
+
+import { ENCRYPTIONMODES } from "./constants";
+
+// Both the main and the guest network run on the same radio, so the band
+// limits the encryption choices of both of them. A custom encryption comes
+// from a hand-made configuration, it's offered on any band to keep the form
+// from rewriting it.
+export default function getEncryptionChoices(band, encryption) {
+    const customChoice = encryption === "custom" ? { custom: _("Custom") } : {};
+    if (band === "6g") {
+        return { WPA3: ENCRYPTIONMODES.WPA3, ...customChoice };
+    }
+    return { ...ENCRYPTIONMODES, ...customChoice };
+}
+
+// Encryption the band actually supports. Filtering the choices only hides the
+// unsupported ones from the select, the value itself has to follow the band as
+// well, otherwise the select displays its single WPA3 choice while the form
+// still holds (and submits) e.g. WPA2/3.
+export function getSupportedEncryption(band, encryption) {
+    if (band === "6g" && encryption !== "custom") {
+        return "WPA3";
+    }
+    return encryption;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "foris",
-    "version": "6.11.1",
+    "version": "6.11.2-beta.187b6872",
     "description": "Foris JS library is a set of components and utils for reForis application and plugins.",
     "author": "CZ.NIC, z.s.p.o.",
     "repository": {