Merge branch 'main' of https://gitlab.informatika.org/if3110-2023-02-a/rest-service

prisma/migrations/db/migration.sql

@@ -132,3 +132,7 @@ ALTER TABLE "Assignment" ADD CONSTRAINT "Assignment_organization_id_scholarship_
 
 -- AddForeignKey
 ALTER TABLE "Files" ADD CONSTRAINT "Files_organization_id_scholarship_id_assignment_id_fkey" FOREIGN KEY ("organization_id", "scholarship_id", "assignment_id") REFERENCES "Assignment"("organization_id", "scholarship_id", "assignment_id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+INSERT INTO "apikeys" (service_name, key_value) VALUES ('SPA', 'spaKey');
+
+INSERT INTO "apikeys" (service_name, key_value) VALUES ('PHP', 'phpKey');
\ No newline at end of file

server.ts

@@ -40,7 +40,7 @@ const studentRoute = require("./routes/student.routes")
 
 app.use(
   cors({
-    origin: [process.env.SPA_URL as any, process.env.MONOLITH_URL as any],
+    origin: [process.env.SPA_URL as any, process.env.MONOLITH_URL as any, "http://localhost:3000"],
     credentials: true
   })
 )