Merge pull request #703 from SELab-2/url-fix

fix: remove logs and double / error

backend/routes/followup.ts

@@ -4,7 +4,7 @@ import * as ormJA from "../orm_functions/job_application";
 import * as rq from "../request";
 import { Responses } from "../types";
 import * as util from "../utility";
-import { checkYearPermissionStudent, errors } from "../utility";
+import { checkYearPermissionsFollowup, errors } from "../utility";
 import { getOsocYearsForLoginUser } from "../orm_functions/login_user";
 import { getLatestOsoc, getOsocById } from "../orm_functions/osoc";
 import { getJobApplication } from "../orm_functions/job_application";
@@ -21,6 +21,7 @@ export async function getFollowup(
     return rq
         .parseGetFollowupStudentRequest(req)
         .then((parsed) => util.checkSessionKey(parsed))
+        .then(checkYearPermissionsFollowup)
         .then((checked) =>
             ormJA
                 .getJobApplication(checked.data.id)
@@ -59,7 +60,7 @@ export async function updateFollowup(
     return rq
         .parseSetFollowupStudentRequest(req)
         .then((parsed) => util.checkSessionKey(parsed))
-        .then(checkYearPermissionStudent)
+        .then(checkYearPermissionsFollowup)
         .then(async (checked) => {
             // modifications to a job application is only allowed if the job application is of the most recent osoc year
             const [jobApplication, latestOsoc] = await Promise.all([

backend/tests/routes_unit/followup.test.ts

@@ -30,7 +30,8 @@ jest.mock("../../utility", () => {
         checkSessionKey: jest.fn(),
         isAdmin: jest.fn(),
         checkYearPermissionStudent: jest.fn(),
-    }; // we want to only mock checkSessionKey, isAdmin and checkYearPermissionStudent
+        checkYearPermissionsFollowup: jest.fn(),
+    }; // we want to only mock checkSessionKey, isAdmin, checkYearPermissionStudent and checkYearPermissionsFollowup
 });
 export const utilMock = util as jest.Mocked<typeof util>;
 
@@ -179,6 +180,9 @@ beforeEach(() => {
     utilMock.checkYearPermissionStudent.mockImplementation((v) =>
         Promise.resolve(v)
     );
+    utilMock.checkYearPermissionsFollowup.mockImplementation((v) =>
+        Promise.resolve(v)
+    );
 
     osocMock.getLatestOsoc.mockResolvedValue(osocdat);
     osocMock.getOsocById.mockResolvedValue(osocdat);
@@ -210,6 +214,7 @@ afterEach(() => {
     utilMock.checkSessionKey.mockReset();
     utilMock.isAdmin.mockReset();
     utilMock.checkYearPermissionStudent.mockReset();
+    utilMock.checkYearPermissionsFollowup.mockReset();
 
     osocMock.getLatestOsoc.mockReset();
     osocMock.getOsocById.mockReset();

backend/utility.ts

@@ -24,6 +24,7 @@ import { getAppliedYearsForStudent } from "./orm_functions/student";
 import IdRequest = Requests.IdRequest;
 import { getProjectYear } from "./orm_functions/project";
 import { getOsocById } from "./orm_functions/osoc";
+import { getJobApplication } from "./orm_functions/job_application";
 
 /**
  *  The API error cooking functions. HTTP error codes are loaded from
@@ -416,6 +417,29 @@ export async function checkYearPermissionOsoc<T extends IdRequest>(
     return Promise.reject(errors.cookInsufficientRights());
 }
 
+/**
+ * returns the userData object if the user is allowed to see the followup
+ * Otherwise it returns an insufficient rights error.
+ * @param userData: object with the userId and osocID
+ */
+export async function checkYearPermissionsFollowup<T extends IdRequest>(
+    userData: WithUserID<T>
+): Promise<WithUserID<T>> {
+    // get the years that are visible for the loginUser
+    const visibleYears = await getOsocYearsForLoginUser(userData.userId);
+    // get the year that the application belongs to
+    const job_application = await getJobApplication(userData.data.id);
+
+    // check if the project year is inside the visible years for the user
+    if (
+        job_application !== null &&
+        visibleYears.includes(job_application.osoc.year)
+    ) {
+        return userData;
+    }
+    return Promise.reject(errors.cookInsufficientRights());
+}
+
 /**
  *  Generates a new session key.
  *  @returns The newly generated session key.

frontend/components/Header/Header.tsx

@@ -64,13 +64,7 @@ export const Header: React.FC = () => {
                     Accept: "application/json",
                     Authorization: `auth/osoc2 ${sessionKey}`,
                 },
-            })
-                .then((response) => {
-                    if (!response.ok) {
-                        console.log(response);
-                    }
-                })
-                .catch((error) => console.log(error));
+            }).catch((error) => console.log(error));
         });
     };
 

frontend/components/ProjectCard/ProjectCard.tsx

@@ -31,7 +31,6 @@ export const ProjectCard: React.FC<{
         const { sessionKey } = getSession
             ? await getSession()
             : { sessionKey: "" };
-        console.log("test");
         const response = await fetch(
             `${process.env.NEXT_PUBLIC_API_URL}/project/${project.id}/assignee`,
             {

frontend/components/Students/Students.tsx

@@ -228,7 +228,7 @@ export const Students: React.FC<{
         paramsQuery.delete("id");
         // push the url
         router
-            .push(`/${window.location.pathname}?${paramsQuery.toString()}`)
+            .push(`${window.location.pathname}?${paramsQuery.toString()}`)
             .then();
 
         if (params !== undefined) {

frontend/pages/osocs.tsx

@@ -76,7 +76,6 @@ const Osocs: NextPage = () => {
      */
     const search = useCallback(
         async (params: OsocFilterParams, page: number) => {
-            console.log("callback");
             if (loading) return;
             isLoading(true);
             const filters = [];