some fixes: #7095 #7080 #7085 #7081 #7089 #7097

1 files changed, 26 insertions, 3 deletions

diff --git a/packages/anastasis-webui/src/pages/home/authMethod/AuthMethodEmailSolve.tsx b/packages/anastasis-webui/src/pages/home/authMethod/AuthMethodEmailSolve.tsx
index 7252ca2fd..9ee52d8ed 100644
--- a/packages/anastasis-webui/src/pages/home/authMethod/AuthMethodEmailSolve.tsx
+++ b/packages/anastasis-webui/src/pages/home/authMethod/AuthMethodEmailSolve.tsx
@@ -12,7 +12,28 @@ import { SolveOverviewFeedbackDisplay } from "../SolveScreen";
 import { AuthMethodSolveProps } from "./index";
 
 export function AuthMethodEmailSolve({ id }: AuthMethodSolveProps): VNode {
-  const [answer, setAnswer] = useState("A-");
+  const [answer, _setAnswer] = useState("A-");
+
+  function setAnswer(str: string): void {
+    //A-12345-678-1234-5678
+    const unformatted = str
+      .replace(/^A-/, "")
+      .replace(/-/g, "")
+      .toLocaleUpperCase();
+
+    let result = `A-${unformatted.substring(0, 5)}`;
+    if (unformatted.length > 5) {
+      result += `-${unformatted.substring(5, 8)}`;
+    }
+    if (unformatted.length > 8) {
+      result += `-${unformatted.substring(8, 12)}`;
+    }
+    if (unformatted.length > 12) {
+      result += `-${unformatted.substring(12, 16)}`;
+    }
+
+    _setAnswer(result);
+  }
   const [expanded, setExpanded] = useState(false);
 
   const reducer = useAnastasisContext();
@@ -77,7 +98,9 @@ export function AuthMethodEmailSolve({ id }: AuthMethodSolveProps): VNode {
   const feedback = challengeFeedback[selectedUuid];
 
   async function onNext(): Promise<void> {
-    return reducer?.transition("solve_challenge", { answer });
+    return reducer?.transition("solve_challenge", {
+      answer: `A-${answer.replace(/^A-/, "").replace(/-/g, "").trim()}`,
+    });
   }
   function onCancel(): void {
     reducer?.back();
@@ -127,7 +150,7 @@ export function AuthMethodEmailSolve({ id }: AuthMethodSolveProps): VNode {
         grabFocus
         onConfirm={onNext}
         bind={[answer, setAnswer]}
-        placeholder="A-1234567812345678"
+        placeholder="A-12345-678-1234-5678"
       />
 
       <div