Added a new env var repository function for getting secrets with redactions

Author: matt-aitken

apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.$name.ts

@@ -123,7 +123,10 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
 
   const repository = new EnvironmentVariablesRepository();
 
-  const variables = await repository.getEnvironment(environment.project.id, environment.id);
+  const variables = await repository.getEnvironmentWithRedactedSecrets(
+    environment.project.id,
+    environment.id
+  );
 
   const environmentVariable = variables.find((v) => v.key === parsedParams.data.name);
 

apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.ts

@@ -80,7 +80,10 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
 
   const repository = new EnvironmentVariablesRepository();
 
-  const variables = await repository.getEnvironment(environment.project.id, environment.id);
+  const variables = await repository.getEnvironmentWithRedactedSecrets(
+    environment.project.id,
+    environment.id
+  );
 
   return json(
     variables.map((variable) => ({

apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts

@@ -510,30 +510,11 @@ export class EnvironmentVariablesRepository implements Repository {
     return results;
   }
 
-  async getEnvironment(
+  async getEnvironmentWithRedactedSecrets(
     projectId: string,
     environmentId: string
   ): Promise<EnvironmentVariableWithSecret[]> {
-    const project = await this.prismaClient.project.findFirst({
-      where: {
-        id: projectId,
-        deletedAt: null,
-      },
-      select: {
-        environments: {
-          select: {
-            id: true,
-          },
-          where: {
-            id: environmentId,
-          },
-        },
-      },
-    });
-
-    if (!project || project.environments.length === 0) {
-      return [];
-    }
+    const variables = await this.getEnvironment(projectId, environmentId);
 
     // Get the keys of all secret variables
     const secretValues = await this.prismaClient.environmentVariableValue.findMany({
@@ -551,8 +532,6 @@ export class EnvironmentVariablesRepository implements Repository {
     });
     const secretVarKeys = secretValues.map((r) => r.variable.key);
 
-    const variables = await this.getEnvironmentVariables(projectId, environmentId);
-
     // Filter out secret variables if includeSecrets is false
     return variables.map((v) => {
       if (secretVarKeys.includes(v.key)) {
@@ -567,6 +546,31 @@ export class EnvironmentVariablesRepository implements Repository {
     });
   }
 
+  async getEnvironment(projectId: string, environmentId: string): Promise<EnvironmentVariable[]> {
+    const project = await this.prismaClient.project.findFirst({
+      where: {
+        id: projectId,
+        deletedAt: null,
+      },
+      select: {
+        environments: {
+          select: {
+            id: true,
+          },
+          where: {
+            id: environmentId,
+          },
+        },
+      },
+    });
+
+    if (!project || project.environments.length === 0) {
+      return [];
+    }
+
+    return this.getEnvironmentVariables(projectId, environmentId);
+  }
+
   async #getSecretEnvironmentVariables(
     projectId: string,
     environmentId: string

apps/webapp/app/v3/environmentVariables/repository.ts

@@ -91,10 +91,14 @@ export interface Repository {
   /**
    * Get the environment variables for a given environment, it does NOT return values for secret variables
    */
-  getEnvironment(
+  getEnvironmentWithRedactedSecrets(
     projectId: string,
     environmentId: string
   ): Promise<EnvironmentVariableWithSecret[]>;
+  /**
+   * Get the environment variables for a given environment
+   */
+  getEnvironment(projectId: string, environmentId: string): Promise<EnvironmentVariable[]>;
   /**
    * Return all env vars, including secret variables with values. Should only be used for executing tasks.
    */