revert: attempt to make secrets allow empty

homarr-labs · Jul 22, 2024 · 74b8043 · 74b8043
1 parent 06bb377
commit 74b8043
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/packages/api/src/router/integration/integration-router.ts b/packages/api/src/router/integration/integration-router.ts
@@ -77,7 +77,7 @@ export const integrationRouter = createTRPCRouter({
         name: input.name,
         url: input.url,
         kind: input.kind,
-        secrets: !input.secrets ? null : input.secrets,
+        secrets: input.secrets,
       });
 
       const integrationId = createId();
@@ -88,7 +88,7 @@ export const integrationRouter = createTRPCRouter({
         kind: input.kind,
       });
 
-      if (input.secrets && input.secrets.length >= 1) {
+      if (input.secrets.length >= 1) {
         await ctx.db.insert(integrationSecrets).values(
           input.secrets.map((secret) => ({
             kind: secret.kind,

diff --git a/packages/api/src/router/integration/integration-test-connection.ts b/packages/api/src/router/integration/integration-test-connection.ts
@@ -18,15 +18,15 @@ export const testConnectionAsync = async (
     value: `${string}.${string}`;
   }[] = [],
 ) => {
-  const formSecrets = integration.secrets !== null ? integration.secrets
+  const formSecrets = integration.secrets
     .filter((secret) => secret.value !== null)
     .map((secret) => ({
       ...secret,
       // We ensured above that the value is not null
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       value: secret.value!,
       source: "form" as const,
-    })) : [];
+    }));
 
   const decryptedDbSecrets = dbSecrets.map((secret) => ({
     ...secret,
@@ -35,9 +35,7 @@ export const testConnectionAsync = async (
   }));
 
   const sourcedSecrets = [...formSecrets, ...decryptedDbSecrets];
-  console.log('sourcedSecrets' + JSON.stringify(sourcedSecrets));
   const secretKinds = getSecretKindOption(integration.kind, sourcedSecrets);
-  console.log('secretKinds' + JSON.stringify(secretKinds));
 
   const filteredSecrets = secretKinds.map((kind) => {
     const secrets = sourcedSecrets.filter((secret) => secret.kind === kind);

diff --git a/packages/definitions/src/integration.ts b/packages/definitions/src/integration.ts
@@ -107,7 +107,7 @@ export const integrationDefs = {
   },
   getDashDot: {
     name: "Dash.",
-    secretKinds: [],
+    secretKinds: [[]],
     category: [],
     iconUrl: "https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/dashdot.png",
   }
@@ -116,7 +116,7 @@ export const integrationDefs = {
   {
     name: string;
     iconUrl: string;
-    secretKinds: [...IntegrationSecretKind[][]];
+    secretKinds: [IntegrationSecretKind[], ...IntegrationSecretKind[][]]; // at least one secret kind set is required
     category: IntegrationCategory[];
   }
 >;
@@ -125,12 +125,12 @@ export const getIconUrl = (integration: IntegrationKind) => integrationDefs[inte
 
 export const getIntegrationName = (integration: IntegrationKind) => integrationDefs[integration].name;
 
-export const getDefaultSecretKinds = (integration: IntegrationKind): IntegrationSecretKind[] | undefined =>
+export const getDefaultSecretKinds = (integration: IntegrationKind): IntegrationSecretKind[] =>
   integrationDefs[integration].secretKinds[0];
 
 export const getAllSecretKindOptions = (
   integration: IntegrationKind,
-): [...IntegrationSecretKind[][]] => integrationDefs[integration].secretKinds;
+): [IntegrationSecretKind[], ...IntegrationSecretKind[][]] => integrationDefs[integration].secretKinds;
 
 export const integrationKinds = objectKeys(integrationDefs);
 

diff --git a/packages/validation/src/integration.ts b/packages/validation/src/integration.ts
@@ -14,7 +14,7 @@ const integrationCreateSchema = z.object({
       kind: zodEnumFromArray(integrationSecretKinds),
       value: z.string().nonempty(),
     }),
-  ).optional(),
+  ),
 });
 
 const integrationUpdateSchema = z.object({