From a7e86d9afde0ed0c596f63b4b3f45281b83fbd75 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 14 Oct 2022 15:54:19 +0200
Subject: [PATCH] fix

---
 apps/api/src/lib/templates.ts                   | 13 ++++---------
 apps/api/src/routes/api/v1/services/handlers.ts | 12 ++++++++++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apps/api/src/lib/templates.ts b/apps/api/src/lib/templates.ts
index 2155fcb24..b0312dafd 100644
--- a/apps/api/src/lib/templates.ts
+++ b/apps/api/src/lib/templates.ts
@@ -111,19 +111,21 @@ export default [
             {
                 "id": "$$secret_name",
                 "label": "Admin Name",
-                "defaultValue": "admin",
+                "defaultValue": "$$generate_username",
                 "description": "This is the admin username. Please change it.",
                 "validRegex": /^([^\s^\/])+$/
             },
             {
                 "id": "$$secret_password",
                 "label": "Admin Password",
+                "defaultValue":"$$generate_password",
                 "description": "This is the admin password. Please change it.",
                 "validRegex": /^([^\s^\/])+$/
             },
             {
                 "id": "$$secret_secret_key_base",
                 "label": "Secret Key Base",
+                "defaultValue":"$$generate_passphrase",
                 "description": "",
                 "validRegex": /^([^\s^\/])+$/
             },
@@ -141,13 +143,6 @@ export default [
                 "description": "",
                 "validRegex": /^([^\s^\/])+$/
             },
-            {
-                "id": "$$secret_disable_registration",
-                "label": "Disable Registration",
-                "defaultValue": "true",
-                "description": "",
-                "validRegex": /^([^\s^\/])+$/
-            },
             {
                 "id": "$$secret_postgresql_username",
                 "label": "PostgreSQL Username",
@@ -158,7 +153,7 @@ export default [
             {
                 "id": "$$secret_postgresql_password",
                 "label": "PostgreSQL Password",
-                "defaultValue": "postgresql",
+                "defaultValue": "$$generate_password",
                 "description": "",
                 "validRegex": /^([^\s^\/])+$/
             }
diff --git a/apps/api/src/routes/api/v1/services/handlers.ts b/apps/api/src/routes/api/v1/services/handlers.ts
index cb7e2796f..10f4f40fd 100644
--- a/apps/api/src/routes/api/v1/services/handlers.ts
+++ b/apps/api/src/routes/api/v1/services/handlers.ts
@@ -157,9 +157,17 @@ export async function saveServiceType(request: FastifyRequest<SaveServiceType>,
                 if (variableId.startsWith('$$secret_')) {
                     const secretName = variableId.replace('$$secret_', '');
                     let secretValue = defaultValue || value || null;
-                    if (secretValue) secretValue = encrypt(secretValue);
+                    if (defaultValue === '$$generate_password') {
+                        secretValue = generatePassword({});
+                    }
+                    if (defaultValue === '$$generate_username') {
+                        secretValue = cuid();
+                    }
+                    if (defaultValue === '$$generate_passphrase') {
+                        secretValue = cuid();
+                    }
                     await prisma.serviceSecret.create({
-                        data: { name: secretName, value: secretValue, service: { connect: { id } } }
+                        data: { name: secretName, value: encrypt(secretValue), service: { connect: { id } } }
                     })
                 }
             }