From 6b6139967f9c0da565c64c0bbb920f2f52d955a5 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Thu, 23 Apr 2020 19:22:41 +0300
Subject: [PATCH 01/11] added terms of use support

---
 cvat-core/src/api-implementation.js           |  9 ++-
 cvat-core/src/api.js                          | 18 ++++-
 cvat-core/src/server-proxy.js                 | 19 ++++-
 cvat-ui/src/actions/auth-actions.ts           |  4 +-
 cvat-ui/src/actions/useragreements-actions.ts | 37 ++++++++++
 cvat-ui/src/components/cvat-app.tsx           | 13 +++-
 .../register-page/register-form.tsx           | 69 +++++++++++++++++++
 .../register-page/register-page.tsx           |  9 ++-
 .../register-page/register-page.tsx           |  9 ++-
 cvat-ui/src/index.tsx                         |  8 +++
 cvat-ui/src/reducers/interfaces.ts            |  7 ++
 cvat-ui/src/reducers/root-reducer.ts          |  2 +
 .../src/reducers/useragreements-reducer.ts    | 50 ++++++++++++++
 cvat/apps/engine/urls.py                      |  2 +
 cvat/apps/restrictions/__init__.py            |  3 +
 cvat/apps/restrictions/admin.py               |  8 +++
 cvat/apps/restrictions/apps.py                | 10 +++
 cvat/apps/restrictions/migrations/__init__.py |  3 +
 cvat/apps/restrictions/models.py              |  8 +++
 cvat/apps/restrictions/restrictions.py        |  3 +
 cvat/apps/restrictions/serializers.py         | 35 ++++++++++
 cvat/apps/restrictions/tests.py               |  8 +++
 cvat/apps/restrictions/urls.py                |  0
 cvat/apps/restrictions/views.py               | 41 +++++++++++
 cvat/settings/base.py                         |  8 ++-
 25 files changed, 370 insertions(+), 13 deletions(-)
 create mode 100644 cvat-ui/src/actions/useragreements-actions.ts
 create mode 100644 cvat-ui/src/reducers/useragreements-reducer.ts
 create mode 100644 cvat/apps/restrictions/__init__.py
 create mode 100644 cvat/apps/restrictions/admin.py
 create mode 100644 cvat/apps/restrictions/apps.py
 create mode 100644 cvat/apps/restrictions/migrations/__init__.py
 create mode 100644 cvat/apps/restrictions/models.py
 create mode 100644 cvat/apps/restrictions/restrictions.py
 create mode 100644 cvat/apps/restrictions/serializers.py
 create mode 100644 cvat/apps/restrictions/tests.py
 create mode 100644 cvat/apps/restrictions/urls.py
 create mode 100644 cvat/apps/restrictions/views.py

diff --git a/cvat-core/src/api-implementation.js b/cvat-core/src/api-implementation.js
index 4b7e2872719..cc5435bdb4e 100644
--- a/cvat-core/src/api-implementation.js
+++ b/cvat-core/src/api-implementation.js
@@ -74,10 +74,15 @@
             return result;
         };
 
+        cvat.server.userAgreements.implementation = async () => {
+            const result = await serverProxy.server.userAgreements();
+            return result;
+        };
+
         cvat.server.register.implementation = async (username, firstName, lastName,
-            email, password1, password2) => {
+            email, password1, password2, userAgreements) => {
             await serverProxy.server.register(username, firstName, lastName, email,
-                password1, password2);
+                password1, password2, userAgreements);
         };
 
         cvat.server.login.implementation = async (username, password) => {
diff --git a/cvat-core/src/api.js b/cvat-core/src/api.js
index 4eb4e99af00..d8cffbee1ce 100644
--- a/cvat-core/src/api.js
+++ b/cvat-core/src/api.js
@@ -132,6 +132,20 @@ function build() {
                     .apiWrapper(cvat.server.datasetFormats);
                 return result;
             },
+            /**
+                * Method returns user agreements that the user must accept
+                * @method userAgreements
+                * @async
+                * @memberof module:API.cvat.server
+                * @returns {Object[]}
+                * @throws {module:API.cvat.exceptions.PluginError}
+                * @throws {module:API.cvat.exceptions.ServerError}
+            */
+           async userAgreements() {
+            const result = await PluginRegistry
+                .apiWrapper(cvat.server.userAgreements);
+            return result;
+        },
             /**
                 * Method allows to register on a server
                 * @method register
@@ -146,10 +160,10 @@ function build() {
                 * @throws {module:API.cvat.exceptions.PluginError}
                 * @throws {module:API.cvat.exceptions.ServerError}
             */
-            async register(username, firstName, lastName, email, password1, password2) {
+            async register(username, firstName, lastName, email, password1, password2, userAgreements) {
                 const result = await PluginRegistry
                     .apiWrapper(cvat.server.register, username, firstName,
-                        lastName, email, password1, password2);
+                        lastName, email, password1, password2, userAgreements);
                 return result;
             },
             /**
diff --git a/cvat-core/src/server-proxy.js b/cvat-core/src/server-proxy.js
index 8251328223d..ea8ec3957a2 100644
--- a/cvat-core/src/server-proxy.js
+++ b/cvat-core/src/server-proxy.js
@@ -170,7 +170,22 @@
                 return response;
             }
 
-            async function register(username, firstName, lastName, email, password1, password2) {
+            async function userAgreements() {
+                const { backendAPI } = config;
+                let response = null;
+                try {
+                    response = await Axios.get(`${backendAPI}/restrictions/user_agreements`, {
+                        proxy: config.proxy,
+                    });
+                    
+                } catch (errorData) {
+                    throw generateError(errorData);
+                }
+
+                return response.data;
+            }
+
+            async function register(username, firstName, lastName, email, password1, password2, userAgreements) {
                 let response = null;
                 try {
                     const data = JSON.stringify({
@@ -180,6 +195,7 @@
                         email,
                         password1,
                         password2,
+                        user_agreements: userAgreements,
                     });
                     response = await Axios.post(`${config.backendAPI}/auth/register`, data, {
                         proxy: config.proxy,
@@ -671,6 +687,7 @@
                         authorized,
                         register,
                         request: serverRequest,
+                        userAgreements,
                     }),
                     writable: false,
                 },
diff --git a/cvat-ui/src/actions/auth-actions.ts b/cvat-ui/src/actions/auth-actions.ts
index 71be07f2c54..e92de193cd0 100644
--- a/cvat-ui/src/actions/auth-actions.ts
+++ b/cvat-ui/src/actions/auth-actions.ts
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
+import { UserAgreement } from 'components/register-page/register-form'
 import getCore from 'cvat-core';
 
 const cvat = getCore();
@@ -44,13 +45,14 @@ export const registerAsync = (
     email: string,
     password1: string,
     password2: string,
+    userAgreements: UserAgreement[],
 ): ThunkAction => async (
     dispatch,
 ) => {
     dispatch(authActions.register());
 
     try {
-        await cvat.server.register(username, firstName, lastName, email, password1, password2);
+        await cvat.server.register(username, firstName, lastName, email, password1, password2, userAgreements);
         const users = await cvat.users.get({ self: true });
 
         dispatch(authActions.registerSuccess(users[0]));
diff --git a/cvat-ui/src/actions/useragreements-actions.ts b/cvat-ui/src/actions/useragreements-actions.ts
new file mode 100644
index 00000000000..382ee038f5d
--- /dev/null
+++ b/cvat-ui/src/actions/useragreements-actions.ts
@@ -0,0 +1,37 @@
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
+import getCore from 'cvat-core';
+
+const core = getCore();
+
+export enum UserAgreementsActionTypes {
+    GET_USER_AGREEMENTS = 'GET_USER_AGREEMENTS',
+    GET_USER_AGREEMENTS_SUCCESS = 'GET_USER_AGREEMENTS_SUCCESS',
+    GET_USER_AGREEMENTS_FAILED = 'GET_USER_AGREEMENTS_FAILED',
+}
+
+const userAgreementsActions = {
+    getUserAgreements: () => createAction(UserAgreementsActionTypes.GET_USER_AGREEMENTS),
+    getUserAgreementsSuccess: (userAgreements: any[]) =>
+        createAction(UserAgreementsActionTypes.GET_USER_AGREEMENTS_SUCCESS, userAgreements),
+    getUserAgreementsFailed: (error: any) =>
+        createAction(UserAgreementsActionTypes.GET_USER_AGREEMENTS_FAILED, { error }),
+};
+
+export type UserAgreementsActions = ActionUnion<typeof userAgreementsActions>;
+
+export const getUserAgreementsAsync = (): ThunkAction => async (dispatch): Promise<void> => {
+    dispatch(userAgreementsActions.getUserAgreements());
+
+    try {
+        const userAgreements = await core.server.userAgreements();
+        dispatch(
+            userAgreementsActions.getUserAgreementsSuccess(userAgreements),
+        );
+    } catch (error) {
+        dispatch(userAgreementsActions.getUserAgreementsFailed(error));
+    }
+};
\ No newline at end of file
diff --git a/cvat-ui/src/components/cvat-app.tsx b/cvat-ui/src/components/cvat-app.tsx
index f5a76fdb0ff..cbf7463bb9a 100644
--- a/cvat-ui/src/components/cvat-app.tsx
+++ b/cvat-ui/src/components/cvat-app.tsx
@@ -33,6 +33,7 @@ interface CVATAppProps {
     loadUsers: () => void;
     loadAbout: () => void;
     verifyAuthorized: () => void;
+    loadUserAgreements: () => void;
     initPlugins: () => void;
     resetErrors: () => void;
     resetMessages: () => void;
@@ -51,6 +52,8 @@ interface CVATAppProps {
     installedAutoAnnotation: boolean;
     installedTFAnnotation: boolean;
     installedTFSegmentation: boolean;
+    userAgreementsFetching: boolean,
+    userAgreementsInitialized: boolean,
     notifications: NotificationsState;
     user: any;
 }
@@ -58,7 +61,7 @@ interface CVATAppProps {
 class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentProps> {
     public componentDidMount(): void {
         const core = getCore();
-        const { verifyAuthorized } = this.props;
+        const { verifyAuthorized, loadUserAgreements } = this.props;
         configure({ ignoreRepeatedEventsWhenKeyHeldDown: false });
 
         // Logger configuration
@@ -77,6 +80,7 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
             loadFormats,
             loadUsers,
             loadAbout,
+            loadUserAgreements,
             initPlugins,
             userInitialized,
             userFetching,
@@ -89,6 +93,8 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
             pluginsInitialized,
             pluginsFetching,
             user,
+            userAgreementsFetching,
+            userAgreementsInitialized,
         } = this.props;
 
         this.showErrors();
@@ -99,6 +105,11 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
             return;
         }
 
+        if (!userAgreementsInitialized && !userAgreementsFetching) {
+            loadUserAgreements();
+            return;
+        }
+
         if (user == null) {
             return;
         }
diff --git a/cvat-ui/src/components/register-page/register-form.tsx b/cvat-ui/src/components/register-page/register-form.tsx
index f300a5e4552..600080cd43b 100644
--- a/cvat-ui/src/components/register-page/register-form.tsx
+++ b/cvat-ui/src/components/register-page/register-form.tsx
@@ -9,10 +9,16 @@ import {
     Icon,
     Input,
     Form,
+    Checkbox,
 } from 'antd';
 
 import patterns from 'utils/validation-patterns';
 
+export interface UserAgreement {
+    name: string;
+    value: boolean;
+}
+
 export interface RegisterData {
     username: string;
     firstName: string;
@@ -20,10 +26,12 @@ export interface RegisterData {
     email: string;
     password1: string;
     password2: string;
+    userAgreements: UserAgreement[];
 }
 
 type RegisterFormProps = {
     fetching: boolean;
+    userAgreements: any[],
     onSubmit(registerData: RegisterData): void;
 } & FormComponentProps;
 
@@ -73,15 +81,43 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
         callback();
     };
 
+    private validateAgrement = (agreement: any, value: any, callback: any): void => {
+        const { userAgreements } = this.props;
+        let isValid: boolean = true;
+        for (const userAgreement of userAgreements) {
+            if (agreement.field === userAgreement.name
+                && userAgreement.required && !value) {
+                isValid = false;
+                callback(`You must accept the ${userAgreement.display_text}!`);
+                break;
+            }
+        }
+        if (isValid) {
+            callback();
+        }
+    };
+
     private handleSubmit = (e: React.FormEvent): void => {
         e.preventDefault();
         const {
             form,
             onSubmit,
+            userAgreements,
         } = this.props;
 
         form.validateFields((error, values): void => {
             if (!error) {
+                values.userAgreements = []
+                
+                for (const userAgreement of userAgreements) {
+                    
+                    values.userAgreements.push({
+                        name: userAgreement.name,
+                        value: values[userAgreement.name]
+                    });
+                    delete values[userAgreement.name];
+                }
+
                 onSubmit(values);
             }
         });
@@ -217,6 +253,38 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
         );
     }
 
+    private renderUserAgreements(): JSX.Element[] {
+        const { form, userAgreements } = this.props;
+        const getUserAgreementsElements = () =>
+        {
+            const agreementsList: JSX.Element[] = [];
+            for (const userAgreement of userAgreements) {
+                agreementsList.push(
+                    <Form.Item key={userAgreement.name}>
+                        {form.getFieldDecorator(userAgreement.name as string, {
+                            initialValue: false,
+                            valuePropName: 'checked',
+                            rules: [{
+                                required: true,
+                                message: 'You must accept!',
+                            }, {
+                                validator: this.validateAgrement,
+                            }]
+                        })(
+                            <Checkbox>
+                                I accept the <a rel='noopener noreferrer' target='_blank'
+                                     href={ userAgreement.url }>{ userAgreement.display_text }</a>
+                            </Checkbox>
+                        )}
+                    </Form.Item>
+                );
+            }
+            return agreementsList;
+        }
+
+        return getUserAgreementsElements();
+    }
+
     public render(): JSX.Element {
         const { fetching } = this.props;
 
@@ -228,6 +296,7 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
                 {this.renderEmailField()}
                 {this.renderPasswordField()}
                 {this.renderPasswordConfirmationField()}
+                {this.renderUserAgreements()}
 
                 <Form.Item>
                     <Button
diff --git a/cvat-ui/src/components/register-page/register-page.tsx b/cvat-ui/src/components/register-page/register-page.tsx
index b9383884678..81f3ff2f141 100644
--- a/cvat-ui/src/components/register-page/register-page.tsx
+++ b/cvat-ui/src/components/register-page/register-page.tsx
@@ -14,13 +14,15 @@ import {
     Row,
 } from 'antd';
 
-import RegisterForm, { RegisterData } from './register-form';
+import RegisterForm, { RegisterData, UserAgreement } from './register-form';
 
 interface RegisterPageComponentProps {
     fetching: boolean;
+    userAgreements: any[];
     onRegister: (username: string, firstName: string,
         lastName: string, email: string,
-        password1: string, password2: string) => void;
+        password1: string, password2: string,
+        userAgreements: UserAgreement[]) => void;
 }
 
 function RegisterPageComponent(
@@ -36,6 +38,7 @@ function RegisterPageComponent(
 
     const {
         fetching,
+        userAgreements,
         onRegister,
     } = props;
 
@@ -45,6 +48,7 @@ function RegisterPageComponent(
                 <Title level={2}> Create an account </Title>
                 <RegisterForm
                     fetching={fetching}
+                    userAgreements={userAgreements}
                     onSubmit={(registerData: RegisterData): void => {
                         onRegister(
                             registerData.username,
@@ -53,6 +57,7 @@ function RegisterPageComponent(
                             registerData.email,
                             registerData.password1,
                             registerData.password2,
+                            registerData.userAgreements,
                         );
                     }}
                 />
diff --git a/cvat-ui/src/containers/register-page/register-page.tsx b/cvat-ui/src/containers/register-page/register-page.tsx
index 040d9126e3d..f75801e7b5e 100644
--- a/cvat-ui/src/containers/register-page/register-page.tsx
+++ b/cvat-ui/src/containers/register-page/register-page.tsx
@@ -6,21 +6,26 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { registerAsync } from 'actions/auth-actions';
 import RegisterPageComponent from 'components/register-page/register-page';
+import { UserAgreement } from 'components/register-page/register-form'
 import { CombinedState } from 'reducers/interfaces';
 
 interface StateToProps {
     fetching: boolean;
+    userAgreements: any[];
+    
 }
 
 interface DispatchToProps {
     onRegister: (username: string, firstName: string,
         lastName: string, email: string,
-        password1: string, password2: string) => void;
+        password1: string, password2: string,
+        userAgreement: UserAgreement[]) => void;
 }
 
 function mapStateToProps(state: CombinedState): StateToProps {
     return {
-        fetching: state.auth.fetching,
+        fetching: state.auth.fetching || state.userAgreements.fetching,
+        userAgreements: state.userAgreements.userAgreements,
     };
 }
 
diff --git a/cvat-ui/src/index.tsx b/cvat-ui/src/index.tsx
index e944597111d..e2c39d29b11 100644
--- a/cvat-ui/src/index.tsx
+++ b/cvat-ui/src/index.tsx
@@ -19,6 +19,7 @@ import { getFormatsAsync } from 'actions/formats-actions';
 import { checkPluginsAsync } from 'actions/plugins-actions';
 import { getUsersAsync } from 'actions/users-actions';
 import { getAboutAsync } from 'actions/about-actions';
+import { getUserAgreementsAsync } from 'actions/useragreements-actions';
 import { shortcutsActions } from 'actions/shortcuts-actions';
 import {
     resetErrors,
@@ -44,6 +45,8 @@ interface StateToProps {
     aboutFetching: boolean;
     formatsInitialized: boolean;
     formatsFetching: boolean;
+    userAgreementsInitialized: boolean;
+    userAgreementsFetching: boolean;
     installedAutoAnnotation: boolean;
     installedTFSegmentation: boolean;
     installedTFAnnotation: boolean;
@@ -61,6 +64,7 @@ interface DispatchToProps {
     resetErrors: () => void;
     resetMessages: () => void;
     switchShortcutsDialog: () => void;
+    loadUserAgreements: () => void;
 }
 
 function mapStateToProps(state: CombinedState): StateToProps {
@@ -70,6 +74,7 @@ function mapStateToProps(state: CombinedState): StateToProps {
     const { users } = state;
     const { about } = state;
     const { shortcuts } = state;
+    const { userAgreements } = state;
 
     return {
         userInitialized: auth.initialized,
@@ -82,6 +87,8 @@ function mapStateToProps(state: CombinedState): StateToProps {
         aboutFetching: about.fetching,
         formatsInitialized: formats.initialized,
         formatsFetching: formats.fetching,
+        userAgreementsInitialized: userAgreements.initialized,
+        userAgreementsFetching: userAgreements.fetching,
         installedAutoAnnotation: plugins.list.AUTO_ANNOTATION,
         installedTFSegmentation: plugins.list.TF_SEGMENTATION,
         installedTFAnnotation: plugins.list.TF_ANNOTATION,
@@ -95,6 +102,7 @@ function mapDispatchToProps(dispatch: any): DispatchToProps {
     return {
         loadFormats: (): void => dispatch(getFormatsAsync()),
         verifyAuthorized: (): void => dispatch(authorizedAsync()),
+        loadUserAgreements: (): void => dispatch(getUserAgreementsAsync()),
         initPlugins: (): void => dispatch(checkPluginsAsync()),
         loadUsers: (): void => dispatch(getUsersAsync()),
         loadAbout: (): void => dispatch(getAboutAsync()),
diff --git a/cvat-ui/src/reducers/interfaces.ts b/cvat-ui/src/reducers/interfaces.ts
index 237426bca0d..8c7438e4bc8 100644
--- a/cvat-ui/src/reducers/interfaces.ts
+++ b/cvat-ui/src/reducers/interfaces.ts
@@ -105,6 +105,12 @@ export interface AboutState {
     initialized: boolean;
 }
 
+export interface UserAgreementsState {
+    userAgreements: any[];
+    fetching: boolean;
+    initialized: boolean;
+}
+
 export interface ShareFileInfo { // get this data from cvat-core
     name: string;
     type: 'DIR' | 'REG';
@@ -462,6 +468,7 @@ export interface CombinedState {
     about: AboutState;
     share: ShareState;
     formats: FormatsState;
+    userAgreements: UserAgreementsState;
     plugins: PluginsState;
     models: ModelsState;
     notifications: NotificationsState;
diff --git a/cvat-ui/src/reducers/root-reducer.ts b/cvat-ui/src/reducers/root-reducer.ts
index 337bfbc5345..e726b94e85c 100644
--- a/cvat-ui/src/reducers/root-reducer.ts
+++ b/cvat-ui/src/reducers/root-reducer.ts
@@ -15,6 +15,7 @@ import notificationsReducer from './notifications-reducer';
 import annotationReducer from './annotation-reducer';
 import settingsReducer from './settings-reducer';
 import shortcutsReducer from './shortcuts-reducer';
+import userAgreementsReducer from './useragreements-reducer';
 
 export default function createRootReducer(): Reducer {
     return combineReducers({
@@ -30,5 +31,6 @@ export default function createRootReducer(): Reducer {
         annotation: annotationReducer,
         settings: settingsReducer,
         shortcuts: shortcutsReducer,
+        userAgreements: userAgreementsReducer,
     });
 }
diff --git a/cvat-ui/src/reducers/useragreements-reducer.ts b/cvat-ui/src/reducers/useragreements-reducer.ts
new file mode 100644
index 00000000000..2c0a62d4176
--- /dev/null
+++ b/cvat-ui/src/reducers/useragreements-reducer.ts
@@ -0,0 +1,50 @@
+// Copyright (C) 2020 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+import { boundariesActions, BoundariesActionTypes } from 'actions/boundaries-actions';
+import { UserAgreementsActions, UserAgreementsActionTypes } from 'actions/useragreements-actions';
+import { AuthActions, AuthActionTypes } from 'actions/auth-actions';
+import { UserAgreementsState } from './interfaces';
+
+const defaultState: UserAgreementsState = {
+    userAgreements: [],
+    fetching: false,
+    initialized: false,
+};
+
+export default function (
+    state: UserAgreementsState = defaultState,
+    action: UserAgreementsActions | AuthActions | boundariesActions,
+): UserAgreementsState {
+    switch (action.type) {
+        case UserAgreementsActionTypes.GET_USER_AGREEMENTS: {
+            return {
+                ...state,
+                fetching: true,
+                initialized: false,
+            };
+        }
+        case UserAgreementsActionTypes.GET_USER_AGREEMENTS_SUCCESS:
+            return {
+                ...state,
+                fetching: false,
+                initialized: true,
+                userAgreements: action.payload,
+            };
+        case UserAgreementsActionTypes.GET_USER_AGREEMENTS_FAILED:
+            return {
+                ...state,
+                fetching: false,
+                initialized: true,
+            };
+        case AuthActionTypes.LOGOUT_SUCCESS:
+        case BoundariesActionTypes.RESET_AFTER_ERROR: {
+            return {
+                ...defaultState,
+            };
+        }
+        default:
+            return state;
+    }
+}
diff --git a/cvat/apps/engine/urls.py b/cvat/apps/engine/urls.py
index eef0ab2e047..6c608a00f9e 100644
--- a/cvat/apps/engine/urls.py
+++ b/cvat/apps/engine/urls.py
@@ -9,6 +9,7 @@
 from rest_framework import permissions
 from drf_yasg.views import get_schema_view
 from drf_yasg import openapi
+from cvat.apps.restrictions.views import RestrictionsViewSet
 
 schema_view = get_schema_view(
    openapi.Info(
@@ -30,6 +31,7 @@
 router.register('users', views.UserViewSet)
 router.register('server', views.ServerViewSet, basename='server')
 router.register('plugins', views.PluginViewSet)
+router.register('restrictions', RestrictionsViewSet, basename='restrictions')
 
 urlpatterns = [
     # Entry point for a client
diff --git a/cvat/apps/restrictions/__init__.py b/cvat/apps/restrictions/__init__.py
new file mode 100644
index 00000000000..f19d9bef37a
--- /dev/null
+++ b/cvat/apps/restrictions/__init__.py
@@ -0,0 +1,3 @@
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
diff --git a/cvat/apps/restrictions/admin.py b/cvat/apps/restrictions/admin.py
new file mode 100644
index 00000000000..26819a99a0a
--- /dev/null
+++ b/cvat/apps/restrictions/admin.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+
+from django.contrib import admin
+
+# Register your models here.
diff --git a/cvat/apps/restrictions/apps.py b/cvat/apps/restrictions/apps.py
new file mode 100644
index 00000000000..b9f816a2ae8
--- /dev/null
+++ b/cvat/apps/restrictions/apps.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+
+from django.apps import AppConfig
+
+
+class RestrictionsConfig(AppConfig):
+    name = 'restrictions'
diff --git a/cvat/apps/restrictions/migrations/__init__.py b/cvat/apps/restrictions/migrations/__init__.py
new file mode 100644
index 00000000000..f19d9bef37a
--- /dev/null
+++ b/cvat/apps/restrictions/migrations/__init__.py
@@ -0,0 +1,3 @@
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
diff --git a/cvat/apps/restrictions/models.py b/cvat/apps/restrictions/models.py
new file mode 100644
index 00000000000..738775cb6ea
--- /dev/null
+++ b/cvat/apps/restrictions/models.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+
+from django.db import models
+
+# Create your models here.
diff --git a/cvat/apps/restrictions/restrictions.py b/cvat/apps/restrictions/restrictions.py
new file mode 100644
index 00000000000..f19d9bef37a
--- /dev/null
+++ b/cvat/apps/restrictions/restrictions.py
@@ -0,0 +1,3 @@
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
diff --git a/cvat/apps/restrictions/serializers.py b/cvat/apps/restrictions/serializers.py
new file mode 100644
index 00000000000..efa4d9b5dd4
--- /dev/null
+++ b/cvat/apps/restrictions/serializers.py
@@ -0,0 +1,35 @@
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+
+from rest_framework import serializers
+from django.conf import settings
+
+from cvat.apps.authentication.serializers import RegisterSerializerEx
+
+class UserAgreementSerializer(serializers.Serializer):
+    name = serializers.CharField(max_length=256)
+    display_text = serializers.CharField(max_length=2048, default='')
+    url = serializers.URLField(default='')
+    required = serializers.BooleanField(default=False)
+    value = serializers.BooleanField(default=False)
+
+class RestrictedRegisterSerializer(RegisterSerializerEx):
+    user_agreements = UserAgreementSerializer(many=True, required=False)
+
+    def validate(self, data):
+        validated_data = super().validate(data)
+        server_user_agreements = settings.RESTRICTIONS['user_agreements']
+        for server_agreement in server_user_agreements:
+            if server_agreement['required']:
+                for user_agreement in validated_data['user_agreements']:
+                    if user_agreement['name'] == server_agreement['name'] \
+                        and not user_agreement['value']:
+                        raise serializers.ValidationError(
+                            'Agreement {} must be accepted'.format(server_agreement['display_text'])
+                        )
+
+        return validated_data
+
+
diff --git a/cvat/apps/restrictions/tests.py b/cvat/apps/restrictions/tests.py
new file mode 100644
index 00000000000..cc86fe2d48c
--- /dev/null
+++ b/cvat/apps/restrictions/tests.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/cvat/apps/restrictions/urls.py b/cvat/apps/restrictions/urls.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/cvat/apps/restrictions/views.py b/cvat/apps/restrictions/views.py
new file mode 100644
index 00000000000..78c9874274b
--- /dev/null
+++ b/cvat/apps/restrictions/views.py
@@ -0,0 +1,41 @@
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+from django.conf import settings
+from rest_framework.response import Response
+from rest_framework.decorators import action
+from rest_framework import viewsets
+from rest_framework.permissions import AllowAny
+
+
+from cvat.apps.restrictions.serializers import UserAgreementSerializer
+
+class RestrictionsViewSet(viewsets.ViewSet):
+    serializer_class = None
+    permission_classes_by_action = {
+        'user_agreements': [AllowAny],
+    }
+
+    # To get nice documentation about ServerViewSet actions it is necessary
+    # to implement the method. By default, ViewSet doesn't provide it.
+    def get_serializer(self, *args, **kwargs):
+        pass
+
+    def get_permissions(self):
+        try:
+            return [permission() for permission in self.permission_classes_by_action[self.action]]
+        except KeyError:
+            return [permission() for permission in self.permission_classes]
+
+    @staticmethod
+    @swagger_auto_schema(
+        method='get',
+        operation_summary='Method provides user agreements that the user must accept to register',
+        responses={'200': UserAgreementSerializer})
+    @action(detail=False, methods=['GET'], serializer_class=UserAgreementSerializer)
+    def user_agreements(request):
+        user_agreements = settings.RESTRICTIONS['user_agreements']
+        serializer = UserAgreementSerializer(data=user_agreements, many=True)
+        serializer.is_valid(raise_exception=True)
+        return Response(data=serializer.data)
diff --git a/cvat/settings/base.py b/cvat/settings/base.py
index 6bf38049e8c..3042f051151 100644
--- a/cvat/settings/base.py
+++ b/cvat/settings/base.py
@@ -151,7 +151,7 @@ def generate_ssh_keys():
 }
 
 REST_AUTH_REGISTER_SERIALIZERS = {
-    'REGISTER_SERIALIZER': 'cvat.apps.authentication.serializers.RegisterSerializerEx'
+    'REGISTER_SERIALIZER': 'cvat.apps.restrictions.serializers.RestrictedRegisterSerializer'
 }
 
 if 'yes' == os.environ.get('TF_ANNOTATION', 'no'):
@@ -417,4 +417,8 @@ def generate_ssh_keys():
 LOCAL_LOAD_MAX_FILES_SIZE = 512 * 1024 * 1024  # 512 MB
 
 DATUMARO_PATH = os.path.join(BASE_DIR, 'datumaro')
-sys.path.append(DATUMARO_PATH)
\ No newline at end of file
+sys.path.append(DATUMARO_PATH)
+
+RESTRICTIONS = {
+    "user_agreements": [],
+}

From 5490f06f59a805d69b3cc283677d1bc8ad7089aa Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Thu, 23 Apr 2020 19:48:16 +0300
Subject: [PATCH 02/11] fix

---
 cvat/apps/restrictions/restrictions.py | 3 ---
 cvat/apps/restrictions/views.py        | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 cvat/apps/restrictions/restrictions.py

diff --git a/cvat/apps/restrictions/restrictions.py b/cvat/apps/restrictions/restrictions.py
deleted file mode 100644
index f19d9bef37a..00000000000
--- a/cvat/apps/restrictions/restrictions.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2020 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
diff --git a/cvat/apps/restrictions/views.py b/cvat/apps/restrictions/views.py
index 78c9874274b..7746ee3a3c4 100644
--- a/cvat/apps/restrictions/views.py
+++ b/cvat/apps/restrictions/views.py
@@ -7,7 +7,7 @@
 from rest_framework.decorators import action
 from rest_framework import viewsets
 from rest_framework.permissions import AllowAny
-
+from drf_yasg.utils import swagger_auto_schema
 
 from cvat.apps.restrictions.serializers import UserAgreementSerializer
 

From 3e1748f1a169155fd9ca95a4b07086fad75815ae Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Thu, 7 May 2020 19:02:09 +0300
Subject: [PATCH 03/11] Added cvat terms of use Added unittests Added task
 limits Added option to reduce task visibility Fixed comments

---
 cvat-core/src/api-implementation.js           |   4 +-
 cvat-core/src/api.js                          |   4 +-
 cvat-core/src/server-proxy.js                 |   4 +-
 cvat-ui/src/actions/auth-actions.ts           |   6 +-
 cvat-ui/src/actions/useragreements-actions.ts |   5 +-
 .../register-page/register-form.tsx           |  22 ++--
 .../register-page/register-page.tsx           |   9 +-
 .../register-page/register-page.tsx           |  10 +-
 cvat-ui/src/reducers/interfaces.ts            |   9 +-
 .../src/reducers/useragreements-reducer.ts    |   4 +-
 cvat/apps/authentication/auth.py              |  14 ++-
 cvat/apps/engine/views.py                     |  10 +-
 cvat/apps/restrictions/admin.py               |   8 --
 cvat/apps/restrictions/apps.py                |   2 +-
 cvat/apps/restrictions/models.py              |   8 --
 cvat/apps/restrictions/serializers.py         |  26 +++--
 .../templates/restrictions/terms_of_use.html  |  19 ++++
 cvat/apps/restrictions/tests.py               | 105 +++++++++++++++++-
 cvat/apps/restrictions/views.py               |  17 ++-
 cvat/settings/base.py                         |   7 ++
 20 files changed, 217 insertions(+), 76 deletions(-)
 delete mode 100644 cvat/apps/restrictions/admin.py
 delete mode 100644 cvat/apps/restrictions/models.py
 create mode 100644 cvat/apps/restrictions/templates/restrictions/terms_of_use.html

diff --git a/cvat-core/src/api-implementation.js b/cvat-core/src/api-implementation.js
index cc5435bdb4e..a05efd1682e 100644
--- a/cvat-core/src/api-implementation.js
+++ b/cvat-core/src/api-implementation.js
@@ -80,9 +80,9 @@
         };
 
         cvat.server.register.implementation = async (username, firstName, lastName,
-            email, password1, password2, userAgreements) => {
+            email, password1, password2, userConfirmations) => {
             await serverProxy.server.register(username, firstName, lastName, email,
-                password1, password2, userAgreements);
+                password1, password2, userConfirmations);
         };
 
         cvat.server.login.implementation = async (username, password) => {
diff --git a/cvat-core/src/api.js b/cvat-core/src/api.js
index d8cffbee1ce..2419c6ef756 100644
--- a/cvat-core/src/api.js
+++ b/cvat-core/src/api.js
@@ -160,10 +160,10 @@ function build() {
                 * @throws {module:API.cvat.exceptions.PluginError}
                 * @throws {module:API.cvat.exceptions.ServerError}
             */
-            async register(username, firstName, lastName, email, password1, password2, userAgreements) {
+            async register(username, firstName, lastName, email, password1, password2, userConfirmations) {
                 const result = await PluginRegistry
                     .apiWrapper(cvat.server.register, username, firstName,
-                        lastName, email, password1, password2, userAgreements);
+                        lastName, email, password1, password2, userConfirmations);
                 return result;
             },
             /**
diff --git a/cvat-core/src/server-proxy.js b/cvat-core/src/server-proxy.js
index ea8ec3957a2..97139a0ee5d 100644
--- a/cvat-core/src/server-proxy.js
+++ b/cvat-core/src/server-proxy.js
@@ -185,7 +185,7 @@
                 return response.data;
             }
 
-            async function register(username, firstName, lastName, email, password1, password2, userAgreements) {
+            async function register(username, firstName, lastName, email, password1, password2, confirmations) {
                 let response = null;
                 try {
                     const data = JSON.stringify({
@@ -195,7 +195,7 @@
                         email,
                         password1,
                         password2,
-                        user_agreements: userAgreements,
+                        confirmations,
                     });
                     response = await Axios.post(`${config.backendAPI}/auth/register`, data, {
                         proxy: config.proxy,
diff --git a/cvat-ui/src/actions/auth-actions.ts b/cvat-ui/src/actions/auth-actions.ts
index a3437a6ba43..ed6ecd30d72 100644
--- a/cvat-ui/src/actions/auth-actions.ts
+++ b/cvat-ui/src/actions/auth-actions.ts
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import { UserAgreement } from 'components/register-page/register-form';
+import { UserConfirmation } from 'components/register-page/register-form';
 import getCore from 'cvat-core-wrapper';
 
 const cvat = getCore();
@@ -45,14 +45,14 @@ export const registerAsync = (
     email: string,
     password1: string,
     password2: string,
-    userAgreements: UserAgreement[],
+    confirmations: UserConfirmation[],
 ): ThunkAction => async (
     dispatch,
 ) => {
     dispatch(authActions.register());
 
     try {
-        await cvat.server.register(username, firstName, lastName, email, password1, password2, userAgreements);
+        await cvat.server.register(username, firstName, lastName, email, password1, password2, confirmations);
         const users = await cvat.users.get({ self: true });
 
         dispatch(authActions.registerSuccess(users[0]));
diff --git a/cvat-ui/src/actions/useragreements-actions.ts b/cvat-ui/src/actions/useragreements-actions.ts
index 635298223e9..29645ddbf22 100644
--- a/cvat-ui/src/actions/useragreements-actions.ts
+++ b/cvat-ui/src/actions/useragreements-actions.ts
@@ -4,6 +4,7 @@
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
 import getCore from 'cvat-core-wrapper';
+import { UserAgreement } from 'reducers/interfaces'
 
 const core = getCore();
 
@@ -15,7 +16,7 @@ export enum UserAgreementsActionTypes {
 
 const userAgreementsActions = {
     getUserAgreements: () => createAction(UserAgreementsActionTypes.GET_USER_AGREEMENTS),
-    getUserAgreementsSuccess: (userAgreements: any[]) =>
+    getUserAgreementsSuccess: (userAgreements: UserAgreement[]) =>
         createAction(UserAgreementsActionTypes.GET_USER_AGREEMENTS_SUCCESS, userAgreements),
     getUserAgreementsFailed: (error: any) =>
         createAction(UserAgreementsActionTypes.GET_USER_AGREEMENTS_FAILED, { error }),
@@ -34,4 +35,4 @@ export const getUserAgreementsAsync = (): ThunkAction => async (dispatch): Promi
     } catch (error) {
         dispatch(userAgreementsActions.getUserAgreementsFailed(error));
     }
-};
\ No newline at end of file
+};
diff --git a/cvat-ui/src/components/register-page/register-form.tsx b/cvat-ui/src/components/register-page/register-form.tsx
index da7deafb37a..813b7bbcaee 100644
--- a/cvat-ui/src/components/register-page/register-form.tsx
+++ b/cvat-ui/src/components/register-page/register-form.tsx
@@ -11,7 +11,9 @@ import Checkbox from 'antd/lib/checkbox';
 
 import patterns from 'utils/validation-patterns';
 
-export interface UserAgreement {
+import { UserAgreement } from 'reducers/interfaces'
+
+export interface UserConfirmation {
     name: string;
     value: boolean;
 }
@@ -23,12 +25,12 @@ export interface RegisterData {
     email: string;
     password1: string;
     password2: string;
-    userAgreements: UserAgreement[];
+    confirmations: UserConfirmation[];
 }
 
 type RegisterFormProps = {
     fetching: boolean;
-    userAgreements: any[],
+    userAgreements: UserAgreement[],
     onSubmit(registerData: RegisterData): void;
 } & FormComponentProps;
 
@@ -85,7 +87,7 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
             if (agreement.field === userAgreement.name
                 && userAgreement.required && !value) {
                 isValid = false;
-                callback(`You must accept the ${userAgreement.display_text}!`);
+                callback(`You must accept the ${userAgreement.displayText} to continue!`);
                 break;
             }
         }
@@ -104,11 +106,11 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
 
         form.validateFields((error, values): void => {
             if (!error) {
-                values.userAgreements = []
+                values.confirmations = []
                 
                 for (const userAgreement of userAgreements) {
                     
-                    values.userAgreements.push({
+                    values.confirmations.push({
                         name: userAgreement.name,
                         value: values[userAgreement.name]
                     });
@@ -258,19 +260,19 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
             for (const userAgreement of userAgreements) {
                 agreementsList.push(
                     <Form.Item key={userAgreement.name}>
-                        {form.getFieldDecorator(userAgreement.name as string, {
+                        {form.getFieldDecorator(userAgreement.name, {
                             initialValue: false,
                             valuePropName: 'checked',
                             rules: [{
                                 required: true,
-                                message: 'You must accept!',
+                                message: 'You must accept to continue!',
                             }, {
                                 validator: this.validateAgrement,
                             }]
                         })(
                             <Checkbox>
-                                I accept the <a rel='noopener noreferrer' target='_blank'
-                                     href={ userAgreement.url }>{ userAgreement.display_text }</a>
+                                I read and accept the <a rel='noopener noreferrer' target='_blank'
+                                     href={ userAgreement.url }>{ userAgreement.displayText }</a>
                             </Checkbox>
                         )}
                     </Form.Item>
diff --git a/cvat-ui/src/components/register-page/register-page.tsx b/cvat-ui/src/components/register-page/register-page.tsx
index 3a1f7948579..7e9fba4ab0e 100644
--- a/cvat-ui/src/components/register-page/register-page.tsx
+++ b/cvat-ui/src/components/register-page/register-page.tsx
@@ -9,15 +9,16 @@ import Title from 'antd/lib/typography/Title';
 import Text from 'antd/lib/typography/Text';
 import { Row, Col } from 'antd/lib/grid';
 
-import RegisterForm, { RegisterData, UserAgreement } from './register-form';
+import { UserAgreement } from 'reducers/interfaces'
+import RegisterForm, { RegisterData, UserConfirmation } from './register-form';
 
 interface RegisterPageComponentProps {
     fetching: boolean;
-    userAgreements: any[];
+    userAgreements: UserAgreement[];
     onRegister: (username: string, firstName: string,
         lastName: string, email: string,
         password1: string, password2: string,
-        userAgreements: UserAgreement[]) => void;
+        confirmations: UserConfirmation[]) => void;
 }
 
 function RegisterPageComponent(
@@ -52,7 +53,7 @@ function RegisterPageComponent(
                             registerData.email,
                             registerData.password1,
                             registerData.password2,
-                            registerData.userAgreements,
+                            registerData.confirmations,
                         );
                     }}
                 />
diff --git a/cvat-ui/src/containers/register-page/register-page.tsx b/cvat-ui/src/containers/register-page/register-page.tsx
index f75801e7b5e..1f974fe7041 100644
--- a/cvat-ui/src/containers/register-page/register-page.tsx
+++ b/cvat-ui/src/containers/register-page/register-page.tsx
@@ -6,12 +6,12 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { registerAsync } from 'actions/auth-actions';
 import RegisterPageComponent from 'components/register-page/register-page';
-import { UserAgreement } from 'components/register-page/register-form'
-import { CombinedState } from 'reducers/interfaces';
+import { UserConfirmation } from 'components/register-page/register-form'
+import { CombinedState, UserAgreement } from 'reducers/interfaces';
 
 interface StateToProps {
     fetching: boolean;
-    userAgreements: any[];
+    userAgreements: UserAgreement[];
     
 }
 
@@ -19,13 +19,13 @@ interface DispatchToProps {
     onRegister: (username: string, firstName: string,
         lastName: string, email: string,
         password1: string, password2: string,
-        userAgreement: UserAgreement[]) => void;
+        userAgreement: UserConfirmation[]) => void;
 }
 
 function mapStateToProps(state: CombinedState): StateToProps {
     return {
         fetching: state.auth.fetching || state.userAgreements.fetching,
-        userAgreements: state.userAgreements.userAgreements,
+        userAgreements: state.userAgreements.list,
     };
 }
 
diff --git a/cvat-ui/src/reducers/interfaces.ts b/cvat-ui/src/reducers/interfaces.ts
index 61f0a217d9d..0006378a2d1 100644
--- a/cvat-ui/src/reducers/interfaces.ts
+++ b/cvat-ui/src/reducers/interfaces.ts
@@ -105,8 +105,15 @@ export interface AboutState {
     initialized: boolean;
 }
 
+export interface UserAgreement {
+    name: string;
+    displayText: string;
+    url: string;
+    required: boolean;
+}
+
 export interface UserAgreementsState {
-    userAgreements: any[];
+    list: UserAgreement[];
     fetching: boolean;
     initialized: boolean;
 }
diff --git a/cvat-ui/src/reducers/useragreements-reducer.ts b/cvat-ui/src/reducers/useragreements-reducer.ts
index 2c0a62d4176..c8e686ab6b6 100644
--- a/cvat-ui/src/reducers/useragreements-reducer.ts
+++ b/cvat-ui/src/reducers/useragreements-reducer.ts
@@ -8,7 +8,7 @@ import { AuthActions, AuthActionTypes } from 'actions/auth-actions';
 import { UserAgreementsState } from './interfaces';
 
 const defaultState: UserAgreementsState = {
-    userAgreements: [],
+    list: [],
     fetching: false,
     initialized: false,
 };
@@ -30,7 +30,7 @@ export default function (
                 ...state,
                 fetching: false,
                 initialized: true,
-                userAgreements: action.payload,
+                list: action.payload,
             };
         case UserAgreementsActionTypes.GET_USER_AGREEMENTS_FAILED:
             return {
diff --git a/cvat/apps/authentication/auth.py b/cvat/apps/authentication/auth.py
index 539707bbeca..45f3815d262 100644
--- a/cvat/apps/authentication/auth.py
+++ b/cvat/apps/authentication/auth.py
@@ -115,8 +115,8 @@ def is_job_owner(db_user, db_job):
 def is_job_annotator(db_user, db_job):
     db_task = db_job.segment.task
     # A job can be annotated by any user if the task's assignee is None.
-    has_rights = db_task.assignee is None or is_task_assignee(db_user, db_task)
-    if db_job.assignee is not None:
+    has_rights = (db_task.assignee is None and not settings.RESTRICTIONS['reduce_task_visibility']) or is_task_assignee(db_user, db_task)
+    if db_job.assignee is not None and not settings.RESTRICTIONS['reduce_task_visibility']:
         has_rights |= (db_user == db_job.assignee)
 
     return has_rights
@@ -213,9 +213,13 @@ def filter_task_queryset(queryset, user):
     # Don't filter queryset for admin, observer
     if has_admin_role(user) or has_observer_role(user):
         return queryset
-    else:
-        return queryset.filter(Q(owner=user) | Q(assignee=user) |
-            Q(segment__job__assignee=user) | Q(assignee=None)).distinct()
+    
+    query_filter = Q(owner=user) | Q(assignee=user) | \
+        Q(segment__job__assignee=user) 
+    if not settings.RESTRICTIONS['reduce_task_visibility']:
+        query_filter |= Q(assignee=None)
+
+    return queryset.filter(query_filter).distinct()
 
 class TaskGetQuerySetMixin(object):
     def get_queryset(self):
diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py
index f1ac8e404c4..31d61d43553 100644
--- a/cvat/apps/engine/views.py
+++ b/cvat/apps/engine/views.py
@@ -367,9 +367,17 @@ def get_permissions(self):
         return [perm() for perm in permissions]
 
     def perform_create(self, serializer):
-        if self.request.data.get('owner', None):
+        def validate_task_limit(owner):
+            if settings.RESTRICTIONS['task_limit'] is not None and \
+                Task.objects.filter(owner=owner).count() >= settings.RESTRICTIONS['task_limit']:
+                raise serializers.ValidationError('The user has the maximum number of tasks')
+
+        owner = self.request.data.get('owner', None)
+        if owner:
+            validate_task_limit(owner)
             serializer.save()
         else:
+            validate_task_limit(self.request.user)
             serializer.save(owner=self.request.user)
 
     def perform_destroy(self, instance):
diff --git a/cvat/apps/restrictions/admin.py b/cvat/apps/restrictions/admin.py
deleted file mode 100644
index 26819a99a0a..00000000000
--- a/cvat/apps/restrictions/admin.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2020 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-
-
-from django.contrib import admin
-
-# Register your models here.
diff --git a/cvat/apps/restrictions/apps.py b/cvat/apps/restrictions/apps.py
index b9f816a2ae8..3cb9fec49b3 100644
--- a/cvat/apps/restrictions/apps.py
+++ b/cvat/apps/restrictions/apps.py
@@ -7,4 +7,4 @@
 
 
 class RestrictionsConfig(AppConfig):
-    name = 'restrictions'
+    name = 'cvat.apps.restrictions'
diff --git a/cvat/apps/restrictions/models.py b/cvat/apps/restrictions/models.py
deleted file mode 100644
index 738775cb6ea..00000000000
--- a/cvat/apps/restrictions/models.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2020 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-
-
-from django.db import models
-
-# Create your models here.
diff --git a/cvat/apps/restrictions/serializers.py b/cvat/apps/restrictions/serializers.py
index efa4d9b5dd4..988c4f31485 100644
--- a/cvat/apps/restrictions/serializers.py
+++ b/cvat/apps/restrictions/serializers.py
@@ -15,21 +15,29 @@ class UserAgreementSerializer(serializers.Serializer):
     required = serializers.BooleanField(default=False)
     value = serializers.BooleanField(default=False)
 
+    # pylint: disable=no-self-use
+    def to_representation(self, instance):
+        instance_ = instance.copy()
+        instance_['displayText'] = instance_.pop('display_text')
+        return instance_
+
 class RestrictedRegisterSerializer(RegisterSerializerEx):
-    user_agreements = UserAgreementSerializer(many=True, required=False)
+    confirmations = UserAgreementSerializer(many=True, required=False)
 
     def validate(self, data):
         validated_data = super().validate(data)
         server_user_agreements = settings.RESTRICTIONS['user_agreements']
         for server_agreement in server_user_agreements:
             if server_agreement['required']:
-                for user_agreement in validated_data['user_agreements']:
-                    if user_agreement['name'] == server_agreement['name'] \
-                        and not user_agreement['value']:
-                        raise serializers.ValidationError(
-                            'Agreement {} must be accepted'.format(server_agreement['display_text'])
-                        )
-
-        return validated_data
+                is_confirmed = False
+                for confirmation in validated_data['confirmations']:
+                    if confirmation['name'] == server_agreement['name'] \
+                        and confirmation['value']:
+                        is_confirmed = True
 
+                if not is_confirmed:
+                    raise serializers.ValidationError(
+                        'Agreement {} must be accepted'.format(server_agreement['name'])
+                    )
 
+        return validated_data
diff --git a/cvat/apps/restrictions/templates/restrictions/terms_of_use.html b/cvat/apps/restrictions/templates/restrictions/terms_of_use.html
new file mode 100644
index 00000000000..63bf28c5622
--- /dev/null
+++ b/cvat/apps/restrictions/templates/restrictions/terms_of_use.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+    <body>
+        <h1>CVAT terms of use</h1>
+        <p>
+            PLEASE READ THE FOLLOWING TERMS CAREFULLY. IF YOU CLICK TO ACCEPT THIS AGREEMENT, DOWNLOAD,
+            OR INSTALL THE CVAT SOFTWARE, YOU ARE AGREEING TO BE LEGALLY BOUND BY THIS AGREEMENT
+            IN ADDITION TO ANY OTHER TERMS PROVIDED. IF YOU DO NOT AGREE TO THESE TERMS, DO NOT USE
+            THE CVAT SOFTWARE AND DESTROY ALL COPIES IN YOUR POSSESSION.
+        </p>
+        <p>
+            You understand and acknowledge that you are responsible for your use of the CVAT Software
+            and any content which you may alter with use of the CVAT Software.
+        </p>
+        <p>
+            You further understand and acknowledge that any content you may elect to use  may be subject to privacy,
+            data and intellectual property rights and that you are responsible to your compliance with such laws and regulations.
+        </p>
+    </body>
+</html>
\ No newline at end of file
diff --git a/cvat/apps/restrictions/tests.py b/cvat/apps/restrictions/tests.py
index cc86fe2d48c..df5d45322d0 100644
--- a/cvat/apps/restrictions/tests.py
+++ b/cvat/apps/restrictions/tests.py
@@ -3,6 +3,107 @@
 # SPDX-License-Identifier: MIT
 
 
-from django.test import TestCase
+from rest_framework.test import APITestCase, APIClient
+from rest_framework import status
+from django.conf import settings
 
-# Create your tests here.
+
+class UserAgreementsTest(APITestCase):
+    def setUp(self):
+        self.client = APIClient()
+        self.user_agreements = settings.RESTRICTIONS['user_agreements']
+        settings.RESTRICTIONS['user_agreements'] = [
+            {
+                'name': 'agreement_1',
+                'display_text': 'some display text 1',
+                'url': 'https://example.com',
+                'required': True,
+            },
+            {
+                'name': 'agreement_2',
+                'display_text': 'some display text 2',
+                'url': 'https://example2.com',
+                'required': True,
+            },
+            {
+                'name': 'agreement_3',
+                'display_text': 'some display text 3',
+                'url': 'https://example3.com',
+                'required': False,
+            },
+        ]
+
+    def tearDown(self):
+        settings.RESTRICTIONS['user_agreements'] = self.user_agreements
+
+    def _get_user_agreements(self):
+        response = self.client.get('/api/v1/restrictions/user_agreements')
+        assert response.status_code == status.HTTP_200_OK
+        for agreements in response.data:
+            assert 'name' in agreements, agreements['name']
+            assert 'displayText' in agreements
+            assert 'required' in agreements
+        return response.data
+
+    def _register_user(self, data):
+        response = self.client.post('/api/v1/auth/register', data=data, format="json")
+        return response
+
+
+    def test_user_agreements(self):
+        self._get_user_agreements()
+
+    def test_register_user_with_required_confirmations(self):
+        agreements = self._get_user_agreements()
+        data = {
+            'username': 'some_username1',
+            'first_name': 'some first name 1',
+            'last_name': 'some last name 1',
+            'email': 'user1@example.com',
+            'password1': 'FnvL4YdF24NAmnQ8',
+            'password2': 'FnvL4YdF24NAmnQ8',
+            'confirmations':[],
+        }
+        for agreement in agreements:
+            if agreement['required']:
+                data['confirmations'].append({
+                    'name': agreement['name'],
+                    'value': True,
+                })
+        response = self._register_user(data)
+        assert response.status_code == status.HTTP_201_CREATED
+
+    def test_register_user_without_confirmations(self):
+        data = {
+            'username': 'some_username2',
+            'first_name': 'some first name 2',
+            'last_name': 'some last name 2',
+            'email': 'user2@example.com',
+            'password1': 'FnvL4YdF24NAmnQ8',
+            'password2': 'FnvL4YdF24NAmnQ8',
+            'confirmations':[],
+        }
+
+        response = self._register_user(data)
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+
+    def test_register_user_with_all_confirmations(self):
+        agreements = self._get_user_agreements()
+        data = {
+            'username': 'some_username3',
+            'first_name': 'some first name 3',
+            'last_name': 'some last name 3',
+            'email': 'user3@example.com',
+            'password1': 'FnvL4YdF24NAmnQ8',
+            'password2': 'FnvL4YdF24NAmnQ8',
+            'confirmations':[],
+        }
+
+        for agreement in agreements:
+            data['confirmations'].append({
+                'name': agreement['name'],
+                'value': True,
+            })
+
+        response = self._register_user(data)
+        assert response.status_code == status.HTTP_201_CREATED
diff --git a/cvat/apps/restrictions/views.py b/cvat/apps/restrictions/views.py
index 7746ee3a3c4..e2a81b0463d 100644
--- a/cvat/apps/restrictions/views.py
+++ b/cvat/apps/restrictions/views.py
@@ -7,27 +7,21 @@
 from rest_framework.decorators import action
 from rest_framework import viewsets
 from rest_framework.permissions import AllowAny
+from rest_framework.renderers import TemplateHTMLRenderer
 from drf_yasg.utils import swagger_auto_schema
 
 from cvat.apps.restrictions.serializers import UserAgreementSerializer
 
 class RestrictionsViewSet(viewsets.ViewSet):
     serializer_class = None
-    permission_classes_by_action = {
-        'user_agreements': [AllowAny],
-    }
+    permission_classes = [AllowAny]
+    authentication_classes = []
 
     # To get nice documentation about ServerViewSet actions it is necessary
     # to implement the method. By default, ViewSet doesn't provide it.
     def get_serializer(self, *args, **kwargs):
         pass
 
-    def get_permissions(self):
-        try:
-            return [permission() for permission in self.permission_classes_by_action[self.action]]
-        except KeyError:
-            return [permission() for permission in self.permission_classes]
-
     @staticmethod
     @swagger_auto_schema(
         method='get',
@@ -39,3 +33,8 @@ def user_agreements(request):
         serializer = UserAgreementSerializer(data=user_agreements, many=True)
         serializer.is_valid(raise_exception=True)
         return Response(data=serializer.data)
+
+    @staticmethod
+    @action(detail=False, methods=['GET'], renderer_classes=(TemplateHTMLRenderer,))
+    def terms_of_use(request):
+        return Response(template_name='restrictions/terms_of_use.html')
diff --git a/cvat/settings/base.py b/cvat/settings/base.py
index 3042f051151..e0a9c3e1b79 100644
--- a/cvat/settings/base.py
+++ b/cvat/settings/base.py
@@ -99,6 +99,7 @@ def generate_ssh_keys():
     'cvat.apps.git',
     'cvat.apps.dataset_manager',
     'cvat.apps.annotation',
+    'cvat.apps.restrictions',
     'django_rq',
     'compressor',
     'cacheops',
@@ -421,4 +422,10 @@ def generate_ssh_keys():
 
 RESTRICTIONS = {
     "user_agreements": [],
+
+    # this setting limits the number of tasks for the user
+    "task_limit": None,
+
+    # this settings reduse task visibility to owner and assignee only
+    "reduce_task_visibility": False,
 }

From da08d73310fbddd1b3492e684c4776f011e76053 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Fri, 8 May 2020 13:36:57 +0300
Subject: [PATCH 04/11] allow the admin to create unlimited number of tasks

---
 cvat/apps/authentication/auth.py | 4 ++--
 cvat/apps/engine/views.py        | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cvat/apps/authentication/auth.py b/cvat/apps/authentication/auth.py
index 45f3815d262..d67ac1d05c8 100644
--- a/cvat/apps/authentication/auth.py
+++ b/cvat/apps/authentication/auth.py
@@ -213,9 +213,9 @@ def filter_task_queryset(queryset, user):
     # Don't filter queryset for admin, observer
     if has_admin_role(user) or has_observer_role(user):
         return queryset
-    
+
     query_filter = Q(owner=user) | Q(assignee=user) | \
-        Q(segment__job__assignee=user) 
+        Q(segment__job__assignee=user)
     if not settings.RESTRICTIONS['reduce_task_visibility']:
         query_filter |= Q(assignee=None)
 
diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py
index 31d61d43553..49306bca5fd 100644
--- a/cvat/apps/engine/views.py
+++ b/cvat/apps/engine/views.py
@@ -368,7 +368,9 @@ def get_permissions(self):
 
     def perform_create(self, serializer):
         def validate_task_limit(owner):
-            if settings.RESTRICTIONS['task_limit'] is not None and \
+            admin_perm = auth.AdminRolePermission()
+            is_admin = admin_perm.has_permission(self.request, self)
+            if not is_admin and settings.RESTRICTIONS['task_limit'] is not None and \
                 Task.objects.filter(owner=owner).count() >= settings.RESTRICTIONS['task_limit']:
                 raise serializers.ValidationError('The user has the maximum number of tasks')
 

From 5f2dcbd6d7665f2a52b9b51876ab0de1d7eff266 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Tue, 12 May 2020 12:04:36 +0300
Subject: [PATCH 05/11] allow to specify default group for the new user

---
 cvat/apps/authentication/auth_basic.py | 10 ++++++++++
 cvat/settings/base.py                  |  1 +
 2 files changed, 11 insertions(+)

diff --git a/cvat/apps/authentication/auth_basic.py b/cvat/apps/authentication/auth_basic.py
index 936628e7fe8..3edece2e46c 100644
--- a/cvat/apps/authentication/auth_basic.py
+++ b/cvat/apps/authentication/auth_basic.py
@@ -3,6 +3,13 @@
 # SPDX-License-Identifier: MIT
 from . import AUTH_ROLE
 from django.conf import settings
+from importlib import import_module
+
+def _import_role(role):
+    assert isinstance(role, str)
+    package, role_name = role.rsplit('.AUTH_ROLE.', 1)
+    module = getattr(import_module(package), 'AUTH_ROLE')
+    return getattr(module, role_name)
 
 def create_user(sender, instance, created, **kwargs):
     from django.contrib.auth.models import Group
@@ -10,3 +17,6 @@ def create_user(sender, instance, created, **kwargs):
     if instance.is_superuser and instance.is_staff:
         db_group = Group.objects.get(name=AUTH_ROLE.ADMIN)
         instance.groups.add(db_group)
+    for group in settings.DJANGO_AUTH_DEFAULT_GROUPS:
+        db_group = Group.objects.get(name=_import_role(group))
+        instance.groups.add(db_group)
\ No newline at end of file
diff --git a/cvat/settings/base.py b/cvat/settings/base.py
index e0a9c3e1b79..66f3ec1fd49 100644
--- a/cvat/settings/base.py
+++ b/cvat/settings/base.py
@@ -230,6 +230,7 @@ def generate_ssh_keys():
 
 # Django Auth
 DJANGO_AUTH_TYPE = 'BASIC'
+DJANGO_AUTH_DEFAULT_GROUPS = []
 LOGIN_URL = 'login'
 LOGIN_REDIRECT_URL = '/'
 AUTH_LOGIN_NOTE = '<p>Have not registered yet? <a href="/auth/register">Register here</a>.</p>'

From 2213cc1fe7e867a09d56bf6642487724b21f2847 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <41117609+azhavoro@users.noreply.github.com>
Date: Wed, 13 May 2020 10:01:23 +0300
Subject: [PATCH 06/11] Update serializers.py

---
 cvat/apps/restrictions/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cvat/apps/restrictions/serializers.py b/cvat/apps/restrictions/serializers.py
index 988c4f31485..d9f15ae9b5b 100644
--- a/cvat/apps/restrictions/serializers.py
+++ b/cvat/apps/restrictions/serializers.py
@@ -11,7 +11,7 @@
 class UserAgreementSerializer(serializers.Serializer):
     name = serializers.CharField(max_length=256)
     display_text = serializers.CharField(max_length=2048, default='')
-    url = serializers.URLField(default='')
+    url = serializers.CharField(max_length=2048, default='')
     required = serializers.BooleanField(default=False)
     value = serializers.BooleanField(default=False)
 

From ec04597eac4a24fb21a2a5d13cf265954cf36281 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Thu, 14 May 2020 12:22:25 +0300
Subject: [PATCH 07/11] added build arg

---
 Dockerfile.ui | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile.ui b/Dockerfile.ui
index 80fe3c7fd10..c0b04e3d104 100644
--- a/Dockerfile.ui
+++ b/Dockerfile.ui
@@ -4,6 +4,7 @@ ARG http_proxy
 ARG https_proxy
 ARG no_proxy
 ARG socks_proxy
+ARG PUBLIC_INSTANCE
 
 ENV TERM=xterm \
     http_proxy=${http_proxy}   \

From 727ce295873a892fc166786a241ffb851a8c6bb3 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Thu, 14 May 2020 17:20:16 +0300
Subject: [PATCH 08/11] added agreement action to notification-reducer

---
 cvat-core/src/api.js                          |  1 +
 cvat-ui/src/reducers/notifications-reducer.ts | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/cvat-core/src/api.js b/cvat-core/src/api.js
index fba436fc253..0e04c5c8fc6 100644
--- a/cvat-core/src/api.js
+++ b/cvat-core/src/api.js
@@ -144,6 +144,7 @@ function build() {
                 * @param {string} email A email address for the new account
                 * @param {string} password1 A password for the new account
                 * @param {string} password2 The confirmation password for the new account
+                * @param {Object} userConfirmations An user confirmations of terms of use if needed
                 * @throws {module:API.cvat.exceptions.PluginError}
                 * @throws {module:API.cvat.exceptions.ServerError}
             */
diff --git a/cvat-ui/src/reducers/notifications-reducer.ts b/cvat-ui/src/reducers/notifications-reducer.ts
index 43dd38659a2..f089d762518 100644
--- a/cvat-ui/src/reducers/notifications-reducer.ts
+++ b/cvat-ui/src/reducers/notifications-reducer.ts
@@ -14,6 +14,7 @@ import { AboutActionTypes } from 'actions/about-actions';
 import { AnnotationActionTypes } from 'actions/annotation-actions';
 import { NotificationsActionType } from 'actions/notification-actions';
 import { BoundariesActionTypes } from 'actions/boundaries-actions';
+import { UserAgreementsActions, UserAgreementsActionTypes } from 'actions/useragreements-actions';
 
 import { NotificationsState } from './interfaces';
 
@@ -80,6 +81,9 @@ const defaultState: NotificationsState = {
         boundaries: {
             resetError: null,
         },
+        userAgreements: {
+            fetching: null,
+        },
     },
     messages: {
         tasks: {
@@ -801,6 +805,21 @@ export default function (state = defaultState, action: AnyAction): Notifications
                 },
             };
         }
+        case UserAgreementsActionTypes.GET_USER_AGREEMENTS_FAILED: {
+            return {
+                ...state,
+                errors: {
+                    ...state.errors,
+                    formats: {
+                        ...state.errors.formats,
+                        fetching: {
+                            message: 'Could not get user agreements from the server',
+                            reason: action.payload.error.toString(),
+                        },
+                    },
+                },
+            };
+        }
         case NotificationsActionType.RESET_ERRORS: {
             return {
                 ...state,

From e8af6a9fa992a117a11164c9d7b7ff2ef5d5a12b Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Thu, 14 May 2020 17:44:07 +0300
Subject: [PATCH 09/11] fixed error state

---
 cvat-ui/src/reducers/interfaces.ts            | 3 +++
 cvat-ui/src/reducers/notifications-reducer.ts | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cvat-ui/src/reducers/interfaces.ts b/cvat-ui/src/reducers/interfaces.ts
index c06fb915713..6031435975c 100644
--- a/cvat-ui/src/reducers/interfaces.ts
+++ b/cvat-ui/src/reducers/interfaces.ts
@@ -251,6 +251,9 @@ export interface NotificationsState {
         boundaries: {
             resetError: null | ErrorState;
         };
+        userAgreements: {
+            fetching: null | ErrorState;
+        };
 
         [index: string]: any;
     };
diff --git a/cvat-ui/src/reducers/notifications-reducer.ts b/cvat-ui/src/reducers/notifications-reducer.ts
index f089d762518..b3abbab5c90 100644
--- a/cvat-ui/src/reducers/notifications-reducer.ts
+++ b/cvat-ui/src/reducers/notifications-reducer.ts
@@ -810,8 +810,8 @@ export default function (state = defaultState, action: AnyAction): Notifications
                 ...state,
                 errors: {
                     ...state.errors,
-                    formats: {
-                        ...state.errors.formats,
+                    userAgreements: {
+                        ...state.errors.userAgreements,
                         fetching: {
                             message: 'Could not get user agreements from the server',
                             reason: action.payload.error.toString(),

From d7c15fed631d6311aa2240acc976aba4b510d285 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Sun, 17 May 2020 15:57:54 +0300
Subject: [PATCH 10/11] fixed comments

---
 cvat-core/src/server-proxy.js          |  2 +-
 cvat/apps/authentication/auth.py       |  2 +-
 cvat/apps/authentication/auth_basic.py | 13 +++----------
 cvat/apps/restrictions/tests.py        |  2 +-
 cvat/apps/restrictions/views.py        |  5 +++--
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/cvat-core/src/server-proxy.js b/cvat-core/src/server-proxy.js
index b486d21d2ed..5b685114e3a 100644
--- a/cvat-core/src/server-proxy.js
+++ b/cvat-core/src/server-proxy.js
@@ -159,7 +159,7 @@
                 const { backendAPI } = config;
                 let response = null;
                 try {
-                    response = await Axios.get(`${backendAPI}/restrictions/user_agreements`, {
+                    response = await Axios.get(`${backendAPI}/restrictions/user-agreements`, {
                         proxy: config.proxy,
                     });
 
diff --git a/cvat/apps/authentication/auth.py b/cvat/apps/authentication/auth.py
index d67ac1d05c8..349df39b06b 100644
--- a/cvat/apps/authentication/auth.py
+++ b/cvat/apps/authentication/auth.py
@@ -116,7 +116,7 @@ def is_job_annotator(db_user, db_job):
     db_task = db_job.segment.task
     # A job can be annotated by any user if the task's assignee is None.
     has_rights = (db_task.assignee is None and not settings.RESTRICTIONS['reduce_task_visibility']) or is_task_assignee(db_user, db_task)
-    if db_job.assignee is not None and not settings.RESTRICTIONS['reduce_task_visibility']:
+    if db_job.assignee is not None:
         has_rights |= (db_user == db_job.assignee)
 
     return has_rights
diff --git a/cvat/apps/authentication/auth_basic.py b/cvat/apps/authentication/auth_basic.py
index 3edece2e46c..588baf9d3e0 100644
--- a/cvat/apps/authentication/auth_basic.py
+++ b/cvat/apps/authentication/auth_basic.py
@@ -3,13 +3,6 @@
 # SPDX-License-Identifier: MIT
 from . import AUTH_ROLE
 from django.conf import settings
-from importlib import import_module
-
-def _import_role(role):
-    assert isinstance(role, str)
-    package, role_name = role.rsplit('.AUTH_ROLE.', 1)
-    module = getattr(import_module(package), 'AUTH_ROLE')
-    return getattr(module, role_name)
 
 def create_user(sender, instance, created, **kwargs):
     from django.contrib.auth.models import Group
@@ -17,6 +10,6 @@ def create_user(sender, instance, created, **kwargs):
     if instance.is_superuser and instance.is_staff:
         db_group = Group.objects.get(name=AUTH_ROLE.ADMIN)
         instance.groups.add(db_group)
-    for group in settings.DJANGO_AUTH_DEFAULT_GROUPS:
-        db_group = Group.objects.get(name=_import_role(group))
-        instance.groups.add(db_group)
\ No newline at end of file
+    for group_name in settings.DJANGO_AUTH_DEFAULT_GROUPS:
+        db_group = Group.objects.get(name=getattr(AUTH_ROLE, group_name))
+        instance.groups.add(db_group)
diff --git a/cvat/apps/restrictions/tests.py b/cvat/apps/restrictions/tests.py
index df5d45322d0..3b31c8cb1af 100644
--- a/cvat/apps/restrictions/tests.py
+++ b/cvat/apps/restrictions/tests.py
@@ -37,7 +37,7 @@ def tearDown(self):
         settings.RESTRICTIONS['user_agreements'] = self.user_agreements
 
     def _get_user_agreements(self):
-        response = self.client.get('/api/v1/restrictions/user_agreements')
+        response = self.client.get('/api/v1/restrictions/user-agreements')
         assert response.status_code == status.HTTP_200_OK
         for agreements in response.data:
             assert 'name' in agreements, agreements['name']
diff --git a/cvat/apps/restrictions/views.py b/cvat/apps/restrictions/views.py
index e2a81b0463d..46af4917b8a 100644
--- a/cvat/apps/restrictions/views.py
+++ b/cvat/apps/restrictions/views.py
@@ -27,7 +27,7 @@ def get_serializer(self, *args, **kwargs):
         method='get',
         operation_summary='Method provides user agreements that the user must accept to register',
         responses={'200': UserAgreementSerializer})
-    @action(detail=False, methods=['GET'], serializer_class=UserAgreementSerializer)
+    @action(detail=False, methods=['GET'], serializer_class=UserAgreementSerializer, url_path='user-agreements')
     def user_agreements(request):
         user_agreements = settings.RESTRICTIONS['user_agreements']
         serializer = UserAgreementSerializer(data=user_agreements, many=True)
@@ -35,6 +35,7 @@ def user_agreements(request):
         return Response(data=serializer.data)
 
     @staticmethod
-    @action(detail=False, methods=['GET'], renderer_classes=(TemplateHTMLRenderer,))
+    @action(detail=False, methods=['GET'], renderer_classes=(TemplateHTMLRenderer,),
+        url_path='terms-of-use')
     def terms_of_use(request):
         return Response(template_name='restrictions/terms_of_use.html')

From 5cb002277c2218942eca73f1dc4959211e36a139 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey.zhavoronkov@intel.com>
Date: Mon, 18 May 2020 22:49:07 +0300
Subject: [PATCH 11/11] updated changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd171feccfc..ce8cfa1a9ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - cvat-ui: added cookie policy drawer for login page (<https://github.com/opencv/cvat/pull/1511>)
 - Added `datumaro_project` export format (https://github.com/opencv/cvat/pull/1352)
+- Ability to configure user agreements for the user registration form (https://github.com/opencv/cvat/pull/1464)
 
 ### Changed
 - Downloaded file name in annotations export became more informative (https://github.com/opencv/cvat/pull/1352)