make application loginc and test work again

Author: lmarschall

backend/src/api/application/applicationCreate.test.ts

@@ -1,5 +1,6 @@
 import { Request, Response } from "express";
 import { applicationCreate } from "./applicationCreate";
+import { redisService } from "../../redis";
 
 jest.mock("@prisma/client", () => {
     return {
@@ -12,6 +13,12 @@ jest.mock("@prisma/client", () => {
     };
 });
 
+jest.mock("../../redis", () => ({
+    redisService: {
+      addToDomainWhitelist: jest.fn(),
+    }
+}));
+
 import { PrismaClient } from "@prisma/client";
 
 const prisma = new PrismaClient();
@@ -76,6 +83,8 @@ describe("testApplicationCreate", () => {
             mockApplication
         );
 
+        (redisService.addToDomainWhitelist as jest.Mock).mockResolvedValue({});
+
         await applicationCreate(req as Request, res as Response, prisma);
 
         expect(res.status).toHaveBeenCalledWith(200);

backend/src/api/application/applicationCreate.ts

@@ -1,10 +1,7 @@
 import { Request, Response } from "express";
 import { Application, PrismaClient } from "@prisma/client";
 import { ApplicationInfo } from "../types";
-import { error } from "console";
-// import { domainWhitelist } from "../../app";
-
-// const prisma = new PrismaClient();
+import { redisService } from "../../redis";
 
 export async function applicationCreate(req: Request, res: Response, prisma: PrismaClient) {
     try {
@@ -27,7 +24,7 @@ export async function applicationCreate(req: Request, res: Response, prisma: Pri
 		console.log(app);
 
 		const appUrl = `https://${app.domain}`;
-		// domainWhitelist.push(appUrl);
+		await redisService.addToDomainWhitelist(appUrl);
 
         res.status(200).send();
 

backend/src/api/application/applicationDelete.test.ts

@@ -4,6 +4,7 @@
 import { Request, Response } from "express";
 import { applicationDelete } from "./applicationDelete";
 import { PrismaClient } from "@prisma/client";
+import { redisService } from "../../redis";
 
 // Prisma mocken
 jest.mock("@prisma/client", () => {
@@ -16,6 +17,12 @@ jest.mock("@prisma/client", () => {
   };
 });
 
+jest.mock("../../redis", () => ({
+  redisService: {
+    removeFromDomainWhitelist: jest.fn(),
+  }
+}));
+
 const prisma = new PrismaClient();
 
 describe("testApplicationDelete", () => {
@@ -81,6 +88,8 @@ describe("testApplicationDelete", () => {
     // Mock für erfolgreichen Löschvorgang
     (prisma.application.delete as jest.Mock).mockResolvedValue(mockApplication);
 
+    (redisService.removeFromDomainWhitelist as jest.Mock).mockResolvedValue({});
+
     await applicationDelete(req as Request, res as Response, prisma);
 
     expect(res.status).toHaveBeenCalledWith(200);

backend/src/api/application/applicationDelete.ts

@@ -1,6 +1,7 @@
 import { Application, PrismaClient } from "@prisma/client";
 import { Request, Response } from "express";
 import { ApplicationInfo } from "../types";
+import { redisService } from "../../redis";
 
 export async function applicationDelete(req: Request, res: Response, prisma: PrismaClient) {
     try {
@@ -20,11 +21,7 @@ export async function applicationDelete(req: Request, res: Response, prisma: Pri
 			}) as Application;
 
 		const appUrl = `https://${app.domain}`;
-		// const index = domainWhitelist.indexOf(appUrl);
-		
-		// if (index !== -1) {
-		// 	domainWhitelist.splice(index, 1);
-		// }
+		await redisService.removeFromDomainWhitelist(appUrl);
 
 		res.status(200).send();
 

backend/src/api/application/applicationToken.ts

@@ -3,8 +3,6 @@ import { Request, Response } from "express";
 import { cryptoService } from "../../crypto";
 import { ApplicationInfo } from "../types";
 
-const prisma = new PrismaClient();
-
 export async function applicationToken(req: Request, res: Response, prisma: PrismaClient) {
     try {
 

backend/src/api/application/applicationUpdate.test.ts

@@ -4,6 +4,7 @@
 import { Request, Response } from "express";
 import { PrismaClient } from "@prisma/client";
 import { applicationUpdate } from "./applicationUpdate";
+import { redisService } from "../../redis";
 
 // Prisma-Client mocken
 jest.mock("@prisma/client", () => {
@@ -17,6 +18,13 @@ jest.mock("@prisma/client", () => {
   };
 });
 
+jest.mock("../../redis", () => ({
+  redisService: {
+    addToDomainWhitelist: jest.fn(),
+    removeFromDomainWhitelist: jest.fn(),
+  }
+}));
+
 const prisma = new PrismaClient();
 
 describe("testApplicationUpdate", () => {
@@ -112,6 +120,9 @@ describe("testApplicationUpdate", () => {
       domain: "updated-domain.com",
     });
 
+    (redisService.addToDomainWhitelist as jest.Mock).mockResolvedValue({});
+    (redisService.removeFromDomainWhitelist as jest.Mock).mockResolvedValue({});
+
     await applicationUpdate(req as Request, res as Response, prisma);
 
     expect(prisma.application.findUnique).toHaveBeenCalled();

backend/src/api/application/applicationUpdate.ts

@@ -1,6 +1,7 @@
 import { Application, PrismaClient } from "@prisma/client";
 import { Request, Response } from "express";
 import { ApplicationInfo } from "../types";
+import { redisService } from "../../redis";
 
 export async function applicationUpdate(req: Request, res: Response, prisma: PrismaClient) {
     try {
@@ -35,12 +36,9 @@ export async function applicationUpdate(req: Request, res: Response, prisma: Pri
 			}) as Application;
 
 		const appUrl = `https://${tempApp.domain}`;
-		// const index = domainWhitelist.indexOf(appUrl);
 
-		// if (index !== -1) {
-		// 	const newAppUrl = `https://${app.domain}`;
-		// 	domainWhitelist[index] = newAppUrl;
-		// }
+		await redisService.removeFromDomainWhitelist(appUrl);
+		await redisService.addToDomainWhitelist(app.domain);
 
 		res.status(200).send();