fix: None auth issues and macOS build failure and rename files for consistency

This commit is contained in:
LukeGus
2025-11-01 01:35:09 -05:00
parent 9525946541
commit a81ab8e7ef
27 changed files with 114 additions and 48 deletions

View File

@@ -250,6 +250,9 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
data: {
cols: terminal.cols,
rows: terminal.rows,
password: credentials.password,
sshKey: credentials.sshKey,
keyPassword: credentials.keyPassword,
hostConfig: {
...hostConfig,
password: credentials.password,
@@ -525,26 +528,6 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
} else if (msg.type === "error") {
const errorMessage = msg.message || t("terminal.unknownError");
if (
errorMessage.toLowerCase().includes("auth") ||
errorMessage.toLowerCase().includes("password") ||
errorMessage.toLowerCase().includes("permission") ||
errorMessage.toLowerCase().includes("denied") ||
errorMessage.toLowerCase().includes("invalid") ||
errorMessage.toLowerCase().includes("failed") ||
errorMessage.toLowerCase().includes("incorrect")
) {
toast.error(t("terminal.authError", { message: errorMessage }));
shouldNotReconnectRef.current = true;
if (webSocketRef.current) {
webSocketRef.current.close();
}
if (onClose) {
onClose();
}
return;
}
if (
errorMessage.toLowerCase().includes("connection") ||
errorMessage.toLowerCase().includes("timeout") ||
@@ -563,6 +546,26 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
return;
}
if (
(errorMessage.toLowerCase().includes("auth") &&
errorMessage.toLowerCase().includes("failed")) ||
errorMessage.toLowerCase().includes("permission denied") ||
(errorMessage.toLowerCase().includes("invalid") &&
(errorMessage.toLowerCase().includes("password") ||
errorMessage.toLowerCase().includes("key"))) ||
errorMessage.toLowerCase().includes("incorrect password")
) {
toast.error(t("terminal.authError", { message: errorMessage }));
shouldNotReconnectRef.current = true;
if (webSocketRef.current) {
webSocketRef.current.close();
}
if (onClose) {
onClose();
}
return;
}
toast.error(t("terminal.error", { message: errorMessage }));
} else if (msg.type === "connected") {
setIsConnected(true);

View File

@@ -25,7 +25,7 @@ interface SshToolsSidebarProps {
onClose: () => void;
}
export function SshToolsSidebar({
export function SSHToolsSidebar({
isOpen,
onClose,
}: SshToolsSidebarProps): React.ReactElement | null {

View File

@@ -1,7 +1,7 @@
import React, { useEffect, useRef, useState, useMemo } from "react";
import { Terminal } from "@/ui/desktop/apps/terminal/Terminal.tsx";
import { Server as ServerView } from "@/ui/desktop/apps/server/Server.tsx";
import { FileManager } from "@/ui/desktop/apps/file manager/FileManager.tsx";
import { FileManager } from "@/ui/desktop/apps/file-manager/FileManager.tsx";
import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
import {
ResizablePanelGroup,

View File

@@ -137,7 +137,7 @@ export function SSHAuthDialog({
return (
<div
className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm"
className="absolute inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm"
style={{ backgroundColor: `${backgroundColor}dd` }}
>
<Card className="w-full max-w-2xl mx-4 shadow-2xl">

View File

@@ -8,7 +8,7 @@ import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
import { useTranslation } from "react-i18next";
import { TabDropdown } from "@/ui/desktop/navigation/tabs/TabDropdown.tsx";
import { SnippetsSidebar } from "@/ui/desktop/apps/terminal/SnippetsSidebar.tsx";
import { SshToolsSidebar } from "@/ui/desktop/apps/tools/SshToolsSidebar.tsx";
import { SSHToolsSidebar } from "@/ui/desktop/apps/tools/SSHToolsSidebar.tsx";
import { ToolsMenu } from "@/ui/desktop/apps/tools/ToolsMenu.tsx";
interface TabData {
@@ -497,7 +497,7 @@ export function TopNavbar({
</div>
)}
<SshToolsSidebar
<SSHToolsSidebar
isOpen={toolsSheetOpen}
onClose={() => setToolsSheetOpen(false)}
/>