foris 6.11.0 → 6.11.1-beta.6db5402e

package/common/WiFiSettings/WiFiForm.js

@@ -9,7 +9,8 @@ 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 from "./encryptionHelpers";
 import WifiGuestForm from "./WiFiGuestForm";
 import WiFiQRCode from "./WiFiQRCode";
 import PasswordInput from "../../bootstrap/PasswordInput";
@@ -170,13 +171,22 @@ function DeviceForm({
                             // Get the last item in the available HT modes for the selected band
                             const bestHtmode =
                                 selectedBand.available_htmodes.slice(-1)[0];
+                            const deviceUpdate = {
+                                band: { $set: value },
+                                channel: { $set: "0" },
+                                htmode: { $set: bestHtmode },
+                            };
+                            // The 6 GHz band supports only WPA3, both for the
+                            // main and for the guest network
+                            if (value === "6g") {
+                                deviceUpdate.encryption = { $set: "WPA3" };
+                                deviceUpdate.guest_wifi = {
+                                    encryption: { $set: "WPA3" },
+                                };
+                            }
                             return {
                                 devices: {
-                                    [deviceIndex]: {
-                                        band: { $set: value },
-                                        channel: { $set: "0" },
-                                        htmode: { $set: bestHtmode },
-                                    },
+                                    [deviceIndex]: deviceUpdate,
                                 },
                             };
                         })}
@@ -210,7 +220,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) => ({
@@ -250,6 +263,7 @@ function DeviceForm({
                                 ...formData.guest_wifi,
                             }}
                             formErrors={formErrors.guest_wifi || {}}
+                            band={formData.band}
                             setFormValue={setFormValue}
                             {...props}
                         />
@@ -301,15 +315,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/encryptionHelpers.js

@@ -0,0 +1,20 @@
+/*
+ * 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.
+export default function getEncryptionChoices(band, encryption) {
+    if (band === "6g") {
+        return { WPA3: ENCRYPTIONMODES.WPA3 };
+    }
+    if (encryption === "custom") {
+        return { ...ENCRYPTIONMODES, custom: _("Custom") };
+    }
+    return ENCRYPTIONMODES;
+}

package/package.json

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