Fixed sending /events requests from logged out users

changelog.d/20240320_125513_klakhov_event_for_logged_out_user.md

@@ -0,0 +1,7 @@
+### Fixed
+
+- Sending `/events` request from logged-out user  (<https://github.com/opencv/cvat/pull/7608>)
+
+### Added
+
+- Redirect to login page on `401` error (<https://github.com/opencv/cvat/pull/7608>)

cvat-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-core",
-  "version": "15.0.1",
+  "version": "15.0.2",
   "type": "module",
   "description": "Part of Computer Vision Tool which presents an interface for client-side integration",
   "main": "src/api.ts",

cvat-core/src/api.ts

@@ -283,6 +283,12 @@ function build(): CVATCore {
             set onOrganizationChange(value: (orgId: number) => void) {
                 config.onOrganizationChange = value;
             },
+            get onAuthenticationFailed(): () => void {
+                return config.onAuthenticationFailed;
+            },
+            set onAuthenticationFailed(value: () => void) {
+                config.onAuthenticationFailed = value;
+            },
             set globalObjectsCounter(value: number) {
                 config.globalObjectsCounter = value;
             },

cvat-core/src/config.ts

@@ -16,6 +16,7 @@ const config = {
         onEmptyMaskOccurrence: null,
     },
     onOrganizationChange: null,
+    onAuthenticationFailed: null,
     globalObjectsCounter: 0,
 };
 

cvat-core/src/index.ts

@@ -160,7 +160,8 @@ export default interface CVATCore {
             enabled: boolean;
             onEmptyMaskOccurrence: () => void | null;
         };
-        onOrganizationChange: typeof config.onOrganizationChange;
+        onOrganizationChange: (newOrgId: number | null) => void | null;
+        onAuthenticationFailed: () => void | null;
         globalObjectsCounter: typeof config.globalObjectsCounter;
     },
     client: {

cvat-core/src/server-proxy.ts

@@ -345,6 +345,11 @@ Axios.interceptors.response.use((response) => {
     }
 
     return response;
+}, (error) => {
+    if (error?.response.status === 401) {
+        config?.onAuthenticationFailed();
+    }
+    throw error;
 });
 
 let token = store.get('token');

cvat-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.63.2",
+  "version": "1.63.4",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {

cvat-ui/src/components/cvat-app.tsx

@@ -138,7 +138,7 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
         const { history, location } = this.props;
         const {
             HEALTH_CHECK_RETRIES, HEALTH_CHECK_PERIOD, HEALTH_CHECK_REQUEST_TIMEOUT, SERVER_UNAVAILABLE_COMPONENT,
-            RESET_NOTIFICATIONS_PATHS,
+            RESET_NOTIFICATIONS_PATHS, REDIRECT_TO_LOGIN_PAGE_TIMEOUT,
         } = appConfig;
 
         // Logger configuration
@@ -149,7 +149,6 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
         });
 
         core.logger.configure(() => window.document.hasFocus, userActivityCallback);
-        EventRecorder.initSave();
 
         core.config.onOrganizationChange = (newOrgId: number | null) => {
             if (newOrgId === null) {
@@ -167,6 +166,12 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
             }
         };
 
+        core.config.onAuthenticationFailed = () => {
+            if (!history.location.pathname.includes('auth')) {
+                setTimeout(() => history.push('/auth/login'), REDIRECT_TO_LOGIN_PAGE_TIMEOUT);
+            }
+        };
+
         customWaViewHit(location.pathname, location.search, location.hash);
         history.listen((newLocation) => {
             customWaViewHit(newLocation.pathname, newLocation.search, newLocation.hash);
@@ -254,7 +259,7 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
         }
     }
 
-    public componentDidUpdate(): void {
+    public componentDidUpdate(prevProps: CVATAppProps): void {
         const {
             verifyAuthorized,
             loadFormats,
@@ -302,6 +307,12 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
             return;
         }
 
+        if (user !== prevProps.user) {
+            EventRecorder.configure({
+                savingEnabled: !!user,
+            });
+        }
+
         if (!userAgreementsInitialized && !userAgreementsFetching) {
             loadUserAgreements();
             return;

cvat-ui/src/config.tsx

@@ -132,6 +132,8 @@ const OPENCV_PATH = '/assets/opencv_4.8.0.js';
 const LOCAL_STORAGE_SEEN_GUIDES_MEMORY_LIMIT = 10;
 const LOCAL_STORAGE_LAST_FRAME_MEMORY_LIMIT = 20;
 
+const REDIRECT_TO_LOGIN_PAGE_TIMEOUT = 2000; // ms
+
 export default {
     UNDEFINED_ATTRIBUTE_VALUE,
     NO_BREAK_SPACE,
@@ -171,4 +173,5 @@ export default {
     OPENCV_PATH,
     LOCAL_STORAGE_SEEN_GUIDES_MEMORY_LIMIT,
     LOCAL_STORAGE_LAST_FRAME_MEMORY_LIMIT,
+    REDIRECT_TO_LOGIN_PAGE_TIMEOUT,
 };

cvat-ui/src/utils/controls-logger.ts

@@ -1,4 +1,4 @@
-// Copyright (C) 2023 CVAT.ai Corporation
+// Copyright (C) 2023-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -13,10 +13,19 @@ const { CONTROLS_LOGS_INTERVAL } = config;
 const classFilter = ['ant-btn'];
 const parentClassFilter = ['ant-btn'];
 
+export interface EventRecorderConfiguration {
+    savingEnabled: boolean;
+}
+
 class EventRecorder {
     #savingTimeout: number | null;
+    #configuration: EventRecorderConfiguration;
+
     public constructor() {
         this.#savingTimeout = null;
+        this.#configuration = {
+            savingEnabled: false,
+        };
         core.logger.log(EventScope.loadTool, {
             location: window.location.pathname + window.location.search,
             platform: platformInfo(),
@@ -49,14 +58,35 @@ class EventRecorder {
         }
     }
 
-    public initSave(): void {
-        if (this.#savingTimeout) return;
-        this.#savingTimeout = window.setTimeout(() => {
-            core.logger.save().finally(() => {
-                this.#savingTimeout = null;
-                this.initSave();
-            });
-        }, CONTROLS_LOGS_INTERVAL);
+    public configure(configuration: EventRecorderConfiguration): void {
+        this.onConfigurationChange(configuration);
+        this.#configuration = {
+            ...this.#configuration,
+            ...configuration,
+        };
+    }
+
+    private onConfigurationChange(newConfiguration: EventRecorderConfiguration): void {
+        const { savingEnabled } = newConfiguration;
+        if (savingEnabled !== this.#configuration.savingEnabled) {
+            this.setupSavingTimeout(savingEnabled);
+        }
+    }
+
+    private setupSavingTimeout(enable: boolean): void {
+        if (enable) {
+            if (this.#savingTimeout) return;
+
+            this.#savingTimeout = window.setTimeout(() => {
+                core.logger.save().finally(() => {
+                    this.#savingTimeout = null;
+                    this.setupSavingTimeout(true);
+                });
+            }, CONTROLS_LOGS_INTERVAL);
+        } else if (this.#savingTimeout) {
+            clearTimeout(this.#savingTimeout);
+            this.#savingTimeout = null;
+        }
     }
 
     private filterClassName(cls: string): string {