Merge pull request #632 from coollabsio/next

v3.10.6

apps/api/prisma/seed.js

@@ -94,6 +94,16 @@ async function main() {
 			}
 		});
 	}
+	// Set new preview secrets
+	const secrets = await prisma.secret.findMany({ where: { isPRMRSecret: false } })
+	if (secrets.length > 0) {
+		for (const secret of secrets) {
+			const previewSecrets = await prisma.secret.findMany({ where: { id: secret.id, isPRMRSecret: true } })
+			if (previewSecrets.length === 0) {
+				await prisma.secret.create({ data: { ...secret, id: undefined, isPRMRSecret: true } })
+			}
+		}
+	}
 }
 main()
 	.catch((e) => {

apps/api/src/lib/common.ts

@@ -21,7 +21,7 @@ import { scheduler } from './scheduler';
 import { supportedServiceTypesAndVersions } from './services/supportedVersions';
 import { includeServices } from './services/common';
 
-export const version = '3.10.5';
+export const version = '3.10.6';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';

apps/api/src/routes/api/v1/applications/handlers.ts

@@ -15,7 +15,6 @@ import { checkContainer, formatLabelsOnDocker, isContainerExited, removeContaine
 import type { FastifyRequest } from 'fastify';
 import type { GetImages, CancelDeployment, CheckDNS, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, GetApplicationLogs, GetBuildIdLogs, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage, DeployApplication, CheckDomain, StopPreviewApplication, RestartPreviewApplication, GetBuilds } from './types';
 import { OnlyId } from '../../../../types';
-import path from 'node:path';
 
 function filterObject(obj, callback) {
     return Object.fromEntries(Object.entries(obj).
@@ -326,7 +325,7 @@ export async function saveApplicationSettings(request: FastifyRequest<SaveApplic
             where: { id },
             data: { fqdn: isBot ? null : undefined, settings: { update: { debug, previews, dualCerts, autodeploy, isBot, isDBBranching, isCustomSSL } } },
             include: { destinationDocker: true }
-        }); 
+        });
         return reply.code(201).send();
     } catch ({ status, message }) {
         return errorHandler({ status, message })
@@ -817,10 +816,15 @@ export async function getSecrets(request: FastifyRequest<OnlyId>) {
 export async function updatePreviewSecret(request: FastifyRequest<SaveSecret>, reply: FastifyReply) {
     try {
         const { id } = request.params
-        const { name, value } = request.body
+        let { name, value } = request.body
+        if (value) {
+            value = encrypt(value.trim())
+        } else {
+            value = ''
+        }
         await prisma.secret.updateMany({
             where: { applicationId: id, name, isPRMRSecret: true },
-            data: { value: encrypt(value.trim()) }
+            data: { value }
         });
         return reply.code(201).send()
     } catch ({ status, message }) {

apps/ui/src/lib/common.ts

@@ -3,7 +3,7 @@ import { addToast } from '$lib/store';
 export const asyncSleep = (delay: number) =>
 	new Promise((resolve) => setTimeout(resolve, delay));
 
-export function errorNotification(error: any): void {
+export function errorNotification(error: any | { message: string }): void {
 	if (error.message) {
 		if (error.message === 'Cannot read properties of undefined (reading \'postMessage\')') {
 			return addToast({

apps/ui/src/routes/applications/[id]/_Secret.svelte

@@ -39,8 +39,8 @@
 
 	async function addNewSecret() {
 		try {
-			if (!name) return errorNotification(`${t.get('forms.name')} ${t.get('forms.is_required')}`);
-			if (!value) return errorNotification(`${t.get('forms.value')} ${t.get('forms.is_required')}`);
+			if (!name) return errorNotification({ message: 'Name is required.' });
+			if (!value) return errorNotification({ message: 'Value is required.' });
 			await post(`/applications/${id}/secrets`, {
 				name,
 				value,
@@ -61,7 +61,7 @@
 		changeIsBuildSecret = false
 	}: { changeIsBuildSecret?: boolean } = {}) {
 		if (changeIsBuildSecret) isBuildSecret = !isBuildSecret;
-		if (isNewSecret) return
+		if (isNewSecret) return;
 		try {
 			await put(`/applications/${id}/secrets`, {
 				name,

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.10.5",
+  "version": "3.10.6",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {