WIP on secret env vars

Author: matt-aitken

apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts

@@ -1,3 +1,4 @@
+import { flipCauseOption } from "effect/Cause";
 import { PrismaClient, prisma } from "~/db.server";
 import { Project } from "~/models/project.server";
 import { User } from "~/models/user.server";
@@ -48,6 +49,7 @@ export class EnvironmentVariablesPresenter {
                 key: true,
               },
             },
+            isSecret: true,
           },
         },
       },
@@ -82,34 +84,41 @@ export class EnvironmentVariablesPresenter {
       },
     });
 
-    const sortedEnvironments = sortEnvironments(filterOrphanedEnvironments(environments));
+    const sortedEnvironments = sortEnvironments(filterOrphanedEnvironments(environments)).filter(
+      (e) => e.orgMember?.userId === userId || e.orgMember === null
+    );
 
     const repository = new EnvironmentVariablesRepository(this.#prismaClient);
     const variables = await repository.getProject(project.id);
 
     return {
-      environmentVariables: environmentVariables.map((environmentVariable) => {
+      environmentVariables: environmentVariables.flatMap((environmentVariable) => {
         const variable = variables.find((v) => v.key === environmentVariable.key);
 
-        return {
-          id: environmentVariable.id,
-          key: environmentVariable.key,
-          values: sortedEnvironments.reduce((previous, env) => {
-            const val = variable?.values.find((v) => v.environment.id === env.id);
-            previous[env.id] = {
-              value: val?.value,
+        return sortedEnvironments.flatMap((env) => {
+          const val = variable?.values.find((v) => v.environment.id === env.id);
+          const isSecret =
+            environmentVariable.values.find((v) => v.environmentId === env.id)?.isSecret ?? false;
+
+          if (!val) {
+            return [];
+          }
+
+          return [
+            {
+              id: environmentVariable.id,
+              key: environmentVariable.key,
               environment: { type: env.type, id: env.id },
-            };
-            return { ...previous };
-          }, {} as Record<string, { value: string | undefined; environment: { type: string; id: string } }>),
-        };
+              value: val.value,
+              isSecret,
+            },
+          ];
+        });
       }),
-      environments: sortedEnvironments
-        .filter((e) => e.orgMember?.userId === userId || e.orgMember === null)
-        .map((environment) => ({
-          id: environment.id,
-          type: environment.type,
-        })),
+      environments: sortedEnvironments.map((environment) => ({
+        id: environment.id,
+        type: environment.type,
+      })),
       hasStaging: environments.some((environment) => environment.type === "STAGING"),
     };
   }