dennii/Termix
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 22 Wiki Activity

fix: Electron login issues

Browse Source
This commit is contained in:
LukeGus
2025-11-01 17:29:50 -05:00
parent d0385bd2c9
commit bb9f03187d
4 changed files with 70 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
.github/workflows/electron.yml vendored
View File

@@ -78,62 +78,60 @@ jobs:
- name: Upload Windows x64 NSIS Installer - name: Upload Windows x64 NSIS Installer
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_x64_*_nsis.exe') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_windows_x64_nsis.exe') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_windows_x64_nsis name: termix_windows_x64_nsis
path: release/*_x64_*_nsis.exe path: release/termix_windows_x64_nsis.exe
retention-days: 30 retention-days: 30
- name: Upload Windows ia32 NSIS Installer - name: Upload Windows ia32 NSIS Installer
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_ia32_*_nsis.exe') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_windows_ia32_nsis.exe') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_windows_ia32_nsis name: termix_windows_ia32_nsis
path: release/*_ia32_*_nsis.exe path: release/termix_windows_ia32_nsis.exe
retention-days: 30 retention-days: 30
- name: Upload Windows x64 MSI Installer - name: Upload Windows x64 MSI Installer
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_x64_*_msi.msi') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_windows_x64_msi.msi') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_windows_x64_msi name: termix_windows_x64_msi
path: release/*_x64_*_msi.msi path: release/termix_windows_x64_msi.msi
retention-days: 30 retention-days: 30
- name: Upload Windows ia32 MSI Installer - name: Upload Windows ia32 MSI Installer
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_ia32_*_msi.msi') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_windows_ia32_msi.msi') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_windows_ia32_msi name: termix_windows_ia32_msi
path: release/*_ia32_*_msi.msi path: release/termix_windows_ia32_msi.msi
retention-days: 30 retention-days: 30
- name: Create Windows x64 Portable zip - name: Create Windows x64 Portable zip
if: hashFiles('release/win-unpacked/*') != '' if: hashFiles('release/win-unpacked/*') != ''
run: | run: |
$VERSION = "${{ steps.package-version.outputs.version }}" Compress-Archive -Path "release\win-unpacked\*" -DestinationPath "termix_windows_x64_portable.zip"
Compress-Archive -Path "release\win-unpacked\*" -DestinationPath "termix_windows_x64_${VERSION}_portable.zip"
- name: Create Windows ia32 Portable zip - name: Create Windows ia32 Portable zip
if: hashFiles('release/win-ia32-unpacked/*') != '' if: hashFiles('release/win-ia32-unpacked/*') != ''
run: | run: |
$VERSION = "${{ steps.package-version.outputs.version }}" Compress-Archive -Path "release\win-ia32-unpacked\*" -DestinationPath "termix_windows_ia32_portable.zip"
Compress-Archive -Path "release\win-ia32-unpacked\*" -DestinationPath "termix_windows_ia32_${VERSION}_portable.zip"
- name: Upload Windows x64 Portable - name: Upload Windows x64 Portable
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('termix_windows_x64_*_portable.zip') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('termix_windows_x64_portable.zip') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_windows_x64_portable name: termix_windows_x64_portable
path: termix_windows_x64_*_portable.zip path: termix_windows_x64_portable.zip
retention-days: 30 retention-days: 30
- name: Upload Windows ia32 Portable - name: Upload Windows ia32 Portable
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('termix_windows_ia32_*_portable.zip') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('termix_windows_ia32_portable.zip') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_windows_ia32_portable name: termix_windows_ia32_portable
path: termix_windows_ia32_*_portable.zip path: termix_windows_ia32_portable.zip
retention-days: 30 retention-days: 30
build-linux: build-linux:
@@ -181,24 +179,16 @@ jobs:
VERSION=$(node -p "require('./package.json').version") VERSION=$(node -p "require('./package.json').version")
cd release cd release
if [ -f "termix_linux_x86_64_${VERSION}_appimage.AppImage" ]; then
mv "termix_linux_x86_64_${VERSION}_appimage.AppImage" "termix_linux_x64_${VERSION}_appimage.AppImage"
fi
if [ -f "termix_linux_amd64_${VERSION}_deb.deb" ]; then
mv "termix_linux_amd64_${VERSION}_deb.deb" "termix_linux_x64_${VERSION}_deb.deb"
fi
if [ -f "termix-${VERSION}.tar.gz" ]; then if [ -f "termix-${VERSION}.tar.gz" ]; then
mv "termix-${VERSION}.tar.gz" "termix_linux_x64_${VERSION}_portable.tar.gz" mv "termix-${VERSION}.tar.gz" "termix_linux_x64_portable.tar.gz"
fi fi
if [ -f "termix-${VERSION}-arm64.tar.gz" ]; then if [ -f "termix-${VERSION}-arm64.tar.gz" ]; then
mv "termix-${VERSION}-arm64.tar.gz" "termix_linux_arm64_${VERSION}_portable.tar.gz" mv "termix-${VERSION}-arm64.tar.gz" "termix_linux_arm64_portable.tar.gz"
fi fi
if [ -f "termix-${VERSION}-armv7l.tar.gz" ]; then if [ -f "termix-${VERSION}-armv7l.tar.gz" ]; then
mv "termix-${VERSION}-armv7l.tar.gz" "termix_linux_armv7l_${VERSION}_portable.tar.gz" mv "termix-${VERSION}-armv7l.tar.gz" "termix_linux_armv7l_portable.tar.gz"
fi fi
cd .. cd ..
@@ -209,66 +199,66 @@ jobs:
- name: Upload Linux x64 AppImage - name: Upload Linux x64 AppImage
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_x64_*_appimage.AppImage') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_linux_x64_appimage.AppImage') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_linux_x64_appimage name: termix_linux_x64_appimage
path: release/*_x64_*_appimage.AppImage path: release/termix_linux_x64_appimage.AppImage
retention-days: 30 retention-days: 30
- name: Upload Linux arm64 AppImage - name: Upload Linux arm64 AppImage
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_arm64_*_appimage.AppImage') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_linux_arm64_appimage.AppImage') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_linux_arm64_appimage name: termix_linux_arm64_appimage
path: release/*_arm64_*_appimage.AppImage path: release/termix_linux_arm64_appimage.AppImage
retention-days: 30 retention-days: 30
- name: Upload Linux x64 DEB - name: Upload Linux x64 DEB
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_x64_*_deb.deb') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_linux_x64_deb.deb') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_linux_x64_deb name: termix_linux_x64_deb
path: release/*_x64_*_deb.deb path: release/termix_linux_x64_deb.deb
retention-days: 30 retention-days: 30
- name: Upload Linux arm64 DEB - name: Upload Linux arm64 DEB
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_arm64_*_deb.deb') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_linux_arm64_deb.deb') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_linux_arm64_deb name: termix_linux_arm64_deb
path: release/*_arm64_*_deb.deb path: release/termix_linux_arm64_deb.deb
retention-days: 30 retention-days: 30
- name: Upload Linux armv7l DEB - name: Upload Linux armv7l DEB
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_armv7l_*_deb.deb') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_linux_armv7l_deb.deb') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_linux_armv7l_deb name: termix_linux_armv7l_deb
path: release/*_armv7l_*_deb.deb path: release/termix_linux_armv7l_deb.deb
retention-days: 30 retention-days: 30
- name: Upload Linux x64 tar.gz - name: Upload Linux x64 tar.gz
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_x64_*_portable.tar.gz') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_linux_x64_portable.tar.gz') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_linux_x64_portable name: termix_linux_x64_portable
path: release/*_x64_*_portable.tar.gz path: release/termix_linux_x64_portable.tar.gz
retention-days: 30 retention-days: 30
- name: Upload Linux arm64 tar.gz - name: Upload Linux arm64 tar.gz
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_arm64_*_portable.tar.gz') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_linux_arm64_portable.tar.gz') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_linux_arm64_portable name: termix_linux_arm64_portable
path: release/*_arm64_*_portable.tar.gz path: release/termix_linux_arm64_portable.tar.gz
retention-days: 30 retention-days: 30
- name: Upload Linux armv7l tar.gz - name: Upload Linux armv7l tar.gz
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_armv7l_*_portable.tar.gz') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_linux_armv7l_portable.tar.gz') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_linux_armv7l_portable name: termix_linux_armv7l_portable
path: release/*_armv7l_*_portable.tar.gz path: release/termix_linux_armv7l_portable.tar.gz
retention-days: 30 retention-days: 30
build-macos: build-macos:
@@ -420,36 +410,36 @@ jobs:
ls -R release/ || echo "Release directory not found" ls -R release/ || echo "Release directory not found"
- name: Upload macOS MAS PKG - name: Upload macOS MAS PKG
if: steps.check_certs.outputs.has_certs == 'true' && hashFiles('release/*_*_*_mas.pkg') != '' && (github.event.inputs.artifact_destination == 'file' || github.event.inputs.artifact_destination == 'release' || github.event.inputs.artifact_destination == 'submit') if: steps.check_certs.outputs.has_certs == 'true' && hashFiles('release/termix_macos_universal_mas.pkg') != '' && (github.event.inputs.artifact_destination == 'file' || github.event.inputs.artifact_destination == 'release' || github.event.inputs.artifact_destination == 'submit')
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: termix_macos_mas name: termix_macos_mas
path: release/*_*_*_mas.pkg path: release/termix_macos_universal_mas.pkg
retention-days: 30 retention-days: 30
if-no-files-found: warn if-no-files-found: warn
- name: Upload macOS Universal DMG - name: Upload macOS Universal DMG
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_universal_*_dmg.dmg') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_macos_universal_dmg.dmg') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_macos_universal_dmg name: termix_macos_universal_dmg
path: release/*_universal_*_dmg.dmg path: release/termix_macos_universal_dmg.dmg
retention-days: 30 retention-days: 30
- name: Upload macOS x64 DMG - name: Upload macOS x64 DMG
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_x64_*_dmg.dmg') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_macos_x64_dmg.dmg') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_macos_x64_dmg name: termix_macos_x64_dmg
path: release/*_x64_*_dmg.dmg path: release/termix_macos_x64_dmg.dmg
retention-days: 30 retention-days: 30
- name: Upload macOS arm64 DMG - name: Upload macOS arm64 DMG
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: hashFiles('release/*_arm64_*_dmg.dmg') != '' && github.event.inputs.artifact_destination != 'none' if: hashFiles('release/termix_macos_arm64_dmg.dmg') != '' && github.event.inputs.artifact_destination != 'none'
with: with:
name: termix_macos_arm64_dmg name: termix_macos_arm64_dmg
path: release/*_arm64_*_dmg.dmg path: release/termix_macos_arm64_dmg.dmg
retention-days: 30 retention-days: 30
- name: Check for App Store Connect API credentials - name: Check for App Store Connect API credentials

12
electron-builder.json
View File

@@ -40,14 +40,14 @@
"nsis": { "nsis": {
"oneClick": false, "oneClick": false,
"allowToChangeInstallationDirectory": true, "allowToChangeInstallationDirectory": true,
"artifactName": "termix_windows_${arch}_${version}_nsis.${ext}", "artifactName": "termix_windows_${arch}_nsis.${ext}",
"createDesktopShortcut": true, "createDesktopShortcut": true,
"createStartMenuShortcut": true, "createStartMenuShortcut": true,
"shortcutName": "Termix", "shortcutName": "Termix",
"uninstallDisplayName": "Termix" "uninstallDisplayName": "Termix"
}, },
"msi": { "msi": {
"artifactName": "termix_windows_${arch}_${version}_msi.${ext}" "artifactName": "termix_windows_${arch}_msi.${ext}"
}, },
"linux": { "linux": {
"target": [ "target": [
@@ -78,10 +78,10 @@
} }
}, },
"appImage": { "appImage": {
"artifactName": "termix_linux_${arch}_${version}_appimage.${ext}" "artifactName": "termix_linux_${arch}_appimage.${ext}"
}, },
"deb": { "deb": {
"artifactName": "termix_linux_${arch}_${version}_deb.${ext}" "artifactName": "termix_linux_${arch}_deb.${ext}"
}, },
"mac": { "mac": {
"target": [ "target": [
@@ -104,7 +104,7 @@
"minimumSystemVersion": "10.15" "minimumSystemVersion": "10.15"
}, },
"dmg": { "dmg": {
"artifactName": "termix_macos_${arch}_${version}_dmg.${ext}", "artifactName": "termix_macos_${arch}_dmg.${ext}",
"sign": true "sign": true
}, },
"afterSign": "build/notarize.cjs", "afterSign": "build/notarize.cjs",
@@ -117,7 +117,7 @@
"asarUnpack": ["**/*.node"], "asarUnpack": ["**/*.node"],
"type": "distribution", "type": "distribution",
"category": "public.app-category.developer-tools", "category": "public.app-category.developer-tools",
"artifactName": "termix_macos_${arch}_${version}_mas.${ext}", "artifactName": "termix_macos_${arch}_mas.${ext}",
"extendInfo": { "extendInfo": {
"ITSAppUsesNonExemptEncryption": false, "ITSAppUsesNonExemptEncryption": false,
"NSAppleEventsUsageDescription": "Termix needs access to control other applications for terminal operations." "NSAppleEventsUsageDescription": "Termix needs access to control other applications for terminal operations."

13
src/ui/desktop/apps/dashboard/Dashboard.tsx
View File

@@ -159,7 +159,8 @@ export function Dashboard({
setDbHealth("error"); setDbHealth("error");
} }
const hosts = await getSSHHosts(); const hostsResponse = await getSSHHosts();
const hosts = Array.isArray(hostsResponse) ? hostsResponse : [];
setTotalServers(hosts.length); setTotalServers(hosts.length);
let totalTunnelsCount = 0; let totalTunnelsCount = 0;
@@ -177,11 +178,17 @@ export function Dashboard({
} }
setTotalTunnels(totalTunnelsCount); setTotalTunnels(totalTunnelsCount);
const credentials = await getCredentials(); const credentialsResponse = await getCredentials();
const credentials = Array.isArray(credentialsResponse)
? credentialsResponse
: [];
setTotalCredentials(credentials.length); setTotalCredentials(credentials.length);
setRecentActivityLoading(true); setRecentActivityLoading(true);
const activity = await getRecentActivity(35); const activityResponse = await getRecentActivity(35);
const activity = Array.isArray(activityResponse)
? activityResponse
: [];
setRecentActivity(activity); setRecentActivity(activity);
setRecentActivityLoading(false); setRecentActivityLoading(false);

15
src/ui/desktop/authentication/ElectronLoginForm.tsx
View File

@@ -3,7 +3,7 @@ import { Button } from "@/components/ui/button.tsx";
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert.tsx"; import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert.tsx";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { AlertCircle, Loader2, ArrowLeft, RefreshCw } from "lucide-react"; import { AlertCircle, Loader2, ArrowLeft, RefreshCw } from "lucide-react";
import { getCookie } from "@/ui/main-axios.ts"; import { getCookie, getUserInfo } from "@/ui/main-axios.ts";
interface ElectronLoginFormProps { interface ElectronLoginFormProps {
serverUrl: string; serverUrl: string;
@@ -53,11 +53,22 @@ export function ElectronLoginForm({
throw new Error("Failed to save JWT to localStorage"); throw new Error("Failed to save JWT to localStorage");
} }
try {
await getUserInfo();
} catch (verifyErr) {
localStorage.removeItem("jwt");
throw new Error("Invalid or expired authentication token");
}
await new Promise((resolve) => setTimeout(resolve, 500)); await new Promise((resolve) => setTimeout(resolve, 500));
onAuthSuccess(); onAuthSuccess();
} catch (err) { } catch (err) {
setError(t("errors.authTokenSaveFailed")); const errorMessage =
err instanceof Error
? err.message
: t("errors.authTokenSaveFailed");
setError(errorMessage);
setIsAuthenticating(false); setIsAuthenticating(false);
hasAuthenticatedRef.current = false; hasAuthenticatedRef.current = false;
} }