Fix a few more things

Author: mrrosoff

api/endpoints/admin/passkeyAuth.ts

@@ -20,6 +20,7 @@ export const handler = async (event: APIGatewayEvent): Promise<APIGatewayProxyRe
     }
 
     const body: PasskeyAuthPayload = JSON.parse(event.body);
+    console.error(body);
 
     const challengeRecord = await getItem(PASSKEY_CHALLENGES_TABLE, body.challenge);
     if (!challengeRecord) {

src/components/terminal/Terminal.tsx

@@ -3,7 +3,7 @@ import { ChangeEvent, KeyboardEvent, forwardRef, Ref, useEffect, useState } from
 import { Box, Grid } from "@mui/material";
 import { Emulator, EmulatorState } from "../../javascript-terminal";
 import { handleAdminConsoleKeyPress } from "../../javascript-terminal/commands/console";
-import { handlePasswordPromptKeyPress } from "../../javascript-terminal/commands/sudo";
+import { authenticateWithPasskey } from "../../javascript-terminal/commands/sudo";
 import AdminConsole from "./admin/AdminConsole";
 
 import CommandInput from "./CommandInput";
@@ -53,6 +53,13 @@ const Terminal = (
         }
     }, [emulatorState.getPasswordPromptState(), emulatorState.getAdminConsoleMode()?.screen]);
 
+    useEffect(() => {
+        const passwordPrompt = emulatorState.getPasswordPromptState();
+        if (passwordPrompt) {
+            authenticateWithPasskey(emulator, emulatorState);
+        }
+    }, [emulatorState.getPasswordPromptState()]);
+
     const scrollToBottom = () => {
         setTimeout(() => {
             if (props.scrollContainerRef.current) {
@@ -85,30 +92,6 @@ const Terminal = (
     const onKeyDown = async (e: KeyboardEvent<HTMLInputElement>) => {
         const passwordPrompt = emulatorState.getPasswordPromptState();
         if (passwordPrompt) {
-            if (e.metaKey) return; // Allow CMD key for Mac users
-
-            e.preventDefault();
-
-            if (e.key === "Backspace") {
-                return setInput(input.slice(0, -1));
-            }
-            if (e.key.length === 1 && !e.ctrlKey) {
-                return setInput(input + e.key);
-            }
-
-            const shouldClearInput = await handlePasswordPromptKeyPress(
-                emulator,
-                emulatorState,
-                input,
-                e.key,
-                e.ctrlKey
-            );
-            if (shouldClearInput) {
-                setInput("");
-                if (e.key === "Enter") {
-                    scrollToBottom();
-                }
-            }
             return;
         }
 

src/javascript-terminal/commands/sudo.tsx

@@ -44,70 +44,55 @@ const functionDef = (state: EmulatorState, commandOptions: string[]) => {
     return { output: "", type: "text" };
 };
 
-export const handlePasswordPromptKeyPress = async (
+export const authenticateWithPasskey = async (
     emulator: Emulator,
-    emulatorState: EmulatorState,
-    _password: string,
-    key: string,
-    ctrlKey: boolean = false
-): Promise<boolean> => {
+    emulatorState: EmulatorState
+): Promise<void> => {
     const promptState = emulatorState.getPasswordPromptState();
-    if (!promptState) return false;
+    if (!promptState) return;
+
+    try {
+        const { data: authOptions } = await axios.post(
+            "https://api.maxrosoff.com/admin/passkey-auth-options"
+        );
+
+        const authResponse = await startAuthentication({ optionsJSON: authOptions });
+        const { data: authResult } = await axios.post("https://api.maxrosoff.com/admin/passkey-auth", {
+            response: authResponse,
+            challenge: authOptions.challenge
+        });
+
+        const existingAdminMode = emulatorState.getAdminConsoleMode();
+        emulatorState.setAdminConsoleMode({
+            ...existingAdminMode,
+            authToken: authResult.token
+        });
+
+        const commandMapping = emulatorState.getCommandMapping();
+        const result = emulator.runCommand(commandMapping, promptState.targetCommand, [
+            emulatorState,
+            promptState.targetOptions
+        ]);
 
-    if (key === "c" && ctrlKey) {
         emulatorState.setPasswordPromptState(undefined);
-        return true;
-    }
 
-    if (key === "Enter") {
-        try {
-            const { data: authOptions } = await axios.post(
-                "https://api.maxrosoff.com/admin/passkey-auth-options"
-            );
-
-            const authResponse = await startAuthentication(authOptions);
-
-            const { data: authResult } = await axios.post("https://api.maxrosoff.com/admin/passkey-auth", {
-                response: authResponse,
-                challenge: authOptions.challenge
-            });
-
-            const existingAdminMode = emulatorState.getAdminConsoleMode();
-            emulatorState.setAdminConsoleMode({
-                ...existingAdminMode,
-                authToken: authResult.token
-            });
-
-            const commandMapping = emulatorState.getCommandMapping();
-            const result = emulator.runCommand(commandMapping, promptState.targetCommand, [
-                emulatorState,
-                promptState.targetOptions
-            ]);
-
-            emulatorState.setPasswordPromptState(undefined);
-
-            const outputs = emulatorState.getOutputs();
-            if (outputs.length > 0) {
-                const lastOutput = outputs[outputs.length - 1];
-                lastOutput.output = [result];
-                emulatorState.setOutputs([...outputs]);
-            }
-
-            return true;
-        } catch (err) {
-            console.error("Authentication Failed:", err);
-            emulatorState.setPasswordPromptState(undefined);
-
-            const outputs = emulatorState.getOutputs();
-            if (outputs.length > 0) {
-                const lastOutput = outputs[outputs.length - 1];
-                lastOutput.output = [{ output: "Authentication Failed", type: "error" }];
-                emulatorState.setOutputs([...outputs]);
-            }
-            return true;
+        const outputs = emulatorState.getOutputs();
+        if (outputs.length > 0) {
+            const lastOutput = outputs[outputs.length - 1];
+            lastOutput.output = [result];
+            emulatorState.setOutputs([...outputs]);
+        }
+    } catch (err) {
+        console.error("Authentication Failed:", err);
+        emulatorState.setPasswordPromptState(undefined);
+
+        const outputs = emulatorState.getOutputs();
+        if (outputs.length > 0) {
+            const lastOutput = outputs[outputs.length - 1];
+            lastOutput.output = [{ output: "Authentication Failed", type: "error" }];
+            emulatorState.setOutputs([...outputs]);
         }
     }
-    return false;
 };
 
 export const manPage = `NAME