Merge pull request #1260 from Tria-plc/freight/nati-2

Freight/nati 2

apps/edr-freight-api/src/common/request-log-context.spec.ts

@@ -65,10 +65,40 @@ describe("RequestLogMiddleware", () => {
       originalUrl: "/api/bookings/1/submit?dry=1",
       baseUrl: "/api/bookings",
       route: { path: "/:id/submit" },
-      headers: { "user-agent": "jest", "x-request-id": "req-42" },
+      headers: {
+        "user-agent": "jest",
+        "x-request-id": "req-42",
+        authorization: "Bearer tok",
+        "x-client-app": "freight-backoffice",
+        "current-project-id": "proj-3",
+      },
       ip: "10.0.0.1",
       query: { dry: "1" },
-      user: { id: "u-7" },
+      user: {
+        id: "u-7",
+        sessionId: "sess-9",
+        userType: "STAFF",
+        status: "ACTIVE",
+        username: "nati",
+        email: "nati@example.com",
+        phoneNumber: "0911000000",
+        name: { en: "Nati" },
+        roles: [{ key: "freight_operations" }],
+        permissions: [{ key: "a" }, { key: "b" }],
+        employee: {
+          id: "emp-1",
+          organizationId: "org-1",
+          unitId: "unit-2",
+          position: {
+            id: "pos-5",
+            key: "ops_officer",
+            employeePositionId: "ep-6",
+            isDelegate: true,
+            delegatorId: "pos-1",
+            positionType: { key: "operations" },
+          },
+        },
+      },
     };
     const res = {
       statusCode: 409,
@@ -105,6 +135,29 @@ describe("RequestLogMiddleware", () => {
       bookingId: "b-1",
       booking: { outcome: "REJECTED" },
     });
+    expect(JSON.parse(lines[0]).auth).toEqual({
+      authenticated: true,
+      hasBearer: true,
+      clientApp: "freight-backoffice",
+      userId: "u-7",
+      sessionId: "sess-9",
+      userType: "STAFF",
+      userStatus: "ACTIVE",
+      roles: ["freight_operations"],
+      permissionCount: 2,
+      employeeId: "emp-1",
+      organizationId: "org-1",
+      unitId: "unit-2",
+      positionId: "pos-5",
+      positionKey: "ops_officer",
+      positionType: "operations",
+      employeePositionId: "ep-6",
+      isDelegate: true,
+      delegatorId: "pos-1",
+      projectId: "proj-3",
+    });
+    // No personal data reaches the line, whatever the token carried.
+    expect(lines[0]).not.toMatch(/nati|example\.com|0911000000/);
     expect(res.setHeader).toHaveBeenCalledWith("x-request-id", "req-42");
     jest.restoreAllMocks();
   });