Anthony/api key environment

packages/auth-service/src/modules/api_key/api_key.controller.ts

@@ -57,6 +57,7 @@ export class ApiKeyController implements ApiKeyProto.ApiKeyServiceController {
           description: request.description,
           scopes: [ApiKeyProto.ApiScope.FULL],
           project: request.project,
+          environment: request.environment,
         },
       });
       if (!key) {

packages/auth-service/test/app.e2e-spec.ts

@@ -151,6 +151,7 @@ describe('Auth Service API Key Tests', () => {
           email: '[email protected]',
           password: 'password123',
           description: 'Valid API key',
+          environment: 'dev',
         },
         (err, resp) => {
           if (err) return reject(err);
@@ -171,6 +172,7 @@ describe('Auth Service API Key Tests', () => {
             email: '[email protected]',
             password: 'notthepassword123',
             description: 'API key request with invalid password',
+            environment: 'dev',
           },
           (err, resp) => {
             if (err) return reject(err);
@@ -190,6 +192,7 @@ describe('Auth Service API Key Tests', () => {
             email: '[email protected]',
             password: 'password123',
             description: 'API key request with unpriviledged user',
+            environment: 'dev',
           },
           (err, resp) => {
             if (err) return reject(err);

packages/db-service/entrypoint.sh

@@ -5,6 +5,6 @@ if [[ ${RUN_MODE} == *"test"* ]]; then
     yarn prisma migrate reset --force
 fi
 
-yarn prisma migrate dev 
+yarn prisma migrate dev
 
 yarn ${DB_COMMAND-start:dev} 

packages/db-service/prisma/migrations/20240304182706_/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `environment` to the `ApiKey` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "ApiKey" ADD COLUMN     "environment" TEXT NOT NULL;

packages/db-service/prisma/schema.prisma

@@ -8,7 +8,7 @@ generator client {
 datasource db {
   provider = "postgresql"
   url      = env("DATABASE_URL")
-//  url = "postgresql://johndoe:mysecretpassword@localhost:5432"
+//url = "postgresql://johndoe:mysecretpassword@localhost:5432"
 }
 
 model User {
@@ -34,6 +34,7 @@ model ApiKey {
   description String
   projectId   Int
   project     Project @relation(fields: [projectId], references: [id])
+  environment String
 }
 
 enum ApiScope {

packages/db-service/src/modules/auth/auth.controller.ts

@@ -22,6 +22,7 @@ export class ApiKeyDbController
           name: request.apiKey.project.name,
         },
       },
+      environment: request.apiKey.environment,
     };
 
     const apiKey = this.apiKeyService.createApiKey(prepareCreateApiKey);

packages/db-service/src/modules/auth/auth.service.ts

@@ -72,6 +72,7 @@ export class AuthService {
           description: input.description,
           scopes: [],
           projectId: projectId,
+          environment: input.environment,
         },
         include: {
           project: true,
@@ -101,6 +102,7 @@ const convertDbApiKeyToTs = (key: ApiKey): ApiKeyProto.ApiKey => {
     scopes: mappedScopes,
     description: key.description,
     project: { id: key.projectId },
+    environment: key.environment,
   };
   return apiKey;
 };

packages/db-service/test/auth.e2e-spec.ts

@@ -123,6 +123,7 @@ describe('DB Service API Key Tests', () => {
             description: 'Valid API key',
             scopes: [0],
             project: { name: 'apiKeyTestProject' },
+            environment: 'dev',
           },
         },
         (err, res) => {
@@ -142,5 +143,6 @@ describe('DB Service API Key Tests', () => {
     );
     expect(response).toHaveProperty('description', 'Valid API key');
     expect(response).toHaveProperty('project');
+    expect(response).toHaveProperty('environment', 'dev');
   });
 });

packages/proto/definitions/api_key.proto

@@ -19,6 +19,7 @@ message IssueApiKeyRequest {
   string email = 2;
   string password = 3;
   string description = 4;
+  string environment = 5;
 }
 
 message CreateApiKeyParams {
@@ -35,13 +36,15 @@ message ApiKey {
   string description = 3;
   repeated ApiScope scopes = 4;
   identifiers.ProjectIdentifier project = 5;
+  string environment = 6;
 }
 
 message ApiKeyNoId { 
   string hash = 1;
   string description = 2;
   repeated ApiScope scopes = 3;
   identifiers.ProjectIdentifier project = 4;
+  string environment = 5;
 }
 
 message IssueApiKeyResponse {

packages/proto/src/gen/api_key.ts

@@ -15,6 +15,7 @@ export interface IssueApiKeyRequest {
   email: string;
   password: string;
   description: string;
+  environment: string;
 }
 
 export interface CreateApiKeyParams {
@@ -27,13 +28,15 @@ export interface ApiKey {
   description: string;
   scopes: ApiScope[];
   project: ProjectIdentifier | undefined;
+  environment: string;
 }
 
 export interface ApiKeyNoId {
   hash: string;
   description: string;
   scopes: ApiScope[];
   project: ProjectIdentifier | undefined;
+  environment: string;
 }
 
 export interface IssueApiKeyResponse {