chore: lint fixes

Author: dervoeti

backend/application/core/services/observation.py

@@ -168,9 +168,9 @@ def normalize_observation_fields(observation: Observation) -> None:
     _normalize_origin_cloud(observation)
     _normalize_origin_kubernetes(observation)
 
-    normalize_severity(observation)
-    normalize_status(observation)
-    normalize_vex_justification(observation)
+    _normalize_severity(observation)
+    _normalize_status(observation)
+    _normalize_vex_justification(observation)
     normalize_vex_remediations(observation)
 
     _normalize_description(observation)
@@ -491,6 +491,8 @@ def normalize_vex_remediations(observation: Observation) -> None:
         observation.vex_vex_remediations = ""
 
     observation.current_vex_remediations = get_current_vex_remediations(observation)
+
+
 def _normalize_update_impact_score_and_fix_available(observation: Observation) -> None:
     observation.fix_available = None
     observation.update_impact_score = None

backend/unittests/access_control/services/test_oidc_authentication.py

@@ -142,7 +142,7 @@ def test_validate_jwt_message(self, get_signing_key_mock, pyjwkclient_mock, jwks
     @patch("application.access_control.services.oidc_authentication.OIDCAuthentication._get_jwks_uri")
     @patch("jwt.PyJWKClient.__init__")
     @patch("jwt.PyJWKClient.get_signing_key_from_jwt")
-    @patch("application.access_control.services.oidc_authentication.get_user_by_username")
+    @patch("application.access_control.services.oidc_authentication.get_user_by_email")
     @patch("application.access_control.services.oidc_authentication.OIDCAuthentication._create_user")
     def test_validate_jwt_user_not_found(
         self,
@@ -157,9 +157,9 @@ def test_validate_jwt_user_not_found(
         pyjwkclient_mock.return_value = None
         mock_py_jwk = MockPyJWK("test_key")
         get_signing_key_mock.return_value = mock_py_jwk
-        jwt_mock.return_value = {"preferred_username": "test_username"}
+        jwt_mock.return_value = {"email": "test@example.com"}
         get_user_mock.return_value = None
-        expected_user = User(username="test_username")
+        expected_user = User(email="test@example.com")
         create_user_mock.return_value = expected_user
 
         settings = Settings.load()
@@ -169,7 +169,7 @@ def test_validate_jwt_user_not_found(
         user = oidc_authentication._validate_jwt("token")
 
         self.assertEqual(user, expected_user)
-        get_user_mock.assert_called_with("test_username")
+        get_user_mock.assert_called_with("test@example.com")
         jwks_uri_mock.assert_called_once()
         pyjwkclient_mock.assert_called_once_with("test_jwks_uri")
         get_signing_key_mock.assert_called_once_with("token")
@@ -189,13 +189,13 @@ def test_validate_jwt_user_not_found(
             audience="client_id",
             leeway=7,
         )
-        create_user_mock.assert_called_once_with("test_username", {"preferred_username": "test_username"})
+        create_user_mock.assert_called_once_with("test@example.com", {"email": "test@example.com"})
 
     @patch("jwt.decode")
     @patch("application.access_control.services.oidc_authentication.OIDCAuthentication._get_jwks_uri")
     @patch("jwt.PyJWKClient.__init__")
     @patch("jwt.PyJWKClient.get_signing_key_from_jwt")
-    @patch("application.access_control.services.oidc_authentication.get_user_by_username")
+    @patch("application.access_control.services.oidc_authentication.get_user_by_email")
     @patch("application.access_control.services.oidc_authentication.OIDCAuthentication._check_user_change")
     def test_validate_jwt_user_found(
         self,
@@ -210,7 +210,7 @@ def test_validate_jwt_user_found(
         pyjwkclient_mock.return_value = None
         mock_py_jwk = MockPyJWK("test_key")
         get_signing_key_mock.return_value = mock_py_jwk
-        jwt_mock.return_value = {"preferred_username": self.user_internal.username}
+        jwt_mock.return_value = {"email": self.user_internal.email}
         get_user_mock.return_value = self.user_internal
         check_user_change_mock.return_value = self.user_internal
 
@@ -221,7 +221,7 @@ def test_validate_jwt_user_found(
         user = oidc_authentication._validate_jwt("token")
 
         self.assertEqual(self.user_internal, user)
-        get_user_mock.assert_called_with(self.user_internal.username)
+        get_user_mock.assert_called_with(self.user_internal.email)
         jwks_uri_mock.assert_called_once()
         pyjwkclient_mock.assert_called_once_with("test_jwks_uri")
         get_signing_key_mock.assert_called_once_with("token")
@@ -242,7 +242,7 @@ def test_validate_jwt_user_found(
             leeway=5,
         )
         check_user_change_mock.assert_called_once_with(
-            self.user_internal, {"preferred_username": self.user_internal.username}
+            self.user_internal, {"email": self.user_internal.email}
         )
 
     @patch("requests.request")

frontend/src/core/observation_logs/ObservationLogApprovalList.tsx

@@ -18,7 +18,7 @@ import {
 import { PERMISSION_OBSERVATION_LOG_APPROVAL } from "../../access_control/types";
 import { CustomPagination } from "../../commons/custom_fields/CustomPagination";
 import { SeverityField } from "../../commons/custom_fields/SeverityField";
-import { feature_vex_enabled, has_attribute } from "../../commons/functions";
+import { feature_vex_enabled } from "../../commons/functions";
 import { AutocompleteInputMedium, AutocompleteInputWide } from "../../commons/layout/themes";
 import { getSettingListSize } from "../../commons/user_settings/functions";
 import { ASSESSMENT_STATUS_NEEDS_APPROVAL, OBSERVATION_SEVERITY_CHOICES, OBSERVATION_STATUS_CHOICES } from "../types";
@@ -180,7 +180,7 @@ const ObservationLogApprovalList = ({ product }: ObservationLogApprovalListProps
                 <div style={{ width: "100%" }}>
                     <FilterForm filters={listFilters(product)} />
                     <WithListContext
-                        render={({ data }) => (
+                        render={() => (
                             <Datagrid
                                 size={getSettingListSize()}
                                 sx={{ width: "100%" }}

frontend/src/core/observations/ObservationReviewList.tsx

@@ -1,4 +1,3 @@
-import { Stack } from "@mui/material";
 import { Fragment } from "react";
 import {
     AutocompleteInput,
@@ -12,10 +11,8 @@ import {
     NumberField,
     ReferenceInput,
     ResourceContextProvider,
-    SelectColumnsButton,
     TextField,
     TextInput,
-    TopToolbar,
     WithListContext,
     useListController,
 } from "react-admin";
@@ -163,11 +160,6 @@ const BulkActionButtons = ({ product, storeKey }: BulkActionButtonsProps) => (
     </Fragment>
 );
 
-const ListActions = () => (
-    <TopToolbar>
-        <SelectColumnsButton preferenceKey="observations.review" />
-    </TopToolbar>
-);
 type ObservationsReviewListProps = {
     product?: any;
 };