Browse Source

rewrite PSK validation

pull/266/head
Hunter Thornsberry 2 years ago
parent
commit
54a7b88146
  1. 1
      src/components/Form/DynamicForm.tsx
  2. 24
      src/components/PageComponents/Channel.tsx

1
src/components/Form/DynamicForm.tsx

@ -40,7 +40,6 @@ export interface DynamicFormProps<T extends FieldValues> {
onSubmit: SubmitHandler<T>; onSubmit: SubmitHandler<T>;
submitType?: "onChange" | "onSubmit"; submitType?: "onChange" | "onSubmit";
hasSubmitButton?: boolean; hasSubmitButton?: boolean;
// defaultValues?: DeepPartial<T>;
defaultValues?: DefaultValues<T>; defaultValues?: DefaultValues<T>;
fieldGroups: { fieldGroups: {
label: string; label: string;

24
src/components/PageComponents/Channel.tsx

@ -59,30 +59,14 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
}; };
const validatePass = (input: string, count: number) => { const validatePass = (input: string, count: number) => {
if (count === 32) { if (input.length % 4 !== 0 || toByteArray(input).length !== count) {
if (input.length !== 44) { setValidationText(`Please enter a valid ${count * 8} bit PSK.`);
setValidationText("Please enter a valid 256 bit PSK.");
} else {
setValidationText(undefined);
}
} else if (count === 16) {
if (input.length !== 24) {
setValidationText("Please enter a valid 128 bit PSK.");
} else {
setValidationText(undefined);
}
} else if (count === 1) {
if (input.length !== 4) {
setValidationText("Please enter a valid 1 bit PSK");
} else {
setValidationText(undefined);
}
} else { } else {
setValidationText("Unkown PSK length."); setValidationText(undefined);
} }
}; };
const inputChangeEvent = (e) => { const inputChangeEvent = (e: React.ChangeEvent<HTMLInputElement>) => {
const psk = e.currentTarget?.value; const psk = e.currentTarget?.value;
setPass(psk); setPass(psk);
validatePass(psk, bitCount); validatePass(psk, bitCount);

Loading…
Cancel
Save