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

Fix docker build error and SSL regeneration

Browse Source
This commit is contained in:
LukeGus
2025-09-28 01:42:50 -05:00
parent e2146cdfbf
commit cfa7c26c49
6 changed files with 76 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/backend/utils/auto-ssl-setup.ts
View File

@@ -30,12 +30,30 @@ export class AutoSSLSetup {
try {
if (await this.isSSLConfigured()) {
await this.logCertificateInfo();
await this.setupEnvironmentVariables();
return;
}
await this.generateSSLCertificates();
await this.setupEnvironmentVariables();
// In Docker, certificates might be generated by entrypoint script
// Check if they exist but weren't detected by isSSLConfigured
try {
await fs.access(this.CERT_FILE);
await fs.access(this.KEY_FILE);
systemLogger.info("SSL certificates found from entrypoint script", {
operation: "ssl_cert_found_entrypoint",
cert_path: this.CERT_FILE,
key_path: this.KEY_FILE,
});
await this.logCertificateInfo();
await this.setupEnvironmentVariables();
return;
} catch {
// Certificates don't exist, generate them
await this.generateSSLCertificates();
await this.setupEnvironmentVariables();
}
} catch (error) {
systemLogger.error("Failed to initialize SSL configuration", error, {
operation: "ssl_auto_init_failed",

19
src/ui/Desktop/Homepage/HomepageAuth.tsx
View File

@@ -222,9 +222,8 @@ export function HomepageAuth({
setTotpCode("");
setTotpTempToken("");
} catch (err: any) {
toast.error(
err?.response?.data?.error || err?.message || t("errors.unknownError"),
);
const errorMessage = err?.response?.data?.error || err?.message || t("errors.unknownError");
toast.error(errorMessage);
setInternalLoggedIn(false);
setLoggedIn(false);
setIsAdmin(false);
@@ -371,11 +370,8 @@ export function HomepageAuth({
setTotpTempToken("");
toast.success(t("messages.loginSuccess"));
} catch (err: any) {
toast.error(
err?.response?.data?.error ||
err?.message ||
t("errors.invalidTotpCode"),
);
const errorMessage = err?.response?.data?.error || err?.message || t("errors.invalidTotpCode");
toast.error(errorMessage);
} finally {
setTotpLoading(false);
}
@@ -394,11 +390,8 @@ export function HomepageAuth({
window.location.replace(authUrl);
} catch (err: any) {
toast.error(
err?.response?.data?.error ||
err?.message ||
t("errors.failedOidcLogin"),
);
const errorMessage = err?.response?.data?.error || err?.message || t("errors.failedOidcLogin");
toast.error(errorMessage);
setOidcLoading(false);
}
}

23
src/ui/Mobile/Homepage/HomepageAuth.tsx
View File

@@ -204,9 +204,8 @@ export function HomepageAuth({
setTotpCode("");
setTotpTempToken("");
} catch (err: any) {
toast.error(
err?.response?.data?.error || err?.message || t("errors.unknownError"),
);
const errorMessage = err?.response?.data?.error || err?.message || t("errors.unknownError");
toast.error(errorMessage);
setInternalLoggedIn(false);
setLoggedIn(false);
setIsAdmin(false);
@@ -347,11 +346,8 @@ export function HomepageAuth({
setTotpTempToken("");
toast.success(t("messages.loginSuccess"));
} catch (err: any) {
toast.error(
err?.response?.data?.error ||
err?.message ||
t("errors.invalidTotpCode"),
);
const errorMessage = err?.response?.data?.error || err?.message || t("errors.invalidTotpCode");
toast.error(errorMessage);
} finally {
setTotpLoading(false);
}
@@ -370,11 +366,8 @@ export function HomepageAuth({
window.location.replace(authUrl);
} catch (err: any) {
toast.error(
err?.response?.data?.error ||
err?.message ||
t("errors.failedOidcLogin"),
);
const errorMessage = err?.response?.data?.error || err?.message || t("errors.failedOidcLogin");
toast.error(errorMessage);
setOidcLoading(false);
}
}
@@ -402,12 +395,12 @@ export function HomepageAuth({
setLoggedIn(true);
setIsAdmin(!!meRes.is_admin);
setUsername(meRes.username || null);
setUserId(meRes.id || null);
setUserId(meRes.userId || null);
setDbError(null);
onAuthSuccess({
isAdmin: !!meRes.is_admin,
username: meRes.username || null,
userId: meRes.id || null,
userId: meRes.userId || null,
});
setInternalLoggedIn(true);
window.history.replaceState(