From 7c5346cbabfb9b7057506e0775faa7f74fd31157 Mon Sep 17 00:00:00 2001 From: Jan Tatje Date: Fri, 12 Aug 2022 21:08:59 +0200 Subject: Add support for EAP-PWD (#246) I also added a German translation of the new strings. --- src/components/WifiCard.js | 49 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) (limited to 'src/components/WifiCard.js') diff --git a/src/components/WifiCard.js b/src/components/WifiCard.js index 8edf147..35f35a7 100644 --- a/src/components/WifiCard.js +++ b/src/components/WifiCard.js @@ -37,9 +37,11 @@ export const WifiCard = (props) => { const password = !props.settings.encryptionMode ? '' : escape(props.settings.password); - setQrvalue( - `WIFI:T:${props.settings.encryptionMode};S:${ssid};P:${password};H:${props.settings.hiddenSSID};` - ); + const qrval = + props.settings.encryptionMode === 'WPA2-EAP' + ? `WIFI:T:${props.settings.encryptionMode};S:${ssid};P:${password};H:${props.settings.hiddenSSID};E:${props.settings.eapMethod};I:${props.settings.eapIdentity};;` + : `WIFI:T:${props.settings.encryptionMode};S:${ssid};P:${password};H:${props.settings.hiddenSSID};;`; + setQrvalue(qrval); }, [props.settings]); const portraitWidth = () => { @@ -53,6 +55,15 @@ export const WifiCard = (props) => { return hiddenPassword ? '' : t('wifi.password'); }; + const eapIdentityFieldLabel = () => { + const hiddenIdentity = props.settings.encryptionMode !== 'WPA2-EAP'; + return hiddenIdentity ? '' : t('wifi.identity'); + }; + + const eapMethodFieldLabel = () => { + return !eapIdentityFieldLabel() ? '' : t('wifi.encryption.eapMethod'); + }; + return ( { isInvalid={!!props.ssidError} validationMessage={!!props.ssidError && props.ssidError} /> + + props.onEapIdentityChange(e.target.value)} + isInvalid={!!props.eapIdentityError} + validationMessage={ + !!props.eapIdentityError && props.eapIdentityError + } + />