Merge branch 'main' into feat/storage

This commit is contained in:
charlesgauthereau
2026-01-16 22:53:33 +01:00
5 changed files with 12 additions and 5 deletions
+2
View File
@@ -41,3 +41,5 @@ public/uploads/*
private/uploads/* private/uploads/*
/.env /.env
certificates
+2 -2
View File
@@ -26,5 +26,5 @@ keywords:
- web-ui - web-ui
- agent - agent
license: Apache-2.0 license: Apache-2.0
version: 1.1.12-rc.4 version: 1.1.13
date-released: "2026-01-11" date-released: "2026-01-16"
+2 -2
View File
@@ -8,8 +8,8 @@ import {CardAuth} from "@/features/layout/card-auth";
export default async function GuardPage() { export default async function GuardPage() {
const cookieStore = await cookies(); const cookieStore = await cookies();
const token = cookieStore.get("better-auth.two_factor")?.value; const token = cookieStore.get("better-auth.two_factor")?.value || cookieStore.get("__Secure-better-auth.two_factor")?.value;
if (!token) { if (!token) {
redirect("/login"); redirect("/login");
} }
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "portabase", "name": "portabase",
"version": "1.1.12-rc.4", "version": "1.1.13",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev --turbopack -p 8887", "dev": "next dev --turbopack -p 8887",
+5
View File
@@ -41,6 +41,11 @@ export const sendEmail = async (data: Payload) => {
throw new Error("SMTP system settings not found."); throw new Error("SMTP system settings not found.");
} }
if (!settings.smtpHost || !settings.smtpPort || !settings.smtpUser || !settings.smtpPassword || !settings.smtpFrom) {
console.warn("Incomplete SMTP settings. Email not sent.");
return;
}
const emailsArray = data.to.split(",") const emailsArray = data.to.split(",")
.map(email => email.trim()); .map(email => email.trim());