Merge branch 'develop' of github.com:tracim/tracim_v2 into feature/automated_setup_and_better_uwsgi_doc

.gitignore

@@ -1,4 +1,8 @@
 .idea/
 frontend/dist/app/
+frontend/dist/tracim.app.entry.js
+frontend/dist/asset/tracim/tracim.vendor.bundle.js
 frontend_app_html-document/dist/html-document.app.js
 frontend_lib/dist/tracim_frontend_lib.js
+npm-debug.log
+package-lock.json

.travis.yml

@@ -3,7 +3,6 @@ matrix:
     - sudo: false
       language: python
       python:
-        - "3.4"
         - "3.5"
         - "3.6"
 

backend/development.ini.sample

@@ -186,6 +186,13 @@ wsgidav.config_path = %(here)s/wsgidav.conf
 ## return error
 # preview.jpg.restricted_dims = True
 
+### Frontend
+frontend.serve = True
+# You can set dist folder of tracim frontend. by default, system
+# will try to get it automatically according to tracim_v2 repository
+# organisation.
+# frontend.dist_folder_path = /home/user/tracim_v2/frontend/dist
+
 ###
 # wsgi server configuration
 ###

backend/doc/roles.md

@@ -7,6 +7,11 @@ The other is workspace related and is called "workspace role".
 
 ## Global profile
 
+|                               | Normal User | Managers    | Admin          |
+|-------------------------------|-------------|-------------|----------------|
+| slug                            | users       | managers    | administrators |
+|-------------------------------|-------------|-------------|---------|
+
 
 |                               | Normal User | Managers    | Admin   |
 |-------------------------------|-------------|-------------|---------|
@@ -22,11 +27,18 @@ The other is workspace related and is called "workspace role".
 | access to all user data (/users/{user_id} endpoints) |personal-only|personal-only| yes     |
 
 
+
+
 ## Workspace Roles
 
 
 |                              | Reader | Contributor | Content Manager | Workspace Manager |
 |------------------------------|--------|-------------|-----------------|-------------------|
+| slug                         | reader | contributor | content-manager |  workspace-manager|
+|------------------------------|--------|-------------|-----------------|-------------------|
+
+|                              | Reader | Contributor | Content Manager | Workspace Manager |
+|------------------------------|--------|-------------|-----------------|-------------------|
 | read content                 |  yes   | yes         | yes             | yes               |
 |------------------------------|--------|-------------|-----------------|-------------------|
 | create content               |  no    | yes         | yes             | yes               |

backend/setup.py

@@ -41,6 +41,9 @@ requires = [
     'lxml',
     'redis',
     'rq',
+    # frontend file serve
+    'pyramid_mako',
+    'spectra',
 ]
 
 tests_require = [

backend/tests_configs.ini

@@ -4,7 +4,7 @@ depot_storage_name = test
 depot_storage_dir = /tmp/test/depot
 user.auth_token.validity = 604800
 preview_cache_dir = /tmp/test/preview_cache
-
+website.base_url = http://localhost:6543
 [app:command_test]
 use = egg:tracim_backend
 sqlalchemy.url = sqlite:///tracim_test.sqlite
@@ -12,6 +12,7 @@ depot_storage_name = test
 depot_storage_dir = /tmp/test/depot
 user.auth_token.validity = 604800
 preview_cache_dir = /tmp/test/preview_cache
+website.base_url = http://localhost:6543
 
 [mail_test]
 sqlalchemy.url = sqlite:///:memory:
@@ -37,6 +38,7 @@ email.notification.smtp.server = 127.0.0.1
 email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password
+website.base_url = http://localhost:6543
 
 [mail_test_async]
 sqlalchemy.url = sqlite:///:memory:
@@ -63,3 +65,74 @@ email.notification.smtp.server = 127.0.0.1
 email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password
+website.base_url = http://localhost:6543
+
+[functional_test]
+sqlalchemy.url = sqlite:///tracim_test.sqlite
+depot_storage_name = test
+depot_storage_dir = /tmp/test/depot
+user.auth_token.validity = 604800
+preview_cache_dir = /tmp/test/preview_cache
+preview.jpg.restricted_dims = True
+email.notification.activated = false
+website.base_url = http://localhost:6543
+
+[functional_test_no_db]
+sqlalchemy.url = sqlite://
+depot_storage_name = test
+depot_storage_dir = /tmp/test/depot
+user.auth_token.validity = 604800
+preview_cache_dir = /tmp/test/preview_cache
+preview.jpg.restricted_dims = True
+email.notification.activated = false
+website.base_url = http://localhost:6543
+
+[functional_test_with_mail_test_sync]
+sqlalchemy.url = sqlite:///tracim_test.sqlite
+depot_storage_name = test
+depot_storage_dir = /tmp/test/depot
+user.auth_token.validity = 604800
+preview_cache_dir = /tmp/test/preview_cache
+preview.jpg.restricted_dims = True
+email.notification.activated = true
+email.notification.from.email = test_user_from+{user_id}@localhost
+email.notification.from.default_label = Tracim Notifications
+email.notification.reply_to.email = test_user_reply+{content_id}@localhost
+email.notification.references.email = test_user_refs+{content_id}@localhost
+email.notification.content_update.template.html = %(here)s/tracim_backend/templates/mail/content_update_body_html.mak
+email.notification.content_update.template.text = %(here)s/tracim_backend/templates/mail/content_update_body_text.mak
+email.notification.created_account.template.html = %(here)s/tracim_backend/templates/mail/created_account_body_html.mak
+email.notification.created_account.template.text = %(here)s/tracim_backend/templates/mail/created_account_body_text.mak
+email.notification.content_update.subject = [{website_title}] [{workspace_label}] {content_label} ({content_status_label})
+email.notification.created_account.subject = [{website_title}] Created account
+email.notification.processing_mode = sync
+email.notification.smtp.server = 127.0.0.1
+email.notification.smtp.port = 1025
+email.notification.smtp.user = test_user
+email.notification.smtp.password = just_a_password
+website.base_url = http://localhost:6543
+
+[functional_test_with_mail_test_async]
+sqlalchemy.url = sqlite:///tracim_test.sqlite
+depot_storage_name = test
+depot_storage_dir = /tmp/test/depot
+user.auth_token.validity = 604800
+preview_cache_dir = /tmp/test/preview_cache
+preview.jpg.restricted_dims = True
+email.notification.activated = true
+email.notification.from.email = test_user_from+{user_id}@localhost
+email.notification.from.default_label = Tracim Notifications
+email.notification.reply_to.email = test_user_reply+{content_id}@localhost
+email.notification.references.email = test_user_refs+{content_id}@localhost
+email.notification.content_update.template.html = %(here)s/tracim_backend/templates/mail/content_update_body_html.mak
+email.notification.content_update.template.text = %(here)s/tracim_backend/templates/mail/content_update_body_text.mak
+email.notification.created_account.template.html = %(here)s/tracim_backend/templates/mail/created_account_body_html.mak
+email.notification.created_account.template.text = %(here)s/tracim_backend/templates/mail/created_account_body_text.mak
+email.notification.content_update.subject = [{website_title}] [{workspace_label}] {content_label} ({content_status_label})
+email.notification.created_account.subject = [{website_title}] Created account
+email.notification.processing_mode = async
+email.notification.smtp.server = 127.0.0.1
+email.notification.smtp.port = 1025
+email.notification.smtp.user = test_user
+email.notification.smtp.password = just_a_password
+website.base_url = http://localhost:6543

backend/tracim_backend/__init__.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-
-
 try:  # Python 3.5+
     from http import HTTPStatus
 except ImportError:
@@ -9,7 +7,6 @@ except ImportError:
 from pyramid.config import Configurator
 from pyramid.authentication import BasicAuthAuthenticationPolicy
 from hapic.ext.pyramid import PyramidContext
-from pyramid.exceptions import NotFound
 from sqlalchemy.exc import OperationalError
 
 from tracim_backend.extensions import hapic
@@ -30,8 +27,10 @@ from tracim_backend.views.core_api.user_controller import UserController
 from tracim_backend.views.core_api.workspace_controller import WorkspaceController
 from tracim_backend.views.contents_api.comment_controller import CommentController
 from tracim_backend.views.contents_api.file_controller import FileController
+from tracim_backend.views.frontend import FrontendController
 from tracim_backend.views.errors import ErrorSchema
 from tracim_backend.exceptions import NotAuthenticated
+from tracim_backend.exceptions import PageNotFound
 from tracim_backend.exceptions import UserNotActive
 from tracim_backend.exceptions import InvalidId
 from tracim_backend.exceptions import InsufficientUserProfile
@@ -86,7 +85,7 @@ def web(global_config, **local_settings):
     hapic.set_context(context)
     # INFO - G.M - 2018-07-04 - global-context exceptions
     # Not found
-    context.handle_exception(NotFound, HTTPStatus.NOT_FOUND)
+    context.handle_exception(PageNotFound, HTTPStatus.NOT_FOUND)
     # Bad request
     context.handle_exception(WorkspaceNotFoundInTracimRequest, HTTPStatus.BAD_REQUEST)  # nopep8
     context.handle_exception(UserNotFoundInTracimRequest, HTTPStatus.BAD_REQUEST)  # nopep8
@@ -106,6 +105,7 @@ def web(global_config, **local_settings):
     context.handle_exception(OperationalError, HTTPStatus.INTERNAL_SERVER_ERROR)
     context.handle_exception(Exception, HTTPStatus.INTERNAL_SERVER_ERROR)
 
+
     # Add controllers
     session_controller = SessionController()
     system_controller = SystemController()
@@ -124,6 +124,11 @@ def web(global_config, **local_settings):
     configurator.include(thread_controller.bind, route_prefix=BASE_API_V2)
     configurator.include(file_controller.bind, route_prefix=BASE_API_V2)
 
+    if app_config.FRONTEND_SERVE:
+        configurator.include('pyramid_mako')
+        frontend_controller = FrontendController(app_config.FRONTEND_DIST_FOLDER_PATH)  # nopep8
+        configurator.include(frontend_controller.bind)
+
     hapic.add_documentation_view(
         '/api/v2/doc',
         'Tracim v2 API',

backend/tracim_backend/config.py

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
 from urllib.parse import urlparse
+
+import os
 from paste.deploy.converters import asbool
 from tracim_backend.lib.utils.logger import logger
 from depot.manager import DepotManager
+from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.models.data import ActionDescription
 
-from tracim_backend.models.data import ActionDescription, ContentType
 
 
 class CFG(object):
@@ -78,6 +81,12 @@ class CFG(object):
             'website.base_url',
             '',
         )
+        if not self.WEBSITE_BASE_URL:
+            raise Exception(
+                'website.base_url is needed in order to have correct path in'
+                'few place like in email.'
+                'You should set it with frontend root url.'
+            )
 
         # TODO - G.M - 26-03-2018 - [Cleanup] These params seems deprecated for tracimv2,  # nopep8
         # Verify this
@@ -145,11 +154,11 @@ class CFG(object):
         ]
 
         self.EMAIL_NOTIFICATION_NOTIFIED_CONTENTS = [
-            ContentType.Page,
-            ContentType.Thread,
-            ContentType.File,
-            ContentType.Comment,
-            # ContentType.Folder -- Folder is skipped
+            CONTENT_TYPES.Page.slug,
+            CONTENT_TYPES.Thread.slug,
+            CONTENT_TYPES.File.slug,
+            CONTENT_TYPES.Comment.slug,
+            # CONTENT_TYPES.Folder.slug -- Folder is skipped
         ]
         if settings.get('email.notification.from'):
             raise Exception(
@@ -160,9 +169,11 @@ class CFG(object):
 
         self.EMAIL_NOTIFICATION_FROM_EMAIL = settings.get(
             'email.notification.from.email',
+            'noreply+{user_id}@trac.im'
         )
         self.EMAIL_NOTIFICATION_FROM_DEFAULT_LABEL = settings.get(
-            'email.notification.from.default_label'
+            'email.notification.from.default_label',
+            'Tracim Notifications'
         )
         self.EMAIL_NOTIFICATION_REPLY_TO_EMAIL = settings.get(
             'email.notification.reply_to.email',
@@ -432,6 +443,29 @@ class CFG(object):
 
         self.PREVIEW_JPG_ALLOWED_DIMS = allowed_dims
 
+        self.FRONTEND_SERVE = asbool(settings.get(
+            'frontend.serve', False
+        ))
+
+        # INFO - G.M - 2018-08-06 - we pretend that frontend_dist_folder
+        # is probably in frontend subfolder
+        # of tracim_v2 parent of both backend and frontend
+        backend_folder = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))  # nopep8
+        tracim_v2_folder = os.path.dirname(backend_folder)
+        frontend_dist_folder = os.path.join(tracim_v2_folder, 'frontend', 'dist')  # nopep8
+
+        self.FRONTEND_DIST_FOLDER_PATH = settings.get(
+            'frontend.dist_folder_path', frontend_dist_folder
+        )
+
+        # INFO - G.M - 2018-08-06 - We check dist folder existence
+        if self.FRONTEND_SERVE and not os.path.isdir(self.FRONTEND_DIST_FOLDER_PATH):  # nopep8
+            raise Exception(
+                'ERROR: {} folder does not exist as folder. '
+                'please set frontend.dist_folder.path'
+                'with a correct value'.format(self.FRONTEND_DIST_FOLDER_PATH)
+            )
+
     def configure_filedepot(self):
         depot_storage_name = self.DEPOT_STORAGE_NAME
         depot_storage_path = self.DEPOT_STORAGE_DIR

backend/tracim_backend/exceptions.py

@@ -203,3 +203,11 @@ class PageOfPreviewNotFound(NotFound):
 
 class PreviewDimNotAllowed(TracimException):
     pass
+
+
+class TooShortAutocompleteString(TracimException):
+    pass
+
+
+class PageNotFound(TracimException):
+    pass

backend/tracim_backend/fixtures/content.py

@@ -8,7 +8,7 @@ from tracim_backend.fixtures.users_and_groups import Test
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.userworkspace import RoleApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.revision_protection import new_revision
 
@@ -91,14 +91,14 @@ class Content(Fixture):
         # Folders
 
         tool_workspace = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=business_workspace,
             label='Tools',
             do_save=True,
             do_notify=False,
         )
         menu_workspace = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=business_workspace,
             label='Menus',
             do_save=True,
@@ -106,21 +106,21 @@ class Content(Fixture):
         )
 
         dessert_folder = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=recipe_workspace,
             label='Desserts',
             do_save=True,
             do_notify=False,
         )
         salads_folder = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=recipe_workspace,
             label='Salads',
             do_save=True,
             do_notify=False,
         )
         other_folder = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=other_workspace,
             label='Infos',
             do_save=True,
@@ -129,7 +129,7 @@ class Content(Fixture):
 
         # Pages, threads, ..
         tiramisu_page = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=recipe_workspace,
             parent=dessert_folder,
             label='Tiramisu Recipes!!!',
@@ -149,7 +149,7 @@ class Content(Fixture):
             content_api.save(tiramisu_page)
 
         best_cake_thread = content_api.create(
-            content_type=ContentType.Thread,
+            content_type_slug=CONTENT_TYPES.Thread.slug,
             workspace=recipe_workspace,
             parent=dessert_folder,
             label='Best Cake',
@@ -159,7 +159,7 @@ class Content(Fixture):
         best_cake_thread.description = 'Which is the best cake?'
         self._session.add(best_cake_thread)
         apple_pie_recipe = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=recipe_workspace,
             parent=dessert_folder,
             label='Apple_Pie',
@@ -174,7 +174,7 @@ class Content(Fixture):
         )
         self._session.add(apple_pie_recipe)
         Brownie_recipe = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=recipe_workspace,
             parent=dessert_folder,
             label='Brownie Recipe',
@@ -189,7 +189,7 @@ class Content(Fixture):
         )
         self._session.add(Brownie_recipe)
         fruits_desserts_folder = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=recipe_workspace,
             label='Fruits Desserts',
             parent=dessert_folder,
@@ -197,7 +197,7 @@ class Content(Fixture):
         )
 
         menu_page = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=business_workspace,
             parent=menu_workspace,
             label='Current Menu',
@@ -205,14 +205,14 @@ class Content(Fixture):
         )
 
         new_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=recipe_workspace,
             parent=fruits_desserts_folder,
             label='New Fruit Salad',
             do_save=True,
         )
         old_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=recipe_workspace,
             parent=fruits_desserts_folder,
             label='Fruit Salad',
@@ -228,7 +228,7 @@ class Content(Fixture):
         content_api.save(old_fruit_salad)
 
         bad_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=recipe_workspace,
             parent=fruits_desserts_folder,
             label='Bad Fruit Salad',
@@ -245,13 +245,13 @@ class Content(Fixture):
 
         # File at the root for test
         new_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=other_workspace,
             label='New Fruit Salad',
             do_save=True,
         )
         old_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=other_workspace,
             label='Fruit Salad',
             do_save=True,
@@ -265,7 +265,7 @@ class Content(Fixture):
         content_api.save(old_fruit_salad)
 
         bad_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=other_workspace,
             label='Bad Fruit Salad',
             do_save=True,

backend/tracim_backend/lib/core/content.py

@@ -34,13 +34,15 @@ from tracim_backend.exceptions import EmptyLabelNotAllowed
 from tracim_backend.exceptions import ContentNotFound
 from tracim_backend.exceptions import WorkspacesDoNotMatch
 from tracim_backend.lib.utils.utils import current_date_for_filename
+from tracim_backend.models.contents import CONTENT_STATUS
+from tracim_backend.models.contents import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models.auth import User
 from tracim_backend.models.data import ActionDescription
-from tracim_backend.models.data import ContentStatus
 from tracim_backend.models.data import ContentRevisionRO
 from tracim_backend.models.data import Content
-from tracim_backend.models.data import ContentType
+
 from tracim_backend.models.data import NodeTreeItem
 from tracim_backend.models.data import RevisionReadStatus
 from tracim_backend.models.data import UserRoleInWorkspace
@@ -75,10 +77,10 @@ def compare_content_for_sorting_by_type_and_name(
     else:
         # TODO - D.A. - 2014-12-02 - Manage Content Types Dynamically
         content_type_order = [
-            ContentType.Folder,
-            ContentType.Page,
-            ContentType.Thread,
-            ContentType.File,
+            CONTENT_TYPES.Folder.slug,
+            CONTENT_TYPES.Page.slug,
+            CONTENT_TYPES.Thread.slug,
+            CONTENT_TYPES.File.slug,
         ]
 
         content_1_type_index = content_type_order.index(content1.type)
@@ -105,15 +107,15 @@ class ContentApi(object):
     SEARCH_SEPARATORS = ',| '
     SEARCH_DEFAULT_RESULT_NB = 50
 
-    DISPLAYABLE_CONTENTS = (
-        ContentType.Folder,
-        ContentType.File,
-        ContentType.Comment,
-        ContentType.Thread,
-        ContentType.Page,
-        ContentType.PageLegacy,
-        ContentType.MarkdownPage,
-    )
+    # DISPLAYABLE_CONTENTS = (
+    #     CONTENT_TYPES.Folder.slug,
+    #     CONTENT_TYPES.File.slug,
+    #     CONTENT_TYPES.Comment.slug,
+    #     CONTENT_TYPES.Thread.slug,
+    #     CONTENT_TYPES.Page.slug,
+    #     CONTENT_TYPES.Page.slugLegacy,
+    #     ContentType.MarkdownPage,
+    # )
 
     def __init__(
             self,
@@ -230,7 +232,7 @@ class ContentApi(object):
 
         # Exclude non displayable types
         if not self._force_show_all_types:
-            result = result.filter(Content.type.in_(self.DISPLAYABLE_CONTENTS))
+            result = result.filter(Content.type.in_(CONTENT_TYPES.query_allowed_types_slugs()))
 
         if workspace:
             result = result.filter(Content.workspace_id == workspace.workspace_id)
@@ -369,8 +371,8 @@ class ContentApi(object):
     #     removed_item_ids = removed_item_ids or []  # FDV
     # 
     #     if not allowed_node_types:
-    #         allowed_node_types = [ContentType.Folder]
-    #     elif allowed_node_types==ContentType.Any:
+    #         allowed_node_types = [CONTENT_TYPES.Folder.slug]
+    #     elif allowed_node_types==CONTENT_TYPES.Any_SLUG:
     #         allowed_node_types = ContentType.all()
     # 
     #     parent_id = parent.content_id if parent else None
@@ -395,7 +397,7 @@ class ContentApi(object):
     #     for folder in folders:
     #         for allowed_content_type in filter_by_allowed_content_types:
     # 
-    #             is_folder = folder.type == ContentType.Folder
+    #             is_folder = folder.type == CONTENT_TYPES.Folder.slug
     #             content_type__allowed = folder.properties['allowed_content'][allowed_content_type] == True
     # 
     #             if is_folder and content_type__allowed:
@@ -404,12 +406,13 @@ class ContentApi(object):
     # 
     #     return result
 
-    def create(self, content_type: str, workspace: Workspace, parent: Content=None, label: str ='', filename: str = '', do_save=False, is_temporary: bool=False, do_notify=True) -> Content:
+    def create(self, content_type_slug: str, workspace: Workspace, parent: Content=None, label: str = '', filename: str = '', do_save=False, is_temporary: bool=False, do_notify=True) -> Content:
         # TODO - G.M - 2018-07-16 - raise Exception instead of assert
-        assert content_type in ContentType.allowed_types()
+        assert content_type_slug in CONTENT_TYPES.query_allowed_types_slugs()
+        assert content_type_slug != CONTENT_TYPES.Any_SLUG
         assert not (label and filename)
 
-        if content_type == ContentType.Folder and not label:
+        if content_type_slug == CONTENT_TYPES.Folder.slug and not label:
             label = self.generate_folder_label(workspace, parent)
 
         content = Content()
@@ -421,7 +424,7 @@ class ContentApi(object):
         elif label:
             content.label = label
         else:
-            if content_type == ContentType.Comment:
+            if content_type_slug == CONTENT_TYPES.Comment.slug:
                 # INFO - G.M - 2018-07-16 - Default label for comments is
                 # empty string.
                 content.label = ''
@@ -431,13 +434,13 @@ class ContentApi(object):
         content.owner = self._user
         content.parent = parent
         content.workspace = workspace
-        content.type = content_type
+        content.type = content_type_slug
         content.is_temporary = is_temporary
         content.revision_type = ActionDescription.CREATION
 
         if content.type in (
-                ContentType.Page,
-                ContentType.Thread,
+                CONTENT_TYPES.Page.slug,
+                CONTENT_TYPES.Thread.slug,
         ):
             content.file_extension = '.html'
 
@@ -447,7 +450,7 @@ class ContentApi(object):
         return content
 
     def create_comment(self, workspace: Workspace=None, parent: Content=None, content:str ='', do_save=False) -> Content:
-        assert parent and parent.type != ContentType.Folder
+        assert parent and parent.type != CONTENT_TYPES.Folder.slug
         if not content:
             raise EmptyCommentContentNotAllowed()
         item = Content()
@@ -456,7 +459,7 @@ class ContentApi(object):
         if not workspace:
             workspace = item.parent.workspace
         item.workspace = workspace
-        item.type = ContentType.Comment
+        item.type = CONTENT_TYPES.Comment.slug
         item.description = content
         item.label = ''
         item.revision_type = ActionDescription.COMMENT
@@ -492,7 +495,7 @@ class ContentApi(object):
 
         base_request = self._base_query(workspace).filter(Content.content_id==content_id)
 
-        if content_type!=ContentType.Any:
+        if content_type!=CONTENT_TYPES.Any_SLUG:
             base_request = base_request.filter(Content.type==content_type)
 
         if parent:
@@ -577,20 +580,20 @@ class ContentApi(object):
         return query.filter(
             or_(
                 and_(
-                    Content.type == ContentType.File,
+                    Content.type == CONTENT_TYPES.File.slug,
                     Content.label == file_name,
                     Content.file_extension == file_extension,
                 ),
                 and_(
-                    Content.type == ContentType.Thread,
+                    Content.type == CONTENT_TYPES.Thread.slug,
                     Content.label == file_name,
                 ),
                 and_(
-                    Content.type == ContentType.Page,
+                    Content.type == CONTENT_TYPES.Page.slug,
                     Content.label == file_name,
                 ),
                 and_(
-                    Content.type == ContentType.Folder,
+                    Content.type == CONTENT_TYPES.Folder.slug,
                     Content.label == content_label,
                 ),
             )
@@ -671,7 +674,7 @@ class ContentApi(object):
             # Filter query on label
             folder_query = query \
                 .filter(
-                    Content.type == ContentType.Folder,
+                    Content.type == CONTENT_TYPES.Folder.slug,
                     Content.label == label,
                     Content.workspace_id == workspace.workspace_id,
                 )
@@ -723,22 +726,22 @@ class ContentApi(object):
 
         return query.filter(or_(
             and_(
-                Content.type == ContentType.File,
+                Content.type == CONTENT_TYPES.File.slug,
                 file_name_filter,
                 file_extension_filter,
             ),
             and_(
-                Content.type == ContentType.Thread,
+                Content.type == CONTENT_TYPES.Thread.slug,
                 file_name_filter,
                 file_extension_filter,
             ),
             and_(
-                Content.type == ContentType.Page,
+                Content.type == CONTENT_TYPES.Page.slug,
                 file_name_filter,
                 file_extension_filter,
             ),
             and_(
-                Content.type == ContentType.Folder,
+                Content.type == CONTENT_TYPES.Folder.slug,
                 label_filter,
             ),
         ))
@@ -844,25 +847,28 @@ class ContentApi(object):
     def _get_all_query(
         self,
         parent_id: int = None,
-        content_type: str = ContentType.Any,
+        content_type_slug: str = CONTENT_TYPES.Any_SLUG,
         workspace: Workspace = None
     ) -> Query:
         """
         Extended filter for better "get all data" query
         :param parent_id: filter by parent_id
-        :param content_type: filter by content_type slug
+        :param content_type_slug: filter by content_type slug
         :param workspace: filter by workspace
         :return:
         """
         assert parent_id is None or isinstance(parent_id, int)
-        assert content_type is not None
+        assert content_type_slug is not None
         resultset = self._base_query(workspace)
 
-        if content_type!=ContentType.Any:
+        if content_type_slug != CONTENT_TYPES.Any_SLUG:
             # INFO - G.M - 2018-07-05 - convert with
             #  content type object to support legacy slug
-            content_type_object = ContentType(content_type)
-            resultset = resultset.filter(Content.type.in_(content_type_object.get_slug_aliases()))
+            content_type_object = CONTENT_TYPES.get_one_by_slug(content_type_slug)
+            all_slug_alias = [content_type_object.slug]
+            if content_type_object.slug_alias:
+                all_slug_alias.extend(content_type_object.slug_alias)
+            resultset = resultset.filter(Content.type.in_(all_slug_alias))
 
         if parent_id:
             resultset = resultset.filter(Content.parent_id==parent_id)
@@ -871,7 +877,7 @@ class ContentApi(object):
 
         return resultset
 
-    def get_all(self, parent_id: int=None, content_type: str=ContentType.Any, workspace: Workspace=None) -> typing.List[Content]:
+    def get_all(self, parent_id: int=None, content_type: str=CONTENT_TYPES.Any_SLUG, workspace: Workspace=None) -> typing.List[Content]:
         return self._get_all_query(parent_id, content_type, workspace).all()
 
     # TODO - G.M - 2018-07-17 - [Cleanup] Drop this method if unneeded
@@ -895,14 +901,14 @@ class ContentApi(object):
 
     # TODO - G.M - 2018-07-17 - [Cleanup] Drop this method if unneeded
     # TODO find an other name to filter on is_deleted / is_archived
-    def get_all_with_filter(self, parent_id: int=None, content_type: str=ContentType.Any, workspace: Workspace=None) -> typing.List[Content]:
+    def get_all_with_filter(self, parent_id: int=None, content_type: str=CONTENT_TYPES.Any_SLUG, workspace: Workspace=None) -> typing.List[Content]:
         assert parent_id is None or isinstance(parent_id, int) # DYN_REMOVE
         assert content_type is not None# DYN_REMOVE
         assert isinstance(content_type, str) # DYN_REMOVE
 
         resultset = self._base_query(workspace)
 
-        if content_type != ContentType.Any:
+        if content_type != CONTENT_TYPES.Any_SLUG:
             resultset = resultset.filter(Content.type==content_type)
 
         resultset = resultset.filter(Content.is_deleted == self._show_deleted)
@@ -919,7 +925,7 @@ class ContentApi(object):
 
         resultset = self._base_query(workspace)
 
-        if content_type != ContentType.Any:
+        if content_type != CONTENT_TYPES.Any_SLUG:
             resultset = resultset.filter(Content.type==content_type)
 
         return resultset.all()
@@ -945,7 +951,7 @@ class ContentApi(object):
     #
     #     resultset = self._base_query(workspace)
     #
-    #     if content_type != ContentType.Any:
+    #     if content_type != CONTENT_TYPES.Any_SLUG:
     #         resultset = resultset.filter(Content.type==content_type)
     #
     #     return resultset.all()
@@ -978,7 +984,7 @@ class ContentApi(object):
                     Content.content_id.in_(content_ids),
                     and_(
                         Content.parent_id.in_(content_ids),
-                        Content.type == ContentType.Comment
+                        Content.type == CONTENT_TYPES.Comment.slug
                     )
                 )
             )
@@ -990,7 +996,7 @@ class ContentApi(object):
         before_content_find = False
         for content in resultset:
             related_active_content = None
-            if ContentType.Comment == content.type:
+            if CONTENT_TYPES.Comment.slug == content.type:
                 related_active_content = content.parent
             else:
                 related_active_content = content
@@ -1040,12 +1046,12 @@ class ContentApi(object):
     #         .filter(Content.content_id.in_(not_read_content_ids)) \
     #         .order_by(desc(Content.updated))
     #
-    #     if content_type != ContentType.Any:
+    #     if content_type != CONTENT_TYPES.Any_SLUG:
     #         not_read_contents = not_read_contents.filter(
     #             Content.type==content_type)
     #     else:
     #         not_read_contents = not_read_contents.filter(
-    #             Content.type!=ContentType.Folder)
+    #             Content.type!=CONTENT_TYPES.Folder.slug)
     #
     #     if parent_id:
     #         not_read_contents = not_read_contents.filter(
@@ -1054,7 +1060,7 @@ class ContentApi(object):
     #     result = []
     #     for item in not_read_contents:
     #         new_item = None
-    #         if ContentType.Comment == item.type:
+    #         if CONTENT_TYPES.Comment.slug == item.type:
     #             new_item = item.parent
     #         else:
     #             new_item = item
@@ -1086,7 +1092,7 @@ class ContentApi(object):
         folder.properties = properties
 
     def set_status(self, content: Content, new_status: str):
-        if new_status in ContentStatus.allowed_values():
+        if new_status in CONTENT_STATUS.get_all_slugs_values():
             content.status = new_status
             content.revision_type = ActionDescription.STATUS_UPDATE
         else:
@@ -1296,7 +1302,7 @@ class ContentApi(object):
                 self.mark_read(child, read_datetime=read_datetime,
                                do_flush=False)
 
-            if ContentType.Comment == content.type:
+            if CONTENT_TYPES.Comment.slug == content.type:
                 self.mark_read(content.parent, read_datetime=read_datetime,
                                do_flush=False, recursive=False)
                 for comment in content.parent.get_comments():
@@ -1416,12 +1422,12 @@ class ContentApi(object):
         return title_keyworded_items
 
     def get_all_types(self) -> typing.List[ContentType]:
-        labels = ContentType.all()
+        labels = CONTENT_TYPES.endpoint_allowed_types_slug()
         content_types = []
         for label in labels:
-            content_types.append(ContentType(label))
+            content_types.append(CONTENT_TYPES.get_one_by_slug(label))
 
-        return ContentType.sorted(content_types)
+        return content_types
 
     # TODO - G.M - 2018-07-24 - [Cleanup] Is this method already needed ?
     def exclude_unavailable(

backend/tracim_backend/lib/core/notifications.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from sqlalchemy.orm import Session
 
-from tracim_backend import CFG
+from tracim_backend.config import CFG
 from tracim_backend.lib.utils.logger import logger
 from tracim_backend.models.auth import User
 from tracim_backend.models.data import Content

backend/tracim_backend/lib/core/user.py

@@ -3,13 +3,17 @@ from smtplib import SMTPException
 
 import transaction
 import typing as typing
+
+from sqlalchemy import or_
 from sqlalchemy.orm import Session
+from sqlalchemy.orm import Query
 from sqlalchemy.orm.exc import NoResultFound
 
-from tracim_backend import CFG
+from tracim_backend.config import CFG
 from tracim_backend.models.auth import User
 from tracim_backend.models.auth import Group
 from tracim_backend.exceptions import NoUserSetted
+from tracim_backend.exceptions import TooShortAutocompleteString
 from tracim_backend.exceptions import PasswordDoNotMatch
 from tracim_backend.exceptions import EmailValidationFailed
 from tracim_backend.exceptions import UserDoesNotExist
@@ -20,6 +24,7 @@ from tracim_backend.exceptions import UserNotActive
 from tracim_backend.models.context_models import UserInContext
 from tracim_backend.lib.mail_notifier.notifier import get_email_manager
 from tracim_backend.models.context_models import TypeUser
+from tracim_backend.models.data import UserRoleInWorkspace
 
 
 class UserApi(object):
@@ -94,8 +99,41 @@ class UserApi(object):
             raise UserDoesNotExist('There is no current user')
         return self._user
 
+    def _get_all_query(self) -> Query:
+        return self._session.query(User).order_by(User.display_name)
+
     def get_all(self) -> typing.Iterable[User]:
-        return self._session.query(User).order_by(User.display_name).all()
+        return self._get_all_query().all()
+
+    def get_known_user(
+            self,
+            acp: str,
+    ) -> typing.Iterable[User]:
+        """
+        Return list of know user by current UserApi user.
+        :param acp: autocomplete filter by name/email
+        :return: List of found users
+        """
+        if len(acp) < 2:
+            raise TooShortAutocompleteString(
+                '"{acp}" is a too short string, acp string need to have more than one character'.format(acp=acp)  # nopep8
+            )
+        query = self._get_all_query()
+        query = query.filter(or_(User.display_name.ilike('%{}%'.format(acp)), User.email.ilike('%{}%'.format(acp))))  # nopep8
+
+        # INFO - G.M - 2018-07-27 - if user is set and is simple user, we
+        # should show only user in same workspace as user
+        if self._user and self._user.profile.id <= Group.TIM_USER:
+            user_workspaces_id_query = self._session.\
+                query(UserRoleInWorkspace.workspace_id).\
+                distinct(UserRoleInWorkspace.workspace_id).\
+                filter(UserRoleInWorkspace.user_id == self._user.user_id)
+            users_in_workspaces = self._session.\
+                query(UserRoleInWorkspace.user_id).\
+                distinct(UserRoleInWorkspace.user_id).\
+                filter(UserRoleInWorkspace.workspace_id.in_(user_workspaces_id_query.subquery())).subquery()  # nopep8
+            query = query.filter(User.user_id.in_(users_in_workspaces))
+        return query.all()
 
     def find(
             self,
@@ -196,7 +234,7 @@ class UserApi(object):
         )
         if do_save:
             # TODO - G.M - 2018-07-24 - Check why commit is needed here
-            transaction.commit()
+            self.save(user)
         return user
 
     def set_email(

backend/tracim_backend/lib/core/userworkspace.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import typing
 
-from tracim_backend import CFG
+from tracim_backend.config import CFG
 from tracim_backend.models.context_models import UserRoleWorkspaceInContext
 from tracim_backend.models.roles import WorkspaceRoles
 

backend/tracim_backend/lib/core/workspace.py

@@ -5,7 +5,7 @@ from sqlalchemy.orm import Query
 from sqlalchemy.orm import Session
 from sqlalchemy.orm.exc import NoResultFound
 
-from tracim_backend import CFG
+from tracim_backend.config import CFG
 from tracim_backend.exceptions import EmptyLabelNotAllowed
 from tracim_backend.exceptions import WorkspaceNotFound
 from tracim_backend.lib.utils.translation import fake_translator as _

backend/tracim_backend/lib/mail_notifier/notifier.py

@@ -10,18 +10,21 @@ from lxml.html.diff import htmldiff
 from mako.template import Template
 from sqlalchemy.orm import Session
 
-from tracim_backend import CFG
+from tracim_backend.config import CFG
 from tracim_backend.lib.core.notifications import INotifier
 from tracim_backend.lib.mail_notifier.sender import EmailSender
 from tracim_backend.lib.mail_notifier.utils import SmtpConfiguration, EST
 from tracim_backend.lib.mail_notifier.sender import send_email_through
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.lib.utils.logger import logger
-from tracim_backend.models import User
+from tracim_backend.lib.utils.utils import get_login_frontend_url
+from tracim_backend.lib.utils.utils import get_email_logo_frontend_url
 from tracim_backend.models.auth import User
+from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.models.context_models import ContentInContext
+from tracim_backend.models.context_models import WorkspaceInContext
 from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.data import Content
-from tracim_backend.models.data import ContentType
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.lib.utils.translation import fake_translator as l_, \
     fake_translator as _
@@ -233,8 +236,14 @@ class EmailManager(object):
             config=self.config,
             show_archived=True,
             show_deleted=True,
-        ).get_one(event_content_id, ContentType.Any)
-        main_content = content.parent if content.type == ContentType.Comment else content
+        ).get_one(event_content_id, CONTENT_TYPES.Any_SLUG)
+        workspace_api = WorkspaceApi(
+            session=self.session,
+            current_user=user,
+            config=self.config,
+        )
+        workpace_in_context = workspace_api.get_workspace_with_context(workspace_api.get_one(content.workspace_id))  # nopep8
+        main_content = content.parent if content.type == CONTENT_TYPES.Comment.slug else content  # nopep8
         notifiable_roles = WorkspaceApi(
             current_user=user,
             session=self.session,
@@ -265,7 +274,7 @@ class EmailManager(object):
             # INFO - G.M - 2017-11-15 - set content_id in header to permit reply
             # references can have multiple values, but only one in this case.
             replyto_addr = self.config.EMAIL_NOTIFICATION_REPLY_TO_EMAIL.replace( # nopep8
-                '{content_id}',str(content.content_id)
+                '{content_id}', str(content.content_id)
             )
 
             reference_addr = self.config.EMAIL_NOTIFICATION_REFERENCES_EMAIL.replace( #nopep8
@@ -297,8 +306,21 @@ class EmailManager(object):
             # To link this email to a content we create a virtual parent
             # in reference who contain the content_id.
             message['References'] = formataddr(('',reference_addr))
-            body_text = self._build_email_body_for_content(self.config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT, role, content, user)
-            body_html = self._build_email_body_for_content(self.config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_HTML, role, content, user)
+            content_in_context = content_api.get_content_in_context(content)
+            body_text = self._build_email_body_for_content(
+                self.config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT,
+                role,
+                content_in_context,
+                workpace_in_context,
+                user
+            )
+            body_html = self._build_email_body_for_content(
+                self.config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_HTML,
+                role,
+                content_in_context,
+                workpace_in_context,
+                user
+            )
 
             part1 = MIMEText(body_text, 'plain', 'utf-8')
             part2 = MIMEText(body_html, 'html', 'utf-8')
@@ -362,9 +384,9 @@ class EmailManager(object):
             'user': user,
             'password': password,
             # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for logo_url  # nopep8
-            'logo_url': '',
+            'logo_url': get_email_logo_frontend_url(self.config),
             # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for login_url  # nopep8
-            'login_url': self.config.WEBSITE_BASE_URL,
+            'login_url': get_login_frontend_url(self.config),
         }
         body_text = self._render_template(
             mako_template_filepath=text_template_file_path,
@@ -415,8 +437,9 @@ class EmailManager(object):
             self,
             mako_template_filepath: str,
             role: UserRoleInWorkspace,
-            content: Content,
-            actor: User
+            content_in_context: ContentInContext,
+            workspace_in_context: WorkspaceInContext,
+            actor: User,
     ) -> str:
         """
         Build an email body and return it as a string
@@ -424,24 +447,21 @@ class EmailManager(object):
         :param role: the role related to user to whom the email must be sent. The role is required (and not the user only) in order to show in the mail why the user receive the notification
         :param content: the content item related to the notification
         :param actor: the user at the origin of the action / notification (for example the one who wrote a comment
-        :param config: the global configuration
         :return: the built email body as string. In case of multipart email, this method must be called one time for text and one time for html
         """
         logger.debug(self, 'Building email content from MAKO template {}'.format(mako_template_filepath))
-
+        content = content_in_context.content
         main_title = content.label
         content_intro = ''
         content_text = ''
         call_to_action_text = ''
 
-        # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for call_to_action_url  # nopep8
-        call_to_action_url =''
+        call_to_action_url = content_in_context.frontend_url
         # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for status_icon_url  # nopep8
         status_icon_url = ''
-        # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for workspace_url  # nopep8
-        workspace_url = ''
+        workspace_url = workspace_in_context.frontend_url
         # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for logo_url  # nopep8
-        logo_url = ''
+        logo_url = get_email_logo_frontend_url(self.config)
 
         action = content.get_last_action().id
         if ActionDescription.COMMENT == action:
@@ -455,20 +475,20 @@ class EmailManager(object):
             content_text = content.description
             call_to_action_text = l_('View online')
 
-            if ContentType.Thread == content.type:
+            if CONTENT_TYPES.Thread.slug == content.type:
                 call_to_action_text = l_('Answer')
                 content_intro = l_('<span id="content-intro-username">{}</span> started a thread entitled:').format(actor.display_name)
                 content_text = '<p id="content-body-intro">{}</p>'.format(content.label) + \
                                content.get_last_comment_from(actor).description
 
-            elif ContentType.File == content.type:
+            elif CONTENT_TYPES.File.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> added a file entitled:').format(actor.display_name)
                 if content.description:
                     content_text = content.description
                 else:
                     content_text = '<span id="content-body-only-title">{}</span>'.format(content.label)
 
-            elif ContentType.Page == content.type:
+            elif CONTENT_TYPES.Page.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> added a page entitled:').format(actor.display_name)
                 content_text = '<span id="content-body-only-title">{}</span>'.format(content.label)
 
@@ -476,11 +496,11 @@ class EmailManager(object):
             content_text = content.description
             call_to_action_text = l_('View online')
 
-            if ContentType.File == content.type:
+            if CONTENT_TYPES.File.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> uploaded a new revision.').format(actor.display_name)
                 content_text = ''
 
-            elif ContentType.Page == content.type:
+            elif CONTENT_TYPES.Page.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> updated this page.').format(actor.display_name)
                 previous_revision = content.get_previous_revision()
                 title_diff = ''
@@ -490,7 +510,7 @@ class EmailManager(object):
                     title_diff + \
                     htmldiff(previous_revision.description, content.description)
 
-            elif ContentType.Thread == content.type:
+            elif CONTENT_TYPES.Thread.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> updated the thread description.').format(actor.display_name)
                 previous_revision = content.get_previous_revision()
                 title_diff = ''
@@ -503,7 +523,7 @@ class EmailManager(object):
         elif ActionDescription.EDITION == action:
             call_to_action_text = l_('View online')
 
-            if ContentType.File == content.type:
+            if CONTENT_TYPES.File.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> updated the file description.').format(actor.display_name)
                 content_text = '<p id="content-body-intro">{}</p>'.format(content.get_label()) + \
                     content.description

backend/tracim_backend/lib/utils/authorization.py

@@ -5,15 +5,15 @@ import functools
 from pyramid.interfaces import IAuthorizationPolicy
 from zope.interface import implementer
 
-from tracim_backend.models.contents import NewContentType
-from tracim_backend.models.context_models import ContentInContext
+from tracim_backend.models.contents import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 
 try:
     from json.decoder import JSONDecodeError
 except ImportError:  # python3.4
     JSONDecodeError = ValueError
 
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import ContentType
 from tracim_backend.exceptions import InsufficientUserRoleInWorkspace
 from tracim_backend.exceptions import ContentTypeNotAllowed
 from tracim_backend.exceptions import InsufficientUserProfile
@@ -133,18 +133,18 @@ def require_candidate_workspace_role(minimal_required_role: int) -> typing.Calla
     return decorator
 
 
-def require_content_types(content_types: typing.List['NewContentType']) -> typing.Callable:  # nopep8
+def require_content_types(content_types: typing.List['ContentType']) -> typing.Callable:  # nopep8
     """
     Restricts access to specific file type or raise an exception.
     Check role for candidate_workspace.
-    :param content_types: list of NewContentType object
+    :param content_types: list of ContentType object
     :return: decorator
     """
     def decorator(func: typing.Callable) -> typing.Callable:
         @functools.wraps(func)
         def wrapper(self, context, request: 'TracimRequest') -> typing.Callable:
             content = request.current_content
-            current_content_type_slug = ContentType(content.type).slug
+            current_content_type_slug = CONTENT_TYPES.get_one_by_slug(content.type).slug
             content_types_slug = [content_type.slug for content_type in content_types]  # nopep8
             if current_content_type_slug in content_types_slug:
                 return func(self, context, request)

backend/tracim_backend/lib/utils/request.py

@@ -15,7 +15,7 @@ from tracim_backend.exceptions import UserNotFoundInTracimRequest
 from tracim_backend.exceptions import UserDoesNotExist
 from tracim_backend.exceptions import WorkspaceNotFound
 from tracim_backend.exceptions import ImmutableAttribute
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.user import UserApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
@@ -229,11 +229,13 @@ class TracimRequest(Request):
             api = ContentApi(
                 current_user=user,
                 session=request.dbsession,
+                show_deleted=True,
+                show_archived=True,
                 config=request.registry.settings['CFG']
             )
             comment = api.get_one(
                 comment_id,
-                content_type=ContentType.Comment,
+                content_type=CONTENT_TYPES.Comment.slug,
                 workspace=workspace,
                 parent=content,
             )
@@ -268,10 +270,12 @@ class TracimRequest(Request):
                 raise ContentNotFoundInTracimRequest('No content_id property found in request')  # nopep8
             api = ContentApi(
                 current_user=user,
+                show_deleted=True,
+                show_archived=True,
                 session=request.dbsession,
                 config=request.registry.settings['CFG']
             )
-            content = api.get_one(content_id=content_id, workspace=workspace, content_type=ContentType.Any)  # nopep8
+            content = api.get_one(content_id=content_id, workspace=workspace, content_type=CONTENT_TYPES.Any_SLUG)  # nopep8
         except NoResultFound as exc:
             raise ContentNotFound(
                 'Content {} does not exist '

backend/tracim_backend/lib/utils/utils.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
 import datetime
+import random
+import string
+from enum import Enum
+
 from redis import Redis
 from rq import Queue
 
@@ -8,6 +12,32 @@ from tracim_backend.config import CFG
 DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
 DEFAULT_WEBDAV_CONFIG_FILE = "wsgidav.conf"
 DEFAULT_TRACIM_CONFIG_FILE = "development.ini"
+CONTENT_FRONTEND_URL_SCHEMA = 'workspaces/{workspace_id}/contents/{content_type}/{content_id}'  # nopep8
+WORKSPACE_FRONTEND_URL_SCHEMA = 'workspaces/{workspace_id}'  # nopep8
+
+
+def get_root_frontend_url(config: CFG) -> str:
+    """
+    Return website base url with always '/' at the end
+    """
+    base_url = ''
+    if config.WEBSITE_BASE_URL[-1] == '/':
+        base_url = config.WEBSITE_BASE_URL
+    else:
+        base_url = config.WEBSITE_BASE_URL + '/'
+    return base_url
+
+
+def get_login_frontend_url(config: CFG):
+    """
+    Return login page url
+    """
+    return get_root_frontend_url(config) + 'login'
+
+
+def get_email_logo_frontend_url(config: CFG):
+    # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for email_logo_frontend_url  # nopep8
+    return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH4QUTDjMSlsws9AAAB89JREFUaN7tmWtwlFcZx3/PeXeXXLmKQJEGsFZApIUBnaqjUm4VgdYyCUib0cJoKLmHW5EWmlGoQkMICURgEPuhtiYDU7XcyVgKVugULZVCQAwUYyENYAmEXHb3PH7IFjYQNgnZHfnA+bKz+7573v//PPf/C/fWvdWhJWHfMbO4P479OpCAigeowWglPq3ARWfU9AJ7Cb/3MAXZn95dBLKKHsfIQmAUIq7rv6t6gU+BKCAGaEBkN9h88tLe7sgjTdjAJ5Y4OGYMIo80Aw8g4kakJyLxiDiIxABPoMwj5+XP3R0ESpP8WC1H1YuqBj4bUWwIB5gA0d/6/xFQFUpKHBJLHADyU9chTEc1BdEZqJ0O+ofb4xcPyuBIxoBQuHc4ov3w2zrwH0Nd0aBDccwgVPsjEg/4Uc4jegKfvkfMmQ9JSfECkFP0HGJeuu0TrJZhSacg9Xh4Caze2wsXC1B9GugO+BAqUIkC/QIinhYsYoEqYDt+fY2s8WXkFE5CnBIg+vaWtJuQukzy5te2l4Bz2ysTkxchshCRWERMU2BKT4RuiLT0vwagHsENPIyR7zAx2eGybws09AUZEQLHcNS5wMEdB8NjgaKyBNTuQuTLoWOAs6AHUd5DpRzxX0KMBe0M+gA4D4Hdw5mT72LJQORxkM6IfgxSC3wjyHpHEN8M8jKPtYeAq2VgvhHg9A4RvPUIKzCyBVe346SM9LZw1y5KShzOxfUhL60SmMfcNUXgisXYS/iNA/IzhNmBgH4I3E8Cxzpmgby9ffFoMSKTQxA4jZjRpI35qENZbF5Rb1SWgcwM7HsQr28KhZnVd55GPfqTkOCbaB+i2lR1uHa8nHYeda0EygJWGILHGXzndaBgz3CQ5Fb8/hSqr5E7uj4sBXBVSjlqN6FaixKHlS8BxCYtHhs/bUly9JT597U9C30/eRYiU4Nc5Q1gH+AG/gvsxJBH2vg3w9pDPTjqFDGxX0FkKOih2PtHOcbIBiPMMi5XT9eDo9/xlu+rDW2BpX+MAQnOCudRWcWFA3OwncYhrke5VpuK1SrW7+sTVgKv5NYjsr2p6TMY1QEGvhi4mmw89unWXaiX6QQEN1YHuHjpELm5lsxvV2MbhxAdWwCSiNfnCXsb7mc/Ih8hXED8J1T1k6awEAG+R+LCLqEJOL2vInwQOP46VHaSm9QYiI1nMU4xwv2oa3OHs0+LiaHuHKr/wOo/r1yuOQwcDEqVw2KdqITQBFJGelFWojITPz8kY+wmAAp3pWLkJVT7oGwkY3R5REar/Ln1qO7AyIfsLGxQ1eB60E3UDmi9kKWPOwmcvP69cM8kROYCXVB5FW18I4LToeLSbTGnKh2T9MIChLHBOI2lT9srMUDB9s7AM8CApj7H/yaZExsiOd9GnbngcjzOciPyVPOuW0RFB7ZvHnDck4FJgbOpwPoPRHpAdxs782bwQSwei3ty0aC2EVh61ANMutEy63Gi/l0VUfSJC7sIjAnhYYON4x7eNgI9KgeifDPIOyuuDygRWnGuKDcQF6roWrGxbSNgzDAgqBuV6ki7z9WT5y4DR0LdoqoVbSOgZhAi7hv4bXzEFarDG7yqbPmsgN2aovhdLdf+2jqBorIE4JGbIugZCvcsijQHr5ojN1tbVaustUWNNP6S0vy60AR+ut4Ndj7CYzdlgL7AixTtmRnRLOToVNAhQeDfR+yPr+iJrIbf/+pM62l0WP8RKNNCSCCTySuJjgT42MTnv4rqjEDvg6J+VH5T8/qynZSW+ts40EgCQtcQDcsDEN2d9IKe4U2hiR5jmG1ERt4QKrS4pkqK2zmRSQMaUsj6D5cuu3C5ppCY6IQLf2dn8CIjZk4Q+N961VnJvlxf+4Z6v/cojvsDYEQL4BXRHVTXfkysjqPfd3tA6YqOnXx293gnLgvV5xFBVa2iv/b6dEX91p+fbf9ImTnxX6gWAadbILARX+0rbEjxohwCFpBVlH1nyJea2KTFY+OduHUGeaFJoNN3gcwr1smu37qsze16y7pQ4a7pYFYj0iuAvho0jbTxJQBkrB6Ky70VGIDqamA9+WmnWtwrZ20/fN4uQA1rss52Slw8wIOZKg4/QIlTKBfY32DttobSZafDJS0Ka3YXYEx6UCXZid8/n6wJRwHIXrsEI7kB6+xHtQTDn8hLPQuipBb2oJOkgSQBPREuAlupq98cfa6mXsXnOFpfV5uQMBRxlMpP/kJpbmP4tNHC3SNBNiLycJAbleLlOXLGVTB33edRLUBkepAuegyRd1D7Pphh10Wr5mJuMT5fNo67L45NQSUlIBqsYlXqkqaiGy51es3eWQh5CDfmUeufTcaE9QBkFY7AyIuImXxT3bfI7doUvQayFbUDMSZYRHiLq64n2JByOXzvBzLGbkJ1GarnP4OPmBt60Or0v+E381Fdj+ILOhYT4p1ADOhTzcA3EdjeXvCtEwDIGNc0J6vNB/0FDXXbmk9uc05wMSYLq+nAgYArtWJ3keYW0eVUVheE9/3ArbYXkND+mbO2H8gk0AnAlGZAb3WlWpQ/I/o6q9JevWMxIyJdWWZ+V4xnOUaebQH4MVS2I/59eO3bFGbWdEiNiVhrmVncH+NfhMg0IA4RH1bfQnQlq9LKwiYnRbTB/9HmKLrWfg2j94HUoI1/Z3XOOe6te+vuWf8DkM0cb7DOQZgAAAAASUVORK5CYII='  # nopep8'
 
 
 def get_redis_connection(config: CFG) -> Redis:
@@ -72,3 +102,26 @@ def current_date_for_filename() -> str:
     # webdav utils, it may cause trouble. So, it should be replaced to
     # a character which will not change in bdd.
     return datetime.datetime.now().isoformat().replace(':', '.')
+
+# INFO - G.M - 2018-08-02 - Simple password generator, inspired by
+# https://gist.github.com/23maverick23/4131896
+
+
+ALLOWED_AUTOGEN_PASSWORD_CHAR = string.ascii_letters + \
+                                string.digits + \
+                                string.punctuation
+
+DEFAULT_PASSWORD_GEN_CHAR_LENGTH = 12
+
+
+def password_generator(
+        length: int=DEFAULT_PASSWORD_GEN_CHAR_LENGTH,
+        chars: str=ALLOWED_AUTOGEN_PASSWORD_CHAR
+) -> str:
+    """
+    :param length: length of the new password
+    :param chars: characters allowed
+    :return: password as string
+    """
+    return ''.join(random.choice(chars) for char_number in range(length))
+

backend/tracim_backend/lib/webdav/dav_provider.py

@@ -8,6 +8,7 @@ from sqlalchemy.orm.exc import NoResultFound
 from tracim_backend import CFG
 from tracim_backend.lib.webdav.utils import transform_to_bdd, HistoryType, \
     SpecialFolderExtension
+from tracim_backend.models.contents import CONTENT_TYPES
 
 from wsgidav.dav_provider import DAVProvider
 from wsgidav.lock_manager import LockManager
@@ -19,7 +20,8 @@ from tracim_backend.lib.core.content import ContentRevisionRO
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.lib.webdav import resources
 from tracim_backend.lib.webdav.utils import normpath
-from tracim_backend.models.data import ContentType, Content, Workspace
+from tracim_backend.models.data import Content
+from tracim_backend.models.data import Workspace
 
 
 class Provider(DAVProvider):
@@ -174,7 +176,7 @@ class Provider(DAVProvider):
             content_revision = content_api.get_one_revision(revision_id)
             content = self.get_content_from_revision(content_revision, content_api)
 
-            if content.type == ContentType.File:
+            if content.type == CONTENT_TYPES.File.slug:
                 return resources.HistoryFileResource(
                     path=path,
                     environ=environ,
@@ -198,7 +200,7 @@ class Provider(DAVProvider):
 
         if content is None:
             return None
-        if content.type == ContentType.Folder:
+        if content.type == CONTENT_TYPES.Folder.slug:
             return resources.FolderResource(
                 path=path,
                 environ=environ,
@@ -207,7 +209,7 @@ class Provider(DAVProvider):
                 session=session,
                 user=user,
             )
-        elif content.type == ContentType.File:
+        elif content.type == CONTENT_TYPES.File.slug:
             return resources.FileResource(
                 path=path,
                 environ=environ,
@@ -356,7 +358,7 @@ class Provider(DAVProvider):
 
     def get_content_from_revision(self, revision: ContentRevisionRO, api: ContentApi) -> Content:
         try:
-            return api.get_one(revision.content_id, ContentType.Any)
+            return api.get_one(revision.content_id, CONTENT_TYPES.Any_SLUG)
         except NoResultFound:
             return None
 

backend/tracim_backend/lib/webdav/design.py

@@ -1,8 +1,8 @@
 #coding: utf8
 from datetime import datetime
 
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import VirtualEvent
-from tracim_backend.models.data import ContentType
 from tracim_backend.models import data
 
 # FIXME: fix temporaire ...
@@ -237,6 +237,7 @@ def designPage(content: data.Content, content_revision: data.ContentRevisionRO)
 
     return page
 
+
 def designThread(content: data.Content, content_revision: data.ContentRevisionRO, comments) -> str:
         hist = content.get_history(drop_empty_revision=False)
 
@@ -248,7 +249,7 @@ def designThread(content: data.Content, content_revision: data.ContentRevisionRO
         disc = ''
         participants = {}
         for t in allT:
-            if t.type == ContentType.Comment:
+            if t.type == CONTENT_TYPES.Comment.slug:
                 disc += '''
                     <div class="row comment comment-row">
                         <i class="fa fa-comment-o comment-icon"></i>

backend/tracim_backend/lib/webdav/resources.py

@@ -19,10 +19,11 @@ from tracim_backend.lib.webdav.utils import transform_to_display, HistoryType, \
     FakeFileStream
 from tracim_backend.lib.webdav.utils import transform_to_bdd
 from tracim_backend.lib.core.workspace import WorkspaceApi
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import User, ContentRevisionRO
 from tracim_backend.models.data import Workspace
-from tracim_backend.models.data import Content, ActionDescription
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.data import Content
+from tracim_backend.models.data import ActionDescription
 from tracim_backend.lib.webdav.design import designThread, designPage
 
 from wsgidav import compat
@@ -236,7 +237,7 @@ class WorkspaceResource(DAVCollection):
 
         for content in children:
             # the purpose is to display .history only if there's at least one content's type that has a history
-            if content.type != ContentType.Folder:
+            if content.type != CONTENT_TYPES.Folder.slug:
                 self._file_count += 1
             retlist.append(content.get_label_as_file())
 
@@ -288,7 +289,7 @@ class WorkspaceResource(DAVCollection):
             raise DAVError(HTTP_FORBIDDEN)
 
         folder = self.content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=self.workspace,
             label=label,
             parent=self.content
@@ -331,12 +332,12 @@ class WorkspaceResource(DAVCollection):
     def getMemberList(self) -> [_DAVResource]:
         members = []
 
-        children = self.content_api.get_all(False, ContentType.Any, self.workspace)
+        children = self.content_api.get_all(False, CONTENT_TYPES.Any_SLUG, self.workspace)
 
         for content in children:
             content_path = '%s/%s' % (self.path, transform_to_display(content.get_label_as_file()))
 
-            if content.type == ContentType.Folder:
+            if content.type == CONTENT_TYPES.Folder.slug:
                 members.append(
                     FolderResource(
                         path=content_path,
@@ -347,7 +348,7 @@ class WorkspaceResource(DAVCollection):
                         session=self.session,
                     )
                 )
-            elif content.type == ContentType.File:
+            elif content.type == CONTENT_TYPES.File.slug:
                 self._file_count += 1
                 members.append(
                     FileResource(
@@ -553,7 +554,7 @@ class FolderResource(WorkspaceResource):
         )
         visible_children = content_api.get_all(
             self.content.content_id,
-            ContentType.Any,
+            CONTENT_TYPES.Any_SLUG,
             self.workspace,
         )
 
@@ -561,7 +562,7 @@ class FolderResource(WorkspaceResource):
             content_path = '%s/%s' % (self.path, transform_to_display(content.get_label_as_file()))
 
             try:
-                if content.type == ContentType.Folder:
+                if content.type == CONTENT_TYPES.Folder.slug:
                     members.append(
                         FolderResource(
                             path=content_path,
@@ -572,7 +573,7 @@ class FolderResource(WorkspaceResource):
                             session=self.session,
                         )
                     )
-                elif content.type == ContentType.File:
+                elif content.type == CONTENT_TYPES.File.slug:
                     self._file_count += 1
                     members.append(
                         FileResource(
@@ -592,13 +593,15 @@ class FolderResource(WorkspaceResource):
                             user=self.user,
                             session=self.session,
                         ))
-            except Exception as exc:
-                logger.exception(
-                    'Unable to construct member {}'.format(
-                        content_path,
-                    ),
-                    exc_info=True,
-                )
+            except NotImplementedError as exc:
+                pass
+            # except Exception as exc:
+            #     logger.exception(
+            #         'Unable to construct member {}'.format(
+            #             content_path,
+            #         ),
+            #         exc_info=True,
+            #     )
 
         if self._file_count > 0 and self.provider.show_history():
             members.append(
@@ -708,11 +711,11 @@ class HistoryFolderResource(FolderResource):
         ret = []
 
         content_id = None if self.content is None else self.content.id
-        for content in self.content_api.get_all(content_id, ContentType.Any, self.workspace):
+        for content in self.content_api.get_all(content_id, CONTENT_TYPES.Any_SLUG, self.workspace):
             if (self._is_archived and content.is_archived or
                 self._is_deleted and content.is_deleted or
                 not (content.is_archived or self._is_archived or content.is_deleted or self._is_deleted))\
-                    and content.type != ContentType.Folder:
+                    and content.type != CONTENT_TYPES.Folder.slug:
                 ret.append(content.get_label_as_file())
 
         return ret
@@ -741,7 +744,7 @@ class HistoryFolderResource(FolderResource):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, CONTENT_TYPES.Any_SLUG, self.workspace)
         
         for content in children:
             if content.is_archived == self._is_archived and content.is_deleted == self._is_deleted:
@@ -812,13 +815,13 @@ class DeletedFolderResource(HistoryFolderResource):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, CONTENT_TYPES.Any_SLUG, self.workspace)
 
         for content in children:
             if content.is_deleted:
                 retlist.append(content.get_label_as_file())
 
-                if content.type != ContentType.Folder:
+                if content.type != CONTENT_TYPES.Folder.slug:
                     self._file_count += 1
 
         return retlist
@@ -829,13 +832,13 @@ class DeletedFolderResource(HistoryFolderResource):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, CONTENT_TYPES.Any_SLUG, self.workspace)
 
         for content in children:
             if content.is_deleted:
                 content_path = '%s/%s' % (self.path, transform_to_display(content.get_label_as_file()))
 
-                if content.type == ContentType.Folder:
+                if content.type == CONTENT_TYPES.Folder.slug:
                     members.append(
                         FolderResource(
                             content_path,
@@ -845,7 +848,7 @@ class DeletedFolderResource(HistoryFolderResource):
                             user=self.user,
                             session=self.session,
                         ))
-                elif content.type == ContentType.File:
+                elif content.type == CONTENT_TYPES.File.slug:
                     self._file_count += 1
                     members.append(
                         FileResource(
@@ -936,10 +939,10 @@ class ArchivedFolderResource(HistoryFolderResource):
         retlist = []
 
         for content in self.content_api.get_all_with_filter(
-                self.content if self.content is None else self.content.id, ContentType.Any):
+                self.content if self.content is None else self.content.id, CONTENT_TYPES.Any_SLUG):
             retlist.append(content.get_label_as_file())
 
-            if content.type != ContentType.Folder:
+            if content.type != CONTENT_TYPES.Folder.slug:
                 self._file_count += 1
 
         return retlist
@@ -950,13 +953,13 @@ class ArchivedFolderResource(HistoryFolderResource):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, CONTENT_TYPES.Any_SLUG, self.workspace)
 
         for content in children:
             if content.is_archived:
                 content_path = '%s/%s' % (self.path, transform_to_display(content.get_label_as_file()))
 
-                if content.type == ContentType.Folder:
+                if content.type == CONTENT_TYPES.Folder.slug:
                     members.append(
                         FolderResource(
                             content_path,
@@ -966,7 +969,7 @@ class ArchivedFolderResource(HistoryFolderResource):
                             user=self.user,
                             session=self.session,
                         ))
-                elif content.type == ContentType.File:
+                elif content.type == CONTENT_TYPES.File.slug:
                     self._file_count += 1
                     members.append(
                         FileResource(
@@ -1053,7 +1056,7 @@ class HistoryFileFolderResource(HistoryFolderResource):
 
         left_side = '%s/(%d - %s) ' % (self.path, revision.revision_id, revision.revision_type)
 
-        if self.content.type == ContentType.File:
+        if self.content.type == CONTENT_TYPES.File.slug:
             return HistoryFileResource(
                 path='%s%s' % (left_side, transform_to_display(revision.file_name)),
                 environ=self.environ,
@@ -1079,7 +1082,7 @@ class HistoryFileFolderResource(HistoryFolderResource):
 
             left_side = '%s/(%d - %s) ' % (self.path, content.revision_id, content.revision_type)
 
-            if self.content.type == ContentType.File:
+            if self.content.type == CONTENT_TYPES.File.slug:
                 members.append(HistoryFileResource(
                     path='%s%s' % (left_side, transform_to_display(content.file_name)),
                     environ=self.environ,
@@ -1425,13 +1428,13 @@ class OtherFileResource(FileResource):
         return filestream
 
     def design(self):
-        if self.content.type == ContentType.Page:
+        if self.content.type == CONTENT_TYPES.Page.slug:
             return designPage(self.content, self.content_revision)
         else:
             return designThread(
                 self.content,
                 self.content_revision,
-                self.content_api.get_all(self.content.content_id, ContentType.Comment)
+                self.content_api.get_all(self.content.content_id, CONTENT_TYPES.Comment.slug)
             )
 
 

backend/tracim_backend/lib/webdav/utils.py

@@ -4,12 +4,14 @@ import transaction
 from os.path import normpath as base_normpath
 
 from sqlalchemy.orm import Session
+from tracim_backend.models.contents import CONTENT_TYPES
 from wsgidav import util
 from wsgidav import compat
 
 from tracim_backend.lib.core.content import ContentApi
-from tracim_backend.models.data import Workspace, Content, ContentType, \
-    ActionDescription
+from tracim_backend.models.data import Workspace
+from tracim_backend.models.data import Content
+from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.revision_protection import new_revision
 
 
@@ -177,7 +179,7 @@ class FakeFileStream(object):
 
         file = self._api.create(
             filename=self._file_name,
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=self._workspace,
             parent=self._parent,
             is_temporary=is_temporary

backend/tracim_backend/models/applications.py

@@ -36,6 +36,12 @@ class Application(object):
         self.config = config
         self.main_route = main_route
 
+    # TODO - G.M - 2018-08-07 - Refactor slug coherence issue like this one.
+    # we probably should not have 2 kind of slug
+    @property
+    def minislug(self):
+        return self.slug.replace('contents/', '')
+
 
 # default apps
 calendar = Application(
@@ -59,6 +65,16 @@ thread = Application(
 
 )
 
+folder = Application(
+    label='Folder',
+    slug='contents/folder',
+    fa_icon='folder-open-o',
+    hexcolor='#252525',
+    is_active=True,
+    config={},
+    main_route='',
+)
+
 _file = Application(
     label='Files',
     slug='contents/file',
@@ -92,8 +108,10 @@ html_documents = Application(
 # List of applications
 applications = [
     html_documents,
-    markdownpluspage,
+    # TODO - G.M - 2018-08-02 - Restore markdownpage app
+    # markdownpluspage,
     _file,
     thread,
-    calendar,
+    folder,
+    # calendar,
 ]

backend/tracim_backend/models/contents.py

@@ -6,6 +6,7 @@ from tracim_backend.exceptions import ContentTypeNotExist
 from tracim_backend.exceptions import ContentStatusNotExist
 from tracim_backend.models.applications import html_documents
 from tracim_backend.models.applications import _file
+from tracim_backend.models.applications import folder
 from tracim_backend.models.applications import thread
 from tracim_backend.models.applications import markdownpluspage
 
@@ -19,9 +20,9 @@ class GlobalStatus(Enum):
     CLOSED = 'closed'
 
 
-class NewContentStatus(object):
+class ContentStatus(object):
     """
-    Future ContentStatus object class
+    ContentStatus object class
     """
     def __init__(
             self,
@@ -38,7 +39,7 @@ class NewContentStatus(object):
         self.hexcolor = hexcolor
 
 
-open_status = NewContentStatus(
+open_status = ContentStatus(
     slug='open',
     global_status=GlobalStatus.OPEN.value,
     label='Open',
@@ -46,7 +47,7 @@ open_status = NewContentStatus(
     hexcolor='#3f52e3',
 )
 
-closed_validated_status = NewContentStatus(
+closed_validated_status = ContentStatus(
     slug='closed-validated',
     global_status=GlobalStatus.CLOSED.value,
     label='Validated',
@@ -54,7 +55,7 @@ closed_validated_status = NewContentStatus(
     hexcolor='#008000',
 )
 
-closed_unvalidated_status = NewContentStatus(
+closed_unvalidated_status = ContentStatus(
     slug='closed-unvalidated',
     global_status=GlobalStatus.CLOSED.value,
     label='Cancelled',
@@ -62,7 +63,7 @@ closed_unvalidated_status = NewContentStatus(
     hexcolor='#f63434',
 )
 
-closed_deprecated_status = NewContentStatus(
+closed_deprecated_status = ContentStatus(
     slug='closed-deprecated',
     global_status=GlobalStatus.CLOSED.value,
     label='Deprecated',
@@ -71,50 +72,44 @@ closed_deprecated_status = NewContentStatus(
 )
 
 
-CONTENT_DEFAULT_STATUS = [
-    open_status,
-    closed_validated_status,
-    closed_unvalidated_status,
-    closed_deprecated_status,
-]
+class ContentStatusList(object):
 
+    OPEN = open_status
 
-class ContentStatusLegacy(NewContentStatus):
-    """
-    Temporary remplacement object for Legacy ContentStatus Object
-    """
-    OPEN = open_status.slug
-    CLOSED_VALIDATED = closed_validated_status.slug
-    CLOSED_UNVALIDATED = closed_unvalidated_status.slug
-    CLOSED_DEPRECATED = closed_deprecated_status.slug
-
-    def __init__(self, slug: str):
-        for status in CONTENT_DEFAULT_STATUS:
-            if slug == status.slug:
-                super(ContentStatusLegacy, self).__init__(
-                    slug=status.slug,
-                    global_status=status.global_status,
-                    label=status.label,
-                    fa_icon=status.fa_icon,
-                    hexcolor=status.hexcolor,
-                )
-                return
+    def __init__(self, extend_content_status: typing.List[ContentStatus]):
+        self._content_status = [self.OPEN]
+        self._content_status.extend(extend_content_status)
+
+    def get_one_by_slug(self, slug: str) -> ContentStatus:
+        for item in self._content_status:
+            if item.slug == slug:
+                return item
         raise ContentStatusNotExist()
 
-    @classmethod
-    def all(cls, type='') -> ['NewContentStatus']:
-        return CONTENT_DEFAULT_STATUS
+    def get_all_slugs_values(self) -> typing.List[str]:
+        """ Get alls slugs"""
+        return [item.slug for item in self._content_status]
+
+    def get_all(self) -> typing.List[ContentStatus]:
+        """ Get all status"""
+        return [item for item in self._content_status]
 
-    @classmethod
-    def allowed_values(cls):
-        return [status.slug for status in CONTENT_DEFAULT_STATUS]
+    def get_default_status(self) -> ContentStatus:
+        return self.OPEN
 
 
+CONTENT_STATUS = ContentStatusList(
+    [
+        closed_validated_status,
+        closed_unvalidated_status,
+        closed_deprecated_status,
+    ]
+)
 ####
 # ContentType
 
 
-class NewContentType(object):
+class ContentType(object):
     """
     Future ContentType object class
     """
@@ -125,8 +120,8 @@ class NewContentType(object):
             hexcolor: str,
             label: str,
             creation_label: str,
-            available_statuses: typing.List[NewContentStatus],
-
+            available_statuses: typing.List[ContentStatus],
+            slug_alias: typing.List[str] = None,
     ):
         self.slug = slug
         self.fa_icon = fa_icon
@@ -134,169 +129,141 @@ class NewContentType(object):
         self.label = label
         self.creation_label = creation_label
         self.available_statuses = available_statuses
+        self.slug_alias = slug_alias
 
 
-thread_type = NewContentType(
+thread_type = ContentType(
     slug='thread',
     fa_icon=thread.fa_icon,
     hexcolor=thread.hexcolor,
     label='Thread',
     creation_label='Discuss about a topic',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
-file_type = NewContentType(
+file_type = ContentType(
     slug='file',
     fa_icon=_file.fa_icon,
     hexcolor=_file.hexcolor,
     label='File',
     creation_label='Upload a file',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
-markdownpluspage_type = NewContentType(
+markdownpluspage_type = ContentType(
     slug='markdownpage',
     fa_icon=markdownpluspage.fa_icon,
     hexcolor=markdownpluspage.hexcolor,
     label='Rich Markdown File',
     creation_label='Create a Markdown document',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
-html_documents_type = NewContentType(
+html_documents_type = ContentType(
     slug='html-document',
     fa_icon=html_documents.fa_icon,
     hexcolor=html_documents.hexcolor,
     label='Text Document',
     creation_label='Write a document',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
+    slug_alias=['page']
 )
 
 # TODO - G.M - 31-05-2018 - Set Better folder params
-folder_type = NewContentType(
+folder_type = ContentType(
     slug='folder',
-    fa_icon=thread.fa_icon,
-    hexcolor=thread.hexcolor,
+    fa_icon=folder.fa_icon,
+    hexcolor=folder.hexcolor,
     label='Folder',
-    creation_label='Create collection of any documents',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    creation_label='Create a folder',
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
-CONTENT_DEFAULT_TYPE = [
-    thread_type,
-    file_type,
-    markdownpluspage_type,
-    html_documents_type,
-    folder_type,
-]
 
 # TODO - G.M - 31-05-2018 - Set Better Event params
-event_type = NewContentType(
+event_type = ContentType(
     slug='event',
     fa_icon=thread.fa_icon,
     hexcolor=thread.hexcolor,
     label='Event',
     creation_label='Event',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
 # TODO - G.M - 31-05-2018 - Set Better Event params
-comment_type = NewContentType(
+comment_type = ContentType(
     slug='comment',
     fa_icon=thread.fa_icon,
     hexcolor=thread.hexcolor,
     label='Comment',
     creation_label='Comment',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
-CONTENT_DEFAULT_TYPE_SPECIAL = [
-    event_type,
-    comment_type,
-]
 
-ALL_CONTENTS_DEFAULT_TYPES = CONTENT_DEFAULT_TYPE + CONTENT_DEFAULT_TYPE_SPECIAL
-
-
-class ContentTypeLegacy(NewContentType):
+class ContentTypeList(object):
     """
-    Temporary remplacement object for Legacy ContentType Object
+    ContentType List
     """
-
-    # special type
-    Any = 'any'
-    Folder = 'folder'
-    Event = 'event'
-    Comment = 'comment'
-
-    File = file_type.slug
-    Thread = thread_type.slug
-    Page = html_documents_type.slug
-    PageLegacy = 'page'
-    MarkdownPage = markdownpluspage_type.slug
-
-    def __init__(self, slug: str):
-        if slug == 'page':
-            slug = ContentTypeLegacy.Page
-        for content_type in ALL_CONTENTS_DEFAULT_TYPES:
-            if slug == content_type.slug:
-                super(ContentTypeLegacy, self).__init__(
-                    slug=content_type.slug,
-                    fa_icon=content_type.fa_icon,
-                    hexcolor=content_type.hexcolor,
-                    label=content_type.label,
-                    creation_label=content_type.creation_label,
-                    available_statuses=content_type.available_statuses
-                )
-                return
+    Any_SLUG = 'any'
+    Folder = folder_type
+    Comment = comment_type
+    Event = event_type
+    File = file_type
+    Page = html_documents_type
+    Thread = thread_type
+
+    def __init__(self, extend_content_status: typing.List[ContentType]):
+        self._content_types = [self.Folder]
+        self._content_types.extend(extend_content_status)
+        self._special_contents_types = [self.Comment]
+        self._extra_slugs = [self.Any_SLUG]
+
+    def get_one_by_slug(self, slug: str) -> ContentType:
+        """
+        Get ContentType object according to slug
+        match for both slug and slug_alias
+        """
+        content_types = self._content_types.copy()
+        content_types.extend(self._special_contents_types)
+        for item in content_types:
+            if item.slug == slug or (item.slug_alias and slug in item.slug_alias):  # nopep8
+                return item
         raise ContentTypeNotExist()
 
-    def get_slug_aliases(self) -> typing.List[str]:
+    def endpoint_allowed_types_slug(self) -> typing.List[str]:
         """
-        Get all slug aliases of a content,
-        useful for legacy code convertion
+        Return restricted list of content_type:
+        dont return special content_type like  comment, don't return
+        "any" slug, dont return content type slug alias , don't return event.
+        Useful to restrict slug param in schema.
         """
-        # TODO - G.M - 2018-07-05 - Remove this legacy compat code
-        # when possible.
-        page_alias = [self.Page, self.PageLegacy]
-        if self.slug in page_alias:
-            return page_alias
-        else:
-            return [self.slug]
-
-    @classmethod
-    def all(cls) -> typing.List[str]:
-        return cls.allowed_types()
-
-    @classmethod
-    def allowed_types(cls) -> typing.List[str]:
-        contents_types = [status.slug for status in ALL_CONTENTS_DEFAULT_TYPES]
-        return contents_types
-
-    @classmethod
-    def allowed_type_values(cls) -> typing.List[str]:
+        allowed_type_slug = [contents_type.slug for contents_type in self._content_types]  # nopep8
+        return allowed_type_slug
+
+    def query_allowed_types_slugs(self) -> typing.List[str]:
         """
-        All content type slug + special values like any
+        Return alls allowed types slug : content_type slug + all alias, any
+        and special content_type like comment. Do not return event.
+        Usefull allowed value to perform query to database.
         """
-        content_types = cls.allowed_types()
-        content_types.append(ContentTypeLegacy.Any)
-        return content_types
-
-    @classmethod
-    def allowed_types_for_folding(cls):
-        # This method is used for showing only "main"
-        # types in the left-side treeview
-        contents_types = [status.slug for status in CONTENT_DEFAULT_TYPE]
-        return contents_types
-
-    # TODO - G.M - 30-05-2018 - This method don't do anything.
-    @classmethod
-    def sorted(cls, types: ['ContentType']) -> ['ContentType']:
-        return types
-
-    @property
-    def id(self):
-        return self.slug
-
-    def toDict(self):
-        raise NotImplementedError()
+        allowed_types_slug = []
+        for content_type in self._content_types:
+            allowed_types_slug.append(content_type.slug)
+            if content_type.slug_alias:
+                allowed_types_slug.extend(content_type.slug_alias)
+        for content_type in self._special_contents_types:
+            allowed_types_slug.append(content_type.slug)
+        allowed_types_slug.extend(self._extra_slugs)
+        return allowed_types_slug
+
+
+CONTENT_TYPES = ContentTypeList(
+    [
+        thread_type,
+        file_type,
+        # TODO - G.M - 2018-08-02 - Restore markdown page content
+        #    markdownpluspage_type,
+        html_documents_type,
+    ]
+)

backend/tracim_backend/models/context_models.py

@@ -5,8 +5,11 @@ from enum import Enum
 
 from slugify import slugify
 from sqlalchemy.orm import Session
-from tracim_backend import CFG
+from tracim_backend.config import CFG
 from tracim_backend.config import PreviewDim
+from tracim_backend.lib.utils.utils import get_root_frontend_url
+from tracim_backend.lib.utils.utils import CONTENT_FRONTEND_URL_SCHEMA
+from tracim_backend.lib.utils.utils import WORKSPACE_FRONTEND_URL_SCHEMA
 from tracim_backend.models import User
 from tracim_backend.models.auth import Profile
 from tracim_backend.models.data import Content
@@ -14,9 +17,9 @@ from tracim_backend.models.data import ContentRevisionRO
 from tracim_backend.models.data import Workspace
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.roles import WorkspaceRoles
-from tracim_backend.models.workspace_menu_entries import default_workspace_menu_entry
+from tracim_backend.models.workspace_menu_entries import default_workspace_menu_entry  # nopep8
 from tracim_backend.models.workspace_menu_entries import WorkspaceMenuEntry
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 
 
 class PreviewAllowedDim(object):
@@ -186,6 +189,14 @@ class CommentPath(object):
         self.comment_id = comment_id
 
 
+class AutocompleteQuery(object):
+    """
+    Autocomplete query model
+    """
+    def __init__(self, acp: str):
+        self.acp = acp
+
+
 class PageQuery(object):
     """
     Page query model
@@ -454,6 +465,14 @@ class WorkspaceInContext(object):
         # apps)
         return default_workspace_menu_entry(self.workspace)
 
+    @property
+    def frontend_url(self):
+        root_frontend_url = get_root_frontend_url(self.config)
+        workspace_frontend_url = WORKSPACE_FRONTEND_URL_SCHEMA.format(
+            workspace_id=self.workspace_id,
+        )
+        return root_frontend_url + workspace_frontend_url
+
 
 class UserRoleWorkspaceInContext(object):
     """
@@ -578,7 +597,7 @@ class ContentInContext(object):
 
     @property
     def content_type(self) -> str:
-        content_type = ContentType(self.content.type)
+        content_type = CONTENT_TYPES.get_one_by_slug(self.content.type)
         return content_type.slug
 
     @property
@@ -652,6 +671,16 @@ class ContentInContext(object):
         assert self._user
         return not self.content.has_new_information_for(self._user)
 
+    @property
+    def frontend_url(self):
+        root_frontend_url = get_root_frontend_url(self.config)
+        content_frontend_url = CONTENT_FRONTEND_URL_SCHEMA.format(
+            workspace_id=self.workspace_id,
+            content_type=self.content_type,
+            content_id=self.content_id,
+        )
+        return root_frontend_url + content_frontend_url
+
 
 class RevisionInContext(object):
     """
@@ -690,11 +719,7 @@ class RevisionInContext(object):
 
     @property
     def content_type(self) -> str:
-        content_type = ContentType(self.revision.type)
-        if content_type:
-            return content_type.slug
-        else:
-            return None
+        return CONTENT_TYPES.get_one_by_slug(self.revision.type).slug
 
     @property
     def sub_content_types(self) -> typing.List[str]:

backend/tracim_backend/models/data.py

@@ -96,7 +96,7 @@ class Workspace(DeclarativeBase):
 
     def get_allowed_content_types(self):
         # @see Content.get_allowed_content_types()
-        return [ContentType('folder')]
+        return CONTENT_TYPES.endpoint_allowed_types_slug()
 
     def get_valid_children(
             self,
@@ -291,8 +291,9 @@ class ActionDescription(object):
                 ]
 
 
-from tracim_backend.models.contents import ContentStatusLegacy as ContentStatus
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_STATUS
+from tracim_backend.models.contents import ContentStatus
+from tracim_backend.models.contents import CONTENT_TYPES
 # TODO - G.M - 30-05-2018 - Drop this old code when whe are sure nothing
 # is lost .
 
@@ -351,9 +352,9 @@ from tracim_backend.models.contents import ContentTypeLegacy as ContentType
 #         # self.icon = ContentStatus._ICONS[id]
 #         # self.css = ContentStatus._CSS[id]
 #         #
-#         # if type==ContentType.Thread:
+#         # if type==CONTENT_TYPES.Thread.slug:
 #         #     self.label = ContentStatus._LABELS_THREAD[id]
-#         # elif type==ContentType.File:
+#         # elif type==CONTENT_TYPES.File.slug:
 #         #     self.label = ContentStatus._LABELS_FILE[id]
 #         # else:
 #         #     self.label = ContentStatus._LABELS[id]
@@ -499,13 +500,13 @@ from tracim_backend.models.contents import ContentTypeLegacy as ContentType
 #     #     # TODO - DYNDATATYPE - D.A. - 2014-12-02
 #     #     # Make this code dynamic loading data types
 #     #
-#     #     if content.type==ContentType.Folder:
+#     #     if content.type==CONTENT_TYPES.Folder.slug:
 #     #         return '/workspaces/{}/folders/{}'.format(content.workspace_id, content.content_id)
-#     #     elif content.type==ContentType.File:
+#     #     elif content.type==CONTENT_TYPES.File.slug:
 #     #         return '/workspaces/{}/folders/{}/files/{}'.format(content.workspace_id, content.parent_id, content.content_id)
-#     #     elif content.type==ContentType.Thread:
+#     #     elif content.type==CONTENT_TYPES.Thread.slug:
 #     #         return '/workspaces/{}/folders/{}/threads/{}'.format(content.workspace_id, content.parent_id, content.content_id)
-#     #     elif content.type==ContentType.Page:
+#     #     elif content.type==CONTENT_TYPES.Page.slug:
 #     #         return '/workspaces/{}/folders/{}/pages/{}'.format(content.workspace_id, content.parent_id, content.content_id)
 #     #
 #     # @classmethod
@@ -544,7 +545,7 @@ class ContentChecker(object):
 
     @classmethod
     def check_properties(cls, item):
-        if item.type == ContentType.Folder:
+        if item.type == CONTENT_TYPES.Folder.slug:
             properties = item.properties
             if 'allowed_content' not in properties.keys():
                 return False
@@ -558,7 +559,7 @@ class ContentChecker(object):
                 return False
             return True
 
-        if item.type == ContentType.Event:
+        if item.type == CONTENT_TYPES.Event.slug:
             properties = item.properties
             if 'name' not in properties.keys():
                 return False
@@ -572,7 +573,7 @@ class ContentChecker(object):
 
         # TODO - G.M - 15-03-2018 - Choose only correct Content-type for origin
         # Only content who can be copied need this
-        if item.type == ContentType.Any:
+        if item.type == CONTENT_TYPES.Any_SLUG:
             properties = item.properties
             if 'origin' in properties.keys():
                 return True
@@ -580,7 +581,7 @@ class ContentChecker(object):
 
     @classmethod
     def reset_properties(cls, item):
-        if item.type == ContentType.Folder:
+        if item.type == CONTENT_TYPES.Folder.slug:
             item.properties = DEFAULT_PROPERTIES
             return
 
@@ -616,7 +617,7 @@ class ContentRevisionRO(DeclarativeBase):
     properties = Column('properties', Text(), unique=False, nullable=False, default='')
 
     type = Column(Unicode(32), unique=False, nullable=False)
-    status = Column(Unicode(32), unique=False, nullable=False, default=ContentStatus.OPEN)
+    status = Column(Unicode(32), unique=False, nullable=False, default=str(CONTENT_STATUS.get_default_status().slug))
     created = Column(DateTime, unique=False, nullable=False, default=datetime.utcnow)
     updated = Column(DateTime, unique=False, nullable=False, default=datetime.utcnow)
     is_deleted = Column(Boolean, unique=False, nullable=False, default=False)
@@ -754,7 +755,7 @@ class ContentRevisionRO(DeclarativeBase):
         super().__setattr__(key, value)
 
     def get_status(self) -> ContentStatus:
-        return ContentStatus(self.status)
+        return CONTENT_STATUS.get_one_by_slug(self.status)
 
     def get_label(self) -> str:
         return self.label or self.file_name or ''
@@ -779,9 +780,9 @@ class ContentRevisionRO(DeclarativeBase):
     def get_label_as_file(self):
         file_extension = self.file_extension or ''
 
-        if self.type == ContentType.Thread:
+        if self.type == CONTENT_TYPES.Thread.slug:
             file_extension = '.html'
-        elif self.type == ContentType.Page:
+        elif self.type == CONTENT_TYPES.Page.slug:
             file_extension = '.html'
 
         return '{0}{1}'.format(
@@ -1227,10 +1228,10 @@ class Content(DeclarativeBase):
         return format_timedelta(delta_from_datetime - datetime_object,
                                 locale=get_locale())
 
-    def get_child_nb(self, content_type: ContentType, content_status = ''):
+    def get_child_nb(self, content_type: str, content_status = ''):
         child_nb = 0
         for child in self.get_valid_children():
-            if child.type == content_type or content_type == ContentType.Any:
+            if child.type == content_type or content_type.slug == CONTENT_TYPES.Any_SLUG:
                 if not content_status:
                     child_nb = child_nb+1
                 elif content_status==child.status:
@@ -1247,10 +1248,8 @@ class Content(DeclarativeBase):
         return self.revision.get_label_as_file()
 
     def get_status(self) -> ContentStatus:
-        return ContentStatus(
+        return CONTENT_STATUS.get_one_by_slug(
             self.status,
-            # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-            # self.type.__str__()
         )
 
     def get_last_action(self) -> ActionDescription:
@@ -1307,7 +1306,7 @@ class Content(DeclarativeBase):
     def get_comments(self):
         children = []
         for child in self.children:
-            if ContentType.Comment==child.type and not child.is_deleted and not child.is_archived:
+            if CONTENT_TYPES.Comment.slug == child.type and not child.is_deleted and not child.is_archived:
                 children.append(child.node)
         return children
 
@@ -1348,13 +1347,13 @@ class Content(DeclarativeBase):
             allowed_types = self.properties['allowed_content']
             for type_label, is_allowed in allowed_types.items():
                 if is_allowed:
-                    types.append(ContentType(type_label))
+                    types.append(CONTENT_TYPES.get_one_by_slug(type_label))
         except Exception as e:
             print(e.__str__())
             print('----- /*\ *****')
             raise ValueError('Not allowed content property')
 
-        return ContentType.sorted(types)
+        return types
 
     def get_history(self, drop_empty_revision=False) -> '[VirtualEvent]':
         events = []
@@ -1447,10 +1446,9 @@ class VirtualEvent(object):
 
     @classmethod
     def create_from_content(cls, content: Content):
-        content_type = ContentType(content.type)
 
         label = content.get_label()
-        if content.type == ContentType.Comment:
+        if content.type == CONTENT_TYPES.Comment.slug:
             # TODO - G.M  - 10-04-2018 - [Cleanup] Remove label param
             # from this object ?
             label = l_('<strong>{}</strong> wrote:').format(content.owner.get_display_name())
@@ -1458,7 +1456,7 @@ class VirtualEvent(object):
         return VirtualEvent(id=content.content_id,
                             created=content.created,
                             owner=content.owner,
-                            type=content_type,
+                            type=ActionDescription(content.revision_type),
                             label=label,
                             content=content.description,
                             ref_object=content)

backend/tracim_backend/templates/mail/content_update_body_html.mak

@@ -45,7 +45,7 @@
             ${main_title}
             &mdash;&nbsp;<span style="font-weight: bold; color: #999; font-weight: bold;">
               ${status_label|n}
-              <img alt="status_icon" src="${status_icon_url}" style="vertical-align: middle;">
+              <img alt="" src="${status_icon_url}" style="vertical-align: middle;">
             </span>
         </td>
       </tr>
@@ -55,6 +55,8 @@
     <div id="content-body">
         <div>${content_text|n}</div>
         <div href='' id="call-to-action-container">
+            <span style=""> <a href="${call_to_action_url}"
+            id="call-to-action-button">${call_to_action_text}</a> </span> </div>
         </div>
     </div>
     

backend/tracim_backend/templates/mail/created_account_body_html.mak

@@ -68,10 +68,9 @@
         </div>
         <div id="call-to-action-container">
 
-            ${_('To go to {website_title}, please click on following link'.format(
+            ${_('To go to {website_title}, please click on following link :'.format(
                 website_title=config.WEBSITE_TITLE
             ))}
-
             <span style="">
                 <a href="${login_url}" id='call-to-action-button'>${login_url}</a>
             </span>

backend/tracim_backend/tests/__init__.py

@@ -14,8 +14,8 @@ from tracim_backend.models import get_engine
 from tracim_backend.models import DeclarativeBase
 from tracim_backend.models import get_session_factory
 from tracim_backend.models import get_tm_session
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import Workspace
-from tracim_backend.models.data import ContentType
 from tracim_backend.models.data import ContentRevisionRO
 from tracim_backend.models.data import Content
 from tracim_backend.lib.utils.logger import logger
@@ -68,20 +68,17 @@ def create_1000px_png_test_image():
 class FunctionalTest(unittest.TestCase):
 
     fixtures = [BaseFixture]
-    sqlalchemy_url = 'sqlite:///tracim_test.sqlite'
+    config_uri = 'tests_configs.ini'
+    config_section = 'functional_test'
 
     def setUp(self):
         logger._logger.setLevel('WARNING')
+
         DepotManager._clear()
-        self.settings = {
-            'sqlalchemy.url': self.sqlalchemy_url,
-            'user.auth_token.validity': '604800',
-            'depot_storage_dir': '/tmp/test/depot',
-            'depot_storage_name': 'test',
-            'preview_cache_dir': '/tmp/test/preview_cache',
-            'preview.jpg.restricted_dims': True,
-            'email.notification.activated': 'false',
-        }
+        self.settings = plaster.get_settings(
+            self.config_uri,
+            self.config_section
+        )
         hapic.reset_context()
         self.engine = get_engine(self.settings)
         DeclarativeBase.metadata.create_all(self.engine)
@@ -127,7 +124,7 @@ class FunctionalTestEmptyDB(FunctionalTest):
 
 
 class FunctionalTestNoDB(FunctionalTest):
-    sqlalchemy_url = 'sqlite://'
+    config_section = 'functional_test_no_db'
 
     def init_database(self, settings):
         self.engine = get_engine(settings)
@@ -268,13 +265,13 @@ class DefaultTest(StandardTest):
         workspace = self._create_workspace_and_test(workspace_name, user)
         folder = self._create_content_and_test(
             folder_name, workspace,
-            type=ContentType.Folder,
+            type=CONTENT_TYPES.Folder.slug,
             owner=user
         )
         thread = self._create_content_and_test(
             thread_name,
             workspace,
-            type=ContentType.Thread,
+            type=CONTENT_TYPES.Thread.slug,
             parent=folder,
             owner=user
         )

backend/tracim_backend/tests/functional/test_contents.py

@@ -5,7 +5,7 @@ from tracim_backend import models
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.models import get_tm_session
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 import io
 
@@ -16,7 +16,6 @@ from depot.io.utils import FileIntent
 from tracim_backend import models
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
-from tracim_backend.models.data import ContentType
 from tracim_backend.models import get_tm_session
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.tests import FunctionalTest
@@ -117,6 +116,54 @@ class TestHtmlDocuments(FunctionalTest):
         assert content['last_modifier']['avatar_url'] is None
         assert content['raw_content'] == '<p>To cook a great Tiramisu, you need many ingredients.</p>'  # nopep8
 
+    def test_api__get_html_document__ok_200__archived_content(self) -> None:
+        """
+        Get one html document of a content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/6/archive',
+            status=204
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/2/html-documents/6',
+            status=200
+        )
+        content = res.json_body
+        assert content['content_type'] == 'html-document'
+        assert content['content_id'] == 6
+        assert content['is_archived'] is True
+
+    def test_api__get_html_document__ok_200__deleted_content(self) -> None:
+        """
+        Get one html document of a content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/2/contents/6/delete',
+            status=204
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/2/html-documents/6',
+            status=200
+        )
+        content = res.json_body
+        assert content['content_type'] == 'html-document'
+        assert content['content_id'] == 6
+        assert content['is_deleted'] is True
+
     def test_api__get_html_document__err_400__wrong_content_type(self) -> None:
         """
         Get one html document of a content content 7 is not html_document
@@ -480,9 +527,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -648,9 +695,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -703,9 +750,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -809,9 +856,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -882,9 +929,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -978,9 +1025,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1031,9 +1078,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1082,9 +1129,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1137,9 +1184,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1196,9 +1243,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1251,9 +1298,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1302,9 +1349,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1375,9 +1422,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1438,9 +1485,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1489,9 +1536,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1554,9 +1601,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1618,9 +1665,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1989,9 +2036,9 @@ class TestThreads(FunctionalTest):
             session=dbsession,
             config=self.app_config
         )
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_thread = content_api.create(
-            content_type=ContentType.Thread,
+            content_type_slug=CONTENT_TYPES.Thread.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test Thread',

backend/tracim_backend/tests/functional/test_mail_notification.py

@@ -11,7 +11,7 @@ from tracim_backend.fixtures.users_and_groups import Base as BaseFixture
 from tracim_backend.fixtures.content import Content as ContentFixture
 from tracim_backend.lib.utils.utils import get_redis_connection
 from tracim_backend.lib.utils.utils import get_rq_queue
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.user import UserApi
@@ -139,7 +139,7 @@ class TestNotificationsSync(MailHogTest):
             config=self.app_config,
         )
         item = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'parent',
@@ -147,7 +147,7 @@ class TestNotificationsSync(MailHogTest):
             do_notify=False,
         )
         item2 = api.create(
-            ContentType.File,
+            CONTENT_TYPES.File.slug,
             workspace,
             item,
             'file1',
@@ -231,7 +231,7 @@ class TestNotificationsAsync(MailHogTest):
             config=self.app_config,
         )
         item = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'parent',
@@ -239,7 +239,7 @@ class TestNotificationsAsync(MailHogTest):
             do_notify=False,
         )
         item2 = api.create(
-            ContentType.File,
+            CONTENT_TYPES.File.slug,
             workspace,
             item,
             'file1',

backend/tracim_backend/tests/functional/test_system.py

@@ -1,10 +1,13 @@
 # coding=utf-8
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.tests import FunctionalTest
+from tracim_backend.models.applications import applications
 
 """
 Tests for /api/v2/system subpath endpoints.
 """
 
+
 class TestApplicationEndpoint(FunctionalTest):
     """
     Tests for /api/v2/system/applications
@@ -23,41 +26,14 @@ class TestApplicationEndpoint(FunctionalTest):
         )
         res = self.testapp.get('/api/v2/system/applications', status=200)
         res = res.json_body
-        application = res[0]
-        assert application['label'] == "Text Documents"
-        assert application['slug'] == 'contents/html-document'
-        assert application['fa_icon'] == 'file-text-o'
-        assert application['hexcolor'] == '#3f52e3'
-        assert application['is_active'] is True
-        assert 'config' in application
-        application = res[1]
-        assert application['label'] == "Markdown Plus Documents"
-        assert application['slug'] == 'contents/markdownpluspage'
-        assert application['fa_icon'] == 'file-code-o'
-        assert application['hexcolor'] == '#f12d2d'
-        assert application['is_active'] is True
-        assert 'config' in application
-        application = res[2]
-        assert application['label'] == "Files"
-        assert application['slug'] == 'contents/file'
-        assert application['fa_icon'] == 'paperclip'
-        assert application['hexcolor'] == '#FF9900'
-        assert application['is_active'] is True
-        assert 'config' in application
-        application = res[3]
-        assert application['label'] == "Threads"
-        assert application['slug'] == 'contents/thread'
-        assert application['fa_icon'] == 'comments-o'
-        assert application['hexcolor'] == '#ad4cf9'
-        assert application['is_active'] is True
-        assert 'config' in application
-        application = res[4]
-        assert application['label'] == "Calendar"
-        assert application['slug'] == 'calendar'
-        assert application['fa_icon'] == 'calendar'
-        assert application['hexcolor'] == '#757575'
-        assert application['is_active'] is True
-        assert 'config' in application
+        assert len(res) == len(applications)
+        for counter, application in enumerate(applications):
+            assert res[counter]['label'] == application.label
+            assert res[counter]['slug'] == application.slug
+            assert res[counter]['fa_icon'] == application.fa_icon
+            assert res[counter]['hexcolor'] == application.hexcolor
+            assert res[counter]['is_active'] == application.is_active
+            assert res[counter]['config'] == application.config
 
     def test_api__get_applications__err_401__unregistered_user(self):
         """
@@ -95,44 +71,21 @@ class TestContentsTypesEndpoint(FunctionalTest):
         )
         res = self.testapp.get('/api/v2/system/content_types', status=200)
         res = res.json_body
+        assert len(res) == len(CONTENT_TYPES.endpoint_allowed_types_slug())
+        content_types = CONTENT_TYPES.endpoint_allowed_types_slug()
 
-        content_type = res[0]
-        assert content_type['slug'] == 'thread'
-        assert content_type['fa_icon'] == 'comments-o'
-        assert content_type['hexcolor'] == '#ad4cf9'
-        assert content_type['label'] == 'Thread'
-        assert content_type['creation_label'] == 'Discuss about a topic'
-        assert 'available_statuses' in content_type
-        assert len(content_type['available_statuses']) == 4
-
-        content_type = res[1]
-        assert content_type['slug'] == 'file'
-        assert content_type['fa_icon'] == 'paperclip'
-        assert content_type['hexcolor'] == '#FF9900'
-        assert content_type['label'] == 'File'
-        assert content_type['creation_label'] == 'Upload a file'
-        assert 'available_statuses' in content_type
-        assert len(content_type['available_statuses']) == 4
-
-        content_type = res[2]
-        assert content_type['slug'] == 'markdownpage'
-        assert content_type['fa_icon'] == 'file-code-o'
-        assert content_type['hexcolor'] == '#f12d2d'
-        assert content_type['label'] == 'Rich Markdown File'
-        assert content_type['creation_label'] == 'Create a Markdown document'
-        assert 'available_statuses' in content_type
-        assert len(content_type['available_statuses']) == 4
-
-        content_type = res[3]
-        assert content_type['slug'] == 'html-document'
-        assert content_type['fa_icon'] == 'file-text-o'
-        assert content_type['hexcolor'] == '#3f52e3'
-        assert content_type['label'] == 'Text Document'
-        assert content_type['creation_label'] == 'Write a document'
-        assert 'available_statuses' in content_type
-        assert len(content_type['available_statuses']) == 4
-        # TODO - G.M - 31-05-2018 - Check Folder type
-        # TODO - G.M - 29-05-2018 - Better check for available_statuses
+        for counter, content_type_slug in enumerate(content_types):
+            content_type = CONTENT_TYPES.get_one_by_slug(content_type_slug)
+            assert res[counter]['slug'] == content_type.slug
+            assert res[counter]['fa_icon'] == content_type.fa_icon
+            assert res[counter]['hexcolor'] == content_type.hexcolor
+            assert res[counter]['label'] == content_type.label
+            assert res[counter]['creation_label'] == content_type.creation_label
+            for status_counter, status in enumerate(content_type.available_statuses):
+                assert res[counter]['available_statuses'][status_counter]['fa_icon'] == status.fa_icon  # nopep8
+                assert res[counter]['available_statuses'][status_counter]['global_status'] == status.global_status  # nopep8
+                assert res[counter]['available_statuses'][status_counter]['slug'] == status.slug  # nopep8
+                assert res[counter]['available_statuses'][status_counter]['hexcolor'] == status.hexcolor  # nopep8
 
     def test_api__get_content_types__err_401__unregistered_user(self):
         """

backend/tracim_backend/tests/functional/test_user.py

@@ -13,7 +13,7 @@ from tracim_backend.lib.core.group import GroupApi
 from tracim_backend.lib.core.userworkspace import RoleApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.models import get_tm_session
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.tests import FunctionalTest
@@ -87,14 +87,14 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=dbsession,
             tm=transaction.manager,
@@ -103,10 +103,10 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
-        content_workspace_2 = api.create(ContentType.Page, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         dbsession.flush()
         transaction.commit()
 
@@ -205,14 +205,15 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+
         with new_revision(
             session=dbsession,
             tm=transaction.manager,
@@ -221,10 +222,10 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
-        content_workspace_2 = api.create(ContentType.Page, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         dbsession.flush()
         transaction.commit()
 
@@ -301,14 +302,14 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=dbsession,
             tm=transaction.manager,
@@ -317,10 +318,10 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
-        content_workspace_2 = api.create(ContentType.Page, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         dbsession.flush()
         transaction.commit()
 
@@ -426,14 +427,14 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=dbsession,
             tm=transaction.manager,
@@ -442,10 +443,10 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
-        content_workspace_2 = api.create(ContentType.Page, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         dbsession.flush()
         transaction.commit()
 
@@ -498,14 +499,14 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=dbsession,
             tm=transaction.manager,
@@ -514,10 +515,10 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
-        content_workspace_2 = api.create(ContentType.Page, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         dbsession.flush()
         transaction.commit()
 
@@ -610,14 +611,14 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=dbsession,
             tm=transaction.manager,
@@ -626,10 +627,10 @@ class TestUserRecentlyActiveContentEndpoint(FunctionalTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
-        content_workspace_2 = api.create(ContentType.Page, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         dbsession.flush()
         transaction.commit()
 
@@ -714,14 +715,14 @@ class TestUserReadStatusEndpoint(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=dbsession,
             tm=transaction.manager,
@@ -730,10 +731,10 @@ class TestUserReadStatusEndpoint(FunctionalTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
-        content_workspace_2 = api.create(ContentType.Page, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         dbsession.flush()
         transaction.commit()
 
@@ -826,14 +827,14 @@ class TestUserReadStatusEndpoint(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=dbsession,
             tm=transaction.manager,
@@ -842,10 +843,10 @@ class TestUserReadStatusEndpoint(FunctionalTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
-        content_workspace_2 = api.create(ContentType.Page, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         dbsession.flush()
         transaction.commit()
 
@@ -949,14 +950,14 @@ class TestUserReadStatusEndpoint(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=dbsession,
             tm=transaction.manager,
@@ -965,10 +966,10 @@ class TestUserReadStatusEndpoint(FunctionalTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
-        content_workspace_2 = api.create(ContentType.Page, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         dbsession.flush()
         transaction.commit()
 
@@ -1059,9 +1060,9 @@ class TestUserSetContentAsRead(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_unread(firstly_created)
         api2.mark_unread(firstly_created)
         dbsession.flush()
@@ -1167,9 +1168,9 @@ class TestUserSetContentAsRead(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_unread(firstly_created)
         api2.mark_unread(firstly_created)
         dbsession.flush()
@@ -1248,9 +1249,9 @@ class TestUserSetContentAsRead(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_unread(firstly_created)
         api2.mark_unread(firstly_created)
         dbsession.flush()
@@ -1329,9 +1330,9 @@ class TestUserSetContentAsRead(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_unread(firstly_created)
         api2.mark_unread(firstly_created)
         dbsession.flush()
@@ -1428,9 +1429,9 @@ class TestUserSetContentAsRead(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_unread(firstly_created)
         api2.mark_unread(firstly_created)
         dbsession.flush()
@@ -1509,9 +1510,9 @@ class TestUserSetContentAsRead(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created, 'juste a super comment', True)  # nopep8
         api.mark_unread(firstly_created)
         api.mark_unread(comments)
@@ -1626,9 +1627,9 @@ class TestUserSetContentAsUnread(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_read(firstly_created)
         api2.mark_read(firstly_created)
         dbsession.flush()
@@ -1735,9 +1736,9 @@ class TestUserSetContentAsUnread(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_read(firstly_created)
         api2.mark_read(firstly_created)
         dbsession.flush()
@@ -1816,9 +1817,9 @@ class TestUserSetContentAsUnread(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_read(firstly_created)
         api2.mark_read(firstly_created)
         dbsession.flush()
@@ -1898,9 +1899,9 @@ class TestUserSetContentAsUnread(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_read(firstly_created)
         api2.mark_read(firstly_created)
         dbsession.flush()
@@ -1993,9 +1994,9 @@ class TestUserSetContentAsUnread(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_read(firstly_created)
         api2.mark_read(firstly_created)
         dbsession.flush()
@@ -2044,9 +2045,9 @@ class TestUserSetContentAsUnread(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created, 'juste a super comment', True)  # nopep8
         api.mark_read(firstly_created)
         api.mark_read(comments)
@@ -2137,9 +2138,9 @@ class TestUserSetWorkspaceAsRead(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_unread(main_folder)
         api.mark_unread(firstly_created)
         api2.mark_unread(main_folder)
@@ -2234,9 +2235,9 @@ class TestUserSetWorkspaceAsRead(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_unread(main_folder)
         api.mark_unread(firstly_created)
         api2.mark_unread(main_folder)
@@ -2331,9 +2332,9 @@ class TestUserSetWorkspaceAsRead(FunctionalTest):
             session=dbsession,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
         api.mark_unread(main_folder)
         api.mark_unread(firstly_created)
         api2.mark_unread(main_folder)
@@ -2381,8 +2382,10 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         assert workspace['workspace_id'] == 1
         assert workspace['label'] == 'Business'
         assert workspace['slug'] == 'business'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
+        # TODO - G.M - 2018-08-02 - Better test for sidebar entry, make it
+        # not fixed on active application/content-file
         sidebar_entry = workspace['sidebar_entries'][0]
         assert sidebar_entry['slug'] == 'dashboard'
         assert sidebar_entry['label'] == 'Dashboard'
@@ -2405,32 +2408,19 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "file-text-o"
 
         sidebar_entry = workspace['sidebar_entries'][3]
-        assert sidebar_entry['slug'] == 'contents/markdownpluspage'
-        assert sidebar_entry['label'] == 'Markdown Plus Documents'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=markdownpluspage"    # nopep8
-        assert sidebar_entry['hexcolor'] == "#f12d2d"
-        assert sidebar_entry['fa_icon'] == "file-code-o"
-
-        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/file'
         assert sidebar_entry['label'] == 'Files'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
         assert sidebar_entry['hexcolor'] == "#FF9900"
         assert sidebar_entry['fa_icon'] == "paperclip"
 
-        sidebar_entry = workspace['sidebar_entries'][5]
+        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/thread'
         assert sidebar_entry['label'] == 'Threads'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
         assert sidebar_entry['fa_icon'] == "comments-o"
 
-        sidebar_entry = workspace['sidebar_entries'][6]
-        assert sidebar_entry['slug'] == 'calendar'
-        assert sidebar_entry['label'] == 'Calendar'
-        assert sidebar_entry['route'] == "/#/workspaces/1/calendar"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#757575"
-        assert sidebar_entry['fa_icon'] == "calendar"
 
     def test_api__get_user_workspaces__err_403__unallowed_user(self):
         """
@@ -2645,6 +2635,390 @@ class TestUserEndpoint(FunctionalTest):
         )
 
 
+class TestUsersEndpoint(FunctionalTest):
+    # -*- coding: utf-8 -*-
+    """
+    Tests for GET /api/v2/users/{user_id}
+    """
+    fixtures = [BaseFixture]
+
+    def test_api__get_user__ok_200__admin(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        transaction.commit()
+        user_id = int(test_user.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/users',
+            status=200
+        )
+        res = res.json_body
+        assert len(res) == 2
+        assert res[0]['user_id'] == admin.user_id
+        assert res[0]['public_name'] == admin.display_name
+        assert res[0]['avatar_url'] is None
+
+        assert res[1]['user_id'] == test_user.user_id
+        assert res[1]['public_name'] == test_user.display_name
+        assert res[1]['avatar_url'] is None
+
+    def test_api__get_user__err_403__normal_user(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        transaction.commit()
+        user_id = int(test_user.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'test@test.test',
+                'pass'
+            )
+        )
+        self.testapp.get(
+            '/api/v2/users',
+            status=403
+        )
+
+
+class TestKnownMembersEndpoint(FunctionalTest):
+    # -*- coding: utf-8 -*-
+    """
+    Tests for GET /api/v2/users/{user_id}
+    """
+    fixtures = [BaseFixture]
+
+    def test_api__get_user__ok_200__admin__by_name(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        test_user2 = uapi.create_user(
+            email='test2@test2.test2',
+            password='pass',
+            name='bob2',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        uapi.save(test_user2)
+        transaction.commit()
+        user_id = int(admin.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'acp': 'bob',
+        }
+        res = self.testapp.get(
+            '/api/v2/users/{user_id}/known_members'.format(user_id=user_id),
+            status=200,
+            params=params,
+        )
+        res = res.json_body
+        assert len(res) == 2
+        assert res[0]['user_id'] == test_user.user_id
+        assert res[0]['public_name'] == test_user.display_name
+        assert res[0]['avatar_url'] is None
+
+        assert res[1]['user_id'] == test_user2.user_id
+        assert res[1]['public_name'] == test_user2.display_name
+        assert res[1]['avatar_url'] is None
+
+    def test_api__get_user__ok_200__admin__by_email(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        test_user2 = uapi.create_user(
+            email='test2@test2.test2',
+            password='pass',
+            name='bob2',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        uapi.save(test_user2)
+        transaction.commit()
+        user_id = int(admin.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'acp': 'test',
+        }
+        res = self.testapp.get(
+            '/api/v2/users/{user_id}/known_members'.format(user_id=user_id),
+            status=200,
+            params=params,
+        )
+        res = res.json_body
+        assert len(res) == 2
+        assert res[0]['user_id'] == test_user.user_id
+        assert res[0]['public_name'] == test_user.display_name
+        assert res[0]['avatar_url'] is None
+
+        assert res[1]['user_id'] == test_user2.user_id
+        assert res[1]['public_name'] == test_user2.display_name
+        assert res[1]['avatar_url'] is None
+
+    def test_api__get_user__err_403__admin__too_small_acp(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        test_user2 = uapi.create_user(
+            email='test2@test2.test2',
+            password='pass',
+            name='bob2',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        transaction.commit()
+        user_id = int(admin.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'acp': 't',
+        }
+        res = self.testapp.get(
+            '/api/v2/users/{user_id}/known_members'.format(user_id=user_id),
+            status=400,
+            params=params
+        )
+
+    def test_api__get_user__ok_200__normal_user_by_email(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        test_user2 = uapi.create_user(
+            email='test2@test2.test2',
+            password='pass',
+            name='bob2',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        test_user3 = uapi.create_user(
+            email='test3@test3.test3',
+            password='pass',
+            name='bob3',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        uapi.save(test_user2)
+        uapi.save(test_user3)
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+
+        )
+        workspace = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        ).create_workspace(
+            'test workspace',
+            save_now=True
+        )
+        role_api = RoleApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        role_api.create_one(test_user, workspace, UserRoleInWorkspace.READER, False)
+        role_api.create_one(test_user2, workspace, UserRoleInWorkspace.READER, False)
+        transaction.commit()
+        user_id = int(test_user.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'test@test.test',
+                'pass'
+            )
+        )
+        params = {
+            'acp': 'test',
+        }
+        res = self.testapp.get(
+            '/api/v2/users/{user_id}/known_members'.format(user_id=user_id),
+            status=200,
+            params=params
+        )
+        res = res.json_body
+        assert len(res) == 2
+        assert res[0]['user_id'] == test_user.user_id
+        assert res[0]['public_name'] == test_user.display_name
+        assert res[0]['avatar_url'] is None
+
+        assert res[1]['user_id'] == test_user2.user_id
+        assert res[1]['public_name'] == test_user2.display_name
+        assert res[1]['avatar_url'] is None
+
+
 class TestSetEmailEndpoint(FunctionalTest):
     # -*- coding: utf-8 -*-
     """
@@ -3024,6 +3398,12 @@ class TestSetPasswordEndpoint(FunctionalTest):
             status=204,
         )
         # Check After
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
         user = uapi.get_one(user_id)
         assert not user.validate_password('pass')
         assert user.validate_password('mynewpassword')
@@ -3079,6 +3459,12 @@ class TestSetPasswordEndpoint(FunctionalTest):
             params=params,
             status=403,
         )
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
         # Check After
         user = uapi.get_one(user_id)
         assert user.validate_password('pass')
@@ -3137,6 +3523,12 @@ class TestSetPasswordEndpoint(FunctionalTest):
             status=400,
         )
         # Check After
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
         user = uapi.get_one(user_id)
         assert user.validate_password('pass')
         assert not user.validate_password('mynewpassword')
@@ -3194,6 +3586,12 @@ class TestSetPasswordEndpoint(FunctionalTest):
             status=204,
         )
         # Check After
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
         user = uapi.get_one(user_id)
         assert not user.validate_password('pass')
         assert user.validate_password('mynewpassword')

backend/tracim_backend/tests/functional/test_workspaces.py

@@ -2,7 +2,7 @@
 """
 Tests for /api/v2/workspaces subpath endpoints.
 """
-
+import requests
 import transaction
 from depot.io.utils import FileIntent
 
@@ -10,7 +10,7 @@ from tracim_backend import models
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.models import get_tm_session
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.tests import FunctionalTest
 from tracim_backend.tests import set_html_document_slug_to_legacy
 from tracim_backend.fixtures.content import Content as ContentFixtures
@@ -41,8 +41,10 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'business'
         assert workspace['label'] == 'Business'
         assert workspace['description'] == 'All importants documents'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
+        # TODO - G.M - 2018-08-02 - Better test for sidebar entry, make it
+        # not fixed on active application/content-file
         sidebar_entry = workspace['sidebar_entries'][0]
         assert sidebar_entry['slug'] == 'dashboard'
         assert sidebar_entry['label'] == 'Dashboard'
@@ -65,33 +67,19 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "file-text-o"
 
         sidebar_entry = workspace['sidebar_entries'][3]
-        assert sidebar_entry['slug'] == 'contents/markdownpluspage'
-        assert sidebar_entry['label'] == 'Markdown Plus Documents'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=markdownpluspage"    # nopep8
-        assert sidebar_entry['hexcolor'] == "#f12d2d"
-        assert sidebar_entry['fa_icon'] == "file-code-o"
-
-        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/file'
         assert sidebar_entry['label'] == 'Files'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
         assert sidebar_entry['hexcolor'] == "#FF9900"
         assert sidebar_entry['fa_icon'] == "paperclip"
 
-        sidebar_entry = workspace['sidebar_entries'][5]
+        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/thread'
         assert sidebar_entry['label'] == 'Threads'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
         assert sidebar_entry['fa_icon'] == "comments-o"
 
-        sidebar_entry = workspace['sidebar_entries'][6]
-        assert sidebar_entry['slug'] == 'calendar'
-        assert sidebar_entry['label'] == 'Calendar'
-        assert sidebar_entry['route'] == "/#/workspaces/1/calendar"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#757575"
-        assert sidebar_entry['fa_icon'] == "calendar"
-
     def test_api__update_workspace__ok_200__nominal_case(self) -> None:
         """
         Test update workspace
@@ -118,7 +106,7 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'business'
         assert workspace['label'] == 'Business'
         assert workspace['description'] == 'All importants documents'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
         # modify workspace
         res = self.testapp.put_json(
@@ -132,7 +120,7 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'superworkspace'
         assert workspace['label'] == 'superworkspace'
         assert workspace['description'] == 'mysuperdescription'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
         # after
         res = self.testapp.get(
@@ -145,7 +133,7 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'superworkspace'
         assert workspace['label'] == 'superworkspace'
         assert workspace['description'] == 'mysuperdescription'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
     def test_api__update_workspace__err_400__empty_label(self) -> None:
         """
@@ -612,6 +600,89 @@ class TestWorkspaceMembersEndpoint(FunctionalTest):
         assert user_role['workspace_id'] == 1
 
 
+class TestUserInvitationWithMailActivatedSync(FunctionalTest):
+
+    fixtures = [BaseFixture, ContentFixtures]
+    config_section = 'functional_test_with_mail_test_sync'
+
+    def test_api__create_workspace_member_role__ok_200__new_user(self):  # nopep8
+        """
+        Create workspace member role
+        :return:
+        """
+        requests.delete('http://127.0.0.1:8025/api/v1/messages')
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        # create workspace role
+        params = {
+            'user_id': None,
+            'user_email_or_public_name': 'bob@bob.bob',
+            'role': 'content-manager',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/members',
+            status=200,
+            params=params,
+        )
+        user_role_found = res.json_body
+        assert user_role_found['role'] == 'content-manager'
+        assert user_role_found['user_id']
+        user_id = user_role_found['user_id']
+        assert user_role_found['workspace_id'] == 1
+        assert user_role_found['newly_created'] is True
+        assert user_role_found['email_sent'] is True
+
+        # check mail received
+        response = requests.get('http://127.0.0.1:8025/api/v1/messages')
+        response = response.json()
+        assert len(response) == 1
+        headers = response[0]['Content']['Headers']
+        assert headers['From'][0] == 'Tracim Notifications <test_user_from+0@localhost>'  # nopep8
+        assert headers['To'][0] == 'bob <bob@bob.bob>'
+        assert headers['Subject'][0] == '[TRACIM] Created account'
+
+        # TODO - G.M - 2018-08-02 - Place cleanup outside of the test
+        requests.delete('http://127.0.0.1:8025/api/v1/messages')
+
+
+class TestUserInvitationWithMailActivatedASync(FunctionalTest):
+
+    fixtures = [BaseFixture, ContentFixtures]
+    config_section = 'functional_test_with_mail_test_async'
+
+    def test_api__create_workspace_member_role__ok_200__new_user(self):  # nopep8
+        """
+        Create workspace member role
+        :return:
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        # create workspace role
+        params = {
+            'user_id': None,
+            'user_email_or_public_name': 'bob@bob.bob',
+            'role': 'content-manager',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/members',
+            status=200,
+            params=params,
+        )
+        user_role_found = res.json_body
+        assert user_role_found['newly_created'] is True
+        assert user_role_found['email_sent'] is False
+
+
 class TestWorkspaceContents(FunctionalTest):
     """
     Tests for /api/v2/workspaces/{workspace_id}/contents endpoint
@@ -983,9 +1054,9 @@ class TestWorkspaceContents(FunctionalTest):
             session=dbsession,
             config=self.app_config
         )
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_thread = content_api.create(
-            content_type=ContentType.Thread,
+            content_type_slug=CONTENT_TYPES.Thread.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test Thread',
@@ -995,7 +1066,7 @@ class TestWorkspaceContents(FunctionalTest):
         test_thread.description = 'Thread description'
         dbsession.add(test_thread)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1009,16 +1080,16 @@ class TestWorkspaceContents(FunctionalTest):
             'text/plain',
         )
         test_page_legacy = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=business_workspace,
             label='test_page',
             do_save=False,
             do_notify=False,
         )
-        test_page_legacy.type = ContentType.PageLegacy
+        test_page_legacy.type = 'page'
         content_api.update_content(test_page_legacy, 'test_page', '<p>PAGE</p>')
         test_html_document = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=business_workspace,
             label='test_html_page',
             do_save=False,
@@ -1078,9 +1149,9 @@ class TestWorkspaceContents(FunctionalTest):
             session=dbsession,
             config=self.app_config
         )
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_thread = content_api.create(
-            content_type=ContentType.Thread,
+            content_type_slug=CONTENT_TYPES.Thread.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test Thread',
@@ -1090,7 +1161,7 @@ class TestWorkspaceContents(FunctionalTest):
         test_thread.description = 'Thread description'
         dbsession.add(test_thread)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1104,17 +1175,17 @@ class TestWorkspaceContents(FunctionalTest):
             'text/plain',
         )
         test_page_legacy = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='test_page',
             do_save=False,
             do_notify=False,
         )
-        test_page_legacy.type = ContentType.PageLegacy
+        test_page_legacy.type = 'page'
         content_api.update_content(test_page_legacy, 'test_page', '<p>PAGE</p>')
         test_html_document = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='test_html_page',
@@ -1180,7 +1251,7 @@ class TestWorkspaceContents(FunctionalTest):
             'show_archived': 1,
             'show_deleted': 1,
             'show_active': 1,
-            'content_type': 'any'
+         #   'content_type': 'any'
         }
         self.testapp.authorization = (
             'Basic',
@@ -1438,7 +1509,7 @@ class TestWorkspaceContents(FunctionalTest):
         params = {
             'parent_id': None,
             'label': 'GenericCreatedContent',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',
@@ -1449,7 +1520,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert res.json_body
         assert res.json_body['status'] == 'open'
         assert res.json_body['content_id']
-        assert res.json_body['content_type'] == 'markdownpage'
+        assert res.json_body['content_type'] == 'html-document'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
@@ -1480,7 +1551,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'label': 'GenericCreatedContent',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',
@@ -1491,7 +1562,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert res.json_body
         assert res.json_body['status'] == 'open'
         assert res.json_body['content_id']
-        assert res.json_body['content_type'] == 'markdownpage'
+        assert res.json_body['content_type'] == 'html-document'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
@@ -1544,7 +1615,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'label': 'GenericCreatedContent',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
             'parent_id': 10,
         }
         res = self.testapp.post_json(
@@ -1556,7 +1627,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert res.json_body
         assert res.json_body['status'] == 'open'
         assert res.json_body['content_id']
-        assert res.json_body['content_type'] == 'markdownpage'
+        assert res.json_body['content_type'] == 'html-document'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
@@ -1587,7 +1658,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'label': '',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',

backend/tracim_backend/tests/library/test_content_api.py

@@ -14,6 +14,7 @@ from tracim_backend.exceptions import SameValueError
 from tracim_backend.lib.core.workspace import RoleApi
 # TODO - G.M - 28-03-2018 - [WorkspaceApi] Re-enable WorkspaceApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models.auth import User
 from tracim_backend.models.auth import Group
@@ -22,7 +23,6 @@ from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.data import ContentRevisionRO
 from tracim_backend.models.data import Workspace
 from tracim_backend.models.data import Content
-from tracim_backend.models.data import ContentType
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.fixtures.users_and_groups import Test as FixtureTest
 from tracim_backend.tests import DefaultTest
@@ -129,14 +129,14 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         item = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='not_deleted',
             do_save=True
         )
         item2 = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='to_delete',
@@ -159,10 +159,10 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(2, len(items))
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
                 session=self.session,
                 tm=transaction.manager,
@@ -184,7 +184,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(1, len(items))
         transaction.commit()
 
@@ -202,7 +202,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
             show_deleted=True,
         )
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(2, len(items))
 
     def test_archive(self):
@@ -240,14 +240,14 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         item = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='not_archived',
             do_save=True
         )
         item2 = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='to_archive',
@@ -269,10 +269,10 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(2, len(items))
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
                 session=self.session,
                 tm=transaction.manager,
@@ -295,7 +295,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(1, len(items))
         transaction.commit()
 
@@ -320,7 +320,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
             show_archived=True,
         )
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(2, len(items))
 
     def test_get_all_with_filter(self):
@@ -358,14 +358,14 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         item = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='thefolder',
             do_save=True
         )
         item2 = api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=workspace,
             parent=None,
             label='thefile',
@@ -389,14 +389,14 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(2, len(items))
 
-        items2 = api.get_all(None, ContentType.File, workspace)
+        items2 = api.get_all(None, CONTENT_TYPES.File.slug, workspace)
         eq_(1, len(items2))
         eq_('thefile', items2[0].label)
 
-        items3 = api.get_all(None, ContentType.Folder, workspace)
+        items3 = api.get_all(None, CONTENT_TYPES.Folder.slug, workspace)
         eq_(1, len(items3))
         eq_('thefolder', items3[0].label)
 
@@ -428,21 +428,21 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         item = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'parent',
             do_save=True,
         )
         item2 = api.create(
-            ContentType.File,
+            CONTENT_TYPES.File.slug,
             workspace,
             item,
             'file1',
             do_save=True,
         )
         item3 = api.create(
-            ContentType.File,
+            CONTENT_TYPES.File.slug,
             workspace,
             None,
             'file2',
@@ -468,10 +468,10 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(3, len(items))
 
-        items2 = api.get_all(parent_id, ContentType.File, workspace)
+        items2 = api.get_all(parent_id, CONTENT_TYPES.File.slug, workspace)
         eq_(1, len(items2))
         eq_(child_id, items2[0].content_id)
 
@@ -506,7 +506,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        c = api.create(ContentType.Folder, workspace, None, 'parent', '', True)
+        c = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'parent', '', True)
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -546,7 +546,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        c = api.create(ContentType.Folder, workspace, None, 'parent', '', True)
+        c = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'parent', '', True)
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -591,14 +591,14 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        p = api.create(ContentType.Page, workspace, None, 'this_is_a_page')
+        p = api.create(CONTENT_TYPES.Page.slug, workspace, None, 'this_is_a_page')
         c = api.create_comment(workspace, p, 'this is the comment', True)
 
         eq_(Content, c.__class__)
         eq_(p.content_id, c.parent_id)
         eq_(user, c.owner)
         eq_(workspace, c.workspace)
-        eq_(ContentType.Comment, c.type)
+        eq_(CONTENT_TYPES.Comment.slug, c.type)
         eq_('this is the comment', c.description)
         eq_('', c.label)
         eq_(ActionDescription.COMMENT, c.revision_type)
@@ -652,7 +652,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         foldera = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'folder a',
@@ -661,7 +661,7 @@ class TestContentApi(DefaultTest):
         )
         with self.session.no_autoflush:
             text_file = api.create(
-                content_type=ContentType.File,
+                content_type_slug=CONTENT_TYPES.File.slug,
                 workspace=workspace,
                 parent=foldera,
                 label='test_file',
@@ -689,7 +689,7 @@ class TestContentApi(DefaultTest):
             save_now=True
         )
         folderb = api2.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace2,
             None,
             'folder b',
@@ -773,7 +773,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         foldera = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'folder a',
@@ -782,7 +782,7 @@ class TestContentApi(DefaultTest):
         )
         with self.session.no_autoflush:
             text_file = api.create(
-                content_type=ContentType.File,
+                content_type_slug=CONTENT_TYPES.File.slug,
                 workspace=workspace,
                 parent=foldera,
                 label='test_file',
@@ -810,7 +810,7 @@ class TestContentApi(DefaultTest):
             save_now=True
         )
         folderb = api2.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace2,
             None,
             'folder b',
@@ -891,7 +891,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         foldera = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'folder a',
@@ -900,7 +900,7 @@ class TestContentApi(DefaultTest):
         )
         with self.session.no_autoflush:
             text_file = api.create(
-                content_type=ContentType.File,
+                content_type_slug=CONTENT_TYPES.File.slug,
                 workspace=workspace,
                 parent=foldera,
                 label='test_file',
@@ -1014,13 +1014,13 @@ class TestContentApi(DefaultTest):
 
         # Creates page_1 & page_2 in workspace 1
         #     and page_3 & page_4 in workspace 2
-        page_1 = cont_api_a.create(ContentType.Page, workspace1, None,
+        page_1 = cont_api_a.create(CONTENT_TYPES.Page.slug, workspace1, None,
                                    'this is a page', do_save=True)
-        page_2 = cont_api_a.create(ContentType.Page, workspace1, None,
+        page_2 = cont_api_a.create(CONTENT_TYPES.Page.slug, workspace1, None,
                                    'this is page1', do_save=True)
-        page_3 = cont_api_a.create(ContentType.Thread, workspace2, None,
+        page_3 = cont_api_a.create(CONTENT_TYPES.Thread.slug, workspace2, None,
                                    'this is page2', do_save=True)
-        page_4 = cont_api_a.create(ContentType.File, workspace2, None,
+        page_4 = cont_api_a.create(CONTENT_TYPES.File.slug, workspace2, None,
                                    'this is page3', do_save=True)
 
         for rev in page_1.revisions:
@@ -1118,7 +1118,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        page_1 = cont_api_a.create(ContentType.Page, workspace, None,
+        page_1 = cont_api_a.create(CONTENT_TYPES.Page.slug, workspace, None,
                                    'this is a page', do_save=True)
 
         for rev in page_1.revisions:
@@ -1187,21 +1187,21 @@ class TestContentApi(DefaultTest):
         )
 
         page_2 = cont_api_a.create(
-            ContentType.Page,
+            CONTENT_TYPES.Page.slug,
             workspace,
             None,
             'this is page1',
             do_save=True
         )
         page_3 = cont_api_a.create(
-            ContentType.Thread,
+            CONTENT_TYPES.Thread.slug,
             workspace,
             None,
             'this is page2',
             do_save=True
         )
         page_4 = cont_api_a.create(
-            ContentType.File,
+            CONTENT_TYPES.File.slug,
             workspace,
             None,
             'this is page3',
@@ -1285,7 +1285,7 @@ class TestContentApi(DefaultTest):
         )
 
         p = api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=workspace,
             parent=None,
             label='this_is_a_page',
@@ -1312,7 +1312,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        content = api.get_one(pcid, ContentType.Any, workspace)
+        content = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
@@ -1326,7 +1326,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        content2 = api2.get_one(pcid, ContentType.Any, workspace)
+        content2 = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
            session=self.session,
            tm=transaction.manager,
@@ -1353,7 +1353,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        updated = api.get_one(pcid, ContentType.Any, workspace)
+        updated = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u2id, updated.owner_id,
             'the owner id should be {} (found {})'.format(u2id,
                                                           updated.owner_id))
@@ -1412,7 +1412,7 @@ class TestContentApi(DefaultTest):
         )
         with self.session.no_autoflush:
             page = api.create(
-                content_type=ContentType.Page,
+                content_type_slug=CONTENT_TYPES.Page.slug,
                 workspace=workspace,
                 label="same_content",
                 do_save=False
@@ -1426,7 +1426,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        content2 = api2.get_one(page.content_id, ContentType.Any, workspace)
+        content2 = api2.get_one(page.content_id, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
            session=self.session,
            tm=transaction.manager,
@@ -1495,7 +1495,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         p = api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=workspace,
             parent=None,
             label='this_is_a_page',
@@ -1524,7 +1524,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        content = api.get_one(pcid, ContentType.Any, workspace)
+        content = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
@@ -1538,7 +1538,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        content2 = api2.get_one(pcid, ContentType.Any, workspace)
+        content2 = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -1561,7 +1561,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         ).get_one(wid)
 
-        updated = api.get_one(pcid, ContentType.Any, workspace)
+        updated = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u2id, updated.owner_id,
             'the owner id should be {} (found {})'.format(u2id,
                                                           updated.owner_id))
@@ -1622,7 +1622,7 @@ class TestContentApi(DefaultTest):
         )
         with self.session.no_autoflush:
             page = api.create(
-                content_type=ContentType.Page,
+                content_type_slug=CONTENT_TYPES.Page.slug,
                 workspace=workspace,
                 label="same_content",
                 do_save=False
@@ -1641,7 +1641,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        content2 = api2.get_one(page.content_id, ContentType.Any, workspace)
+        content2 = api2.get_one(page.content_id, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -1713,7 +1713,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         p = api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=workspace,
             parent=None,
             label='this_is_a_page',
@@ -1741,7 +1741,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         ).get_one(wid)
 
-        content = api.get_one(pcid, ContentType.Any, workspace)
+        content = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
@@ -1757,7 +1757,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
             show_archived=True,
         )
-        content2 = api2.get_one(pcid, ContentType.Any, workspace)
+        content2 = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
                 session=self.session,
                 tm=transaction.manager,
@@ -1796,7 +1796,7 @@ class TestContentApi(DefaultTest):
             show_archived=True,
         )
 
-        updated = api2.get_one(pcid, ContentType.Any, workspace)
+        updated = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u2id, updated.owner_id,
             'the owner id should be {} (found {})'.format(u2id,
                                                           updated.owner_id))
@@ -1805,7 +1805,7 @@ class TestContentApi(DefaultTest):
 
         ####
 
-        updated2 = api.get_one(pcid, ContentType.Any, workspace)
+        updated2 = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -1874,7 +1874,7 @@ class TestContentApi(DefaultTest):
             show_deleted=True,
         )
         p = api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=workspace,
             parent=None,
             label='this_is_a_page',
@@ -1900,7 +1900,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         ).get_one(wid)
 
-        content = api.get_one(pcid, ContentType.Any, workspace)
+        content = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
@@ -1915,7 +1915,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
             show_deleted=True,
         )
-        content2 = api2.get_one(pcid, ContentType.Any, workspace)
+        content2 = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
                 session=self.session,
                 tm=transaction.manager,
@@ -1956,7 +1956,7 @@ class TestContentApi(DefaultTest):
             show_deleted=True
         )
 
-        updated = api2.get_one(pcid, ContentType.Any, workspace)
+        updated = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u2id, updated.owner_id,
             'the owner id should be {} (found {})'.format(u2id,
                                                           updated.owner_id))
@@ -1965,7 +1965,7 @@ class TestContentApi(DefaultTest):
 
         ####
 
-        updated2 = api.get_one(pcid, ContentType.Any, workspace)
+        updated2 = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
             tm=transaction.manager,
             session=self.session,
@@ -2016,14 +2016,14 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -2032,11 +2032,11 @@ class TestContentApi(DefaultTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
 
-        content_workspace_2 = api.create(ContentType.Page, workspace2 ,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2 ,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         last_actives = api.get_last_active()
         assert len(last_actives) == 9
         # workspace_2 content
@@ -2088,13 +2088,13 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -2103,8 +2103,8 @@ class TestContentApi(DefaultTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
 
         last_actives = api.get_last_active(workspace=workspace)
@@ -2153,13 +2153,13 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -2168,8 +2168,8 @@ class TestContentApi(DefaultTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
 
         selected_contents = [
@@ -2228,13 +2228,13 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -2243,8 +2243,8 @@ class TestContentApi(DefaultTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
 
         last_actives = api.get_last_active(workspace=workspace, limit=2)  # nopep8
@@ -2309,13 +2309,13 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -2324,8 +2324,8 @@ class TestContentApi(DefaultTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
 
         last_actives = api.get_last_active(workspace=workspace2)
@@ -2366,9 +2366,9 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        a = api.create(ContentType.Folder, workspace, None,
+        a = api.create(CONTENT_TYPES.Folder.slug, workspace, None,
                        'this is randomized folder', '', True)
-        p = api.create(ContentType.Page, workspace, a,
+        p = api.create(CONTENT_TYPES.Page.slug, workspace, a,
                        'this is randomized label content', '', True)
 
         with new_revision(
@@ -2422,9 +2422,9 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        a = api.create(ContentType.Folder, workspace, None,
+        a = api.create(CONTENT_TYPES.Folder.slug, workspace, None,
                        'this is randomized folder', '', True)
-        p = api.create(ContentType.Page, workspace, a,
+        p = api.create(CONTENT_TYPES.Page.slug, workspace, a,
                        'this is dummy label content', '', True)
 
         with new_revision(
@@ -2476,21 +2476,21 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         a = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='this is randomized folder',
             do_save=True
         )
         p1 = api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=workspace,
             parent=a,
             label='this is dummy label content',
             do_save=True
         )
         p2 = api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=workspace,
             parent=a,
             label='Hey ! Jon !',
@@ -2540,22 +2540,22 @@ class TestContentApi(DefaultTest):
         folder_1 = self._create_content_and_test(
             'folder_1',
             workspace=workspace,
-            type=ContentType.Folder
+            type=CONTENT_TYPES.Folder.slug
         )
         folder_2 = self._create_content_and_test(
             'folder_2',
             workspace=workspace,
-            type=ContentType.Folder
+            type=CONTENT_TYPES.Folder.slug
         )
         page_1 = self._create_content_and_test(
             'foo', workspace=workspace,
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             parent=folder_1
         )
         page_2 = self._create_content_and_test(
             'bar',
             workspace=workspace,
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             parent=folder_2
         )
 
@@ -2636,7 +2636,7 @@ class TestContentApiSecurity(DefaultTest):
             session=self.session,
             config=self.app_config,
         ).create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=bob_workspace,
             label='bob_page',
             do_save=True,
@@ -2647,7 +2647,7 @@ class TestContentApiSecurity(DefaultTest):
             session=self.session,
             config=self.app_config,
         ).create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=admin_workspace,
             label='admin_page',
             do_save=True,

backend/tracim_backend/tests/library/test_user_api.py

@@ -1,14 +1,19 @@
 # -*- coding: utf-8 -*-
 import pytest
 import transaction
+from tracim_backend import models
 
 from tracim_backend.exceptions import AuthenticationFailed
+from tracim_backend.exceptions import TooShortAutocompleteString
 from tracim_backend.exceptions import UserDoesNotExist
 from tracim_backend.exceptions import UserNotActive
 from tracim_backend.lib.core.group import GroupApi
 from tracim_backend.lib.core.user import UserApi
+from tracim_backend.lib.core.userworkspace import RoleApi
+from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.models import User
 from tracim_backend.models.context_models import UserInContext
+from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.tests import DefaultTest
 from tracim_backend.tests import eq_
 
@@ -107,6 +112,184 @@ class TestUserApi(DefaultTest):
         # u1 + Admin user from BaseFixture
         assert 2 == len(users)
 
+    def test_unit__get_known__user__admin__too_short_acp_str(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+        with pytest.raises(TooShortAutocompleteString):
+            api.get_known_user('e')
+
+    def test_unit__get_known__user__admin__by_email(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+
+        users = api.get_known_user('email')
+        assert len(users) == 1
+        assert users[0] == u1
+
+    def test_unit__get_known__user__user__no_workspace_empty_known_user(self):
+        admin = self.session.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        api = UserApi(
+            current_user=admin,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+        api2 = UserApi(
+            current_user=u1,
+            session=self.session,
+            config=self.config,
+        )
+        users = api2.get_known_user('email')
+        assert len(users) == 0
+
+    def test_unit__get_known__user__same_workspaces_users_by_name(self):
+        admin = self.session.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+        u2 = api.create_user(
+            email='email2@email2',
+            name='name2',
+            do_notify=False,
+            do_save=True,
+        )
+        u3 = api.create_user(
+            email='notfound@notfound',
+            name='notfound',
+            do_notify=False,
+            do_save=True,
+        )
+        wapi = WorkspaceApi(
+            current_user=admin,
+            session=self.session,
+            config=self.app_config,
+        )
+        workspace = wapi.create_workspace(
+            'test workspace n°1',
+            save_now=True)
+        role_api = RoleApi(
+            current_user=admin,
+            session=self.session,
+            config=self.app_config,
+        )
+        role_api.create_one(u1, workspace, UserRoleInWorkspace.READER, False)
+        role_api.create_one(u2, workspace, UserRoleInWorkspace.READER, False)
+        role_api.create_one(u3, workspace, UserRoleInWorkspace.READER, False)
+        api2 = UserApi(
+            current_user=u1,
+            session=self.session,
+            config=self.config,
+        )
+        users = api2.get_known_user('name')
+        assert len(users) == 2
+        assert users[0] == u1
+        assert users[1] == u2
+
+    def test_unit__get_known__user__same_workspaces_users_by_email(self):
+        admin = self.session.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+        u2 = api.create_user(
+            email='email2@email2',
+            name='name2',
+            do_notify=False,
+            do_save=True,
+        )
+        u3 = api.create_user(
+            email='notfound@notfound',
+            name='notfound',
+            do_notify=False,
+            do_save=True,
+        )
+        wapi = WorkspaceApi(
+            current_user=admin,
+            session=self.session,
+            config=self.app_config,
+        )
+        workspace = wapi.create_workspace(
+            'test workspace n°1',
+            save_now=True)
+        role_api = RoleApi(
+            current_user=admin,
+            session=self.session,
+            config=self.app_config,
+        )
+        role_api.create_one(u1, workspace, UserRoleInWorkspace.READER, False)
+        role_api.create_one(u2, workspace, UserRoleInWorkspace.READER, False)
+        role_api.create_one(u3, workspace, UserRoleInWorkspace.READER, False)
+        api2 = UserApi(
+            current_user=u1,
+            session=self.session,
+            config=self.config,
+        )
+        users = api2.get_known_user('email')
+        assert len(users) == 2
+        assert users[0] == u1
+        assert users[1] == u2
+
+    def test_unit__get_known__user__admin__by_name(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+
+        users = api.get_known_user('nam')
+        assert len(users) == 1
+        assert users[0] == u1
+
     def test_unit__get_one__ok__nominal_case(self):
         api = UserApi(
             current_user=None,

backend/tracim_backend/tests/library/test_webdav.py

@@ -29,6 +29,7 @@ class TestWebdavFactory(StandardTest):
         :return:
         """
         tracim_settings = {
+            'website.base_url': 'http://localhost:6543',
             'sqlalchemy.url': 'sqlite:///:memory:',
             'user.auth_token.validity': '604800',
             'depot_storage_dir': '/tmp/test/depot',

backend/tracim_backend/tests/library/tests_utils.py

@@ -0,0 +1,14 @@
+import string
+
+from tracim_backend.lib.utils.utils import password_generator
+from tracim_backend.lib.utils.utils import ALLOWED_AUTOGEN_PASSWORD_CHAR
+from tracim_backend.lib.utils.utils import DEFAULT_PASSWORD_GEN_CHAR_LENGTH
+
+
+class TestPasswordGenerator(object):
+
+    def test_password_generator_ok_nominal_case(self):
+        password = password_generator()
+        assert len(password) == DEFAULT_PASSWORD_GEN_CHAR_LENGTH
+        for char in password:
+            assert char in ALLOWED_AUTOGEN_PASSWORD_CHAR

backend/tracim_backend/tests/models/test_content.py

@@ -15,7 +15,7 @@ from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models import User
 from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.data import ContentRevisionRO
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import Workspace
 from tracim_backend.tests import StandardTest
 
@@ -95,7 +95,7 @@ class TestContent(StandardTest):
 
         content1_from_api = api.get_one(
             content1.id,
-            ContentType.Page,
+            CONTENT_TYPES.Page.slug,
             workspace1
         )
 
@@ -196,7 +196,7 @@ class TestContent(StandardTest):
         first_content = self._create_content(
             owner=user_admin,
             workspace=workspace,
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             label='TEST_CONTENT_1',
             description='TEST_CONTENT_DESCRIPTION_1',
             revision_type=ActionDescription.CREATION,
@@ -221,7 +221,7 @@ class TestContent(StandardTest):
         second_content = self._create_content(
             owner=user_admin,
             workspace=workspace,
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             label='TEST_CONTENT_2',
             description='TEST_CONTENT_DESCRIPTION_2',
             revision_type=ActionDescription.CREATION
@@ -268,7 +268,7 @@ class TestContent(StandardTest):
         created_content = self._create_content(
             owner=user_admin,
             workspace=workspace,
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             label='TEST_CONTENT_%s' % key,
             description='TEST_CONTENT_DESCRIPTION_%s' % key,
             revision_type=ActionDescription.CREATION
@@ -308,7 +308,7 @@ class TestContent(StandardTest):
         content = self._create_content(
             owner=user_admin,
             workspace=workspace,
-            type=ContentType.File,
+            type=CONTENT_TYPES.File.slug,
             label='TEST_CONTENT_1',
             description='TEST_CONTENT_DESCRIPTION_1',
             revision_type=ActionDescription.CREATION,

backend/tracim_backend/tests/models/test_content_revision.py

@@ -5,10 +5,11 @@ from sqlalchemy import inspect
 
 from tracim_backend.models import ContentRevisionRO
 from tracim_backend.models import User
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.tests import DefaultTest
 from tracim_backend.tests import eq_
 
+
 class TestContentRevision(DefaultTest):
 
     def _new_from(self, revision):
@@ -47,14 +48,14 @@ class TestContentRevision(DefaultTest):
         folder = self._create_content_and_test(
             name='folder_1',
             workspace=workspace,
-            type=ContentType.Folder
+            type=CONTENT_TYPES.Folder.slug
         )
         page = self._create_content_and_test(
             workspace=workspace,
             parent=folder,
             name='file_1',
             description='content of file_1',
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             owner=admin
         )
 

backend/tracim_backend/views/contents_api/comment_controller.py

@@ -20,7 +20,7 @@ from tracim_backend.views.core_api.schemas import SetCommentSchema
 from tracim_backend.views.core_api.schemas import WorkspaceAndContentIdPathSchema
 from tracim_backend.views.core_api.schemas import NoContentSchema
 from tracim_backend.exceptions import EmptyCommentContentNotAllowed
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models.data import UserRoleInWorkspace
 
@@ -41,13 +41,15 @@ class CommentController(Controller):
         # login = hapic_data.body
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         comments = content.get_comments()
         comments.sort(key=lambda comment: comment.created)
@@ -68,13 +70,15 @@ class CommentController(Controller):
         # login = hapic_data.body
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         comment = api.create_comment(
             content.workspace,
@@ -97,6 +101,8 @@ class CommentController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -109,12 +115,12 @@ class CommentController(Controller):
         workspace = wapi.get_one(hapic_data.path.workspace_id)
         parent = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any,
+            content_type=CONTENT_TYPES.Any_SLUG,
             workspace=workspace
         )
         comment = api.get_one(
             hapic_data.path.comment_id,
-            content_type=ContentType.Comment,
+            content_type=CONTENT_TYPES.Comment.slug,
             workspace=workspace,
             parent=parent,
         )

backend/tracim_backend/views/contents_api/file_controller.py

@@ -32,7 +32,7 @@ from tracim_backend.lib.utils.authorization import require_workspace_role
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.context_models import ContentInContext
 from tracim_backend.models.context_models import RevisionInContext
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.contents import file_type
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.exceptions import EmptyLabelNotAllowed
@@ -61,13 +61,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         file = request.POST['files']
         with new_revision(
@@ -95,13 +97,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         file = DepotManager.get().get(content.depot_file)
         response = request.response
@@ -120,13 +124,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revision = api.get_one_revision(
             revision_id=hapic_data.path.revision_id,
@@ -154,13 +160,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         pdf_preview_path = api.get_pdf_preview_path(
             content.content_id,
@@ -181,13 +189,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         pdf_preview_path = api.get_full_pdf_preview_path(content.revision_id)
         return FileResponse(pdf_preview_path)
@@ -205,13 +215,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revision = api.get_one_revision(
             revision_id=hapic_data.path.revision_id,
@@ -238,13 +250,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         allowed_dim = api.get_jpg_preview_allowed_dim()
         jpg_preview_path = api.get_jpg_preview_path(
@@ -270,13 +284,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         jpg_preview_path = api.get_jpg_preview_path(
             content_id=content.content_id,
@@ -301,13 +317,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revision = api.get_one_revision(
             revision_id=hapic_data.path.revision_id,
@@ -334,6 +352,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -352,13 +372,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         return api.get_content_in_context(content)
 
@@ -375,13 +397,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,
@@ -413,13 +437,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revisions = content.revisions
         return [
@@ -440,13 +466,15 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,

backend/tracim_backend/views/contents_api/html_document_controller.py

@@ -26,7 +26,7 @@ from tracim_backend.lib.utils.authorization import require_workspace_role
 from tracim_backend.exceptions import EmptyLabelNotAllowed
 from tracim_backend.models.context_models import ContentInContext
 from tracim_backend.models.context_models import RevisionInContext
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.contents import html_documents_type
 from tracim_backend.models.revision_protection import new_revision
 
@@ -46,13 +46,15 @@ class HTMLDocumentController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         return api.get_content_in_context(content)
 
@@ -69,13 +71,15 @@ class HTMLDocumentController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,
@@ -107,13 +111,15 @@ class HTMLDocumentController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revisions = content.revisions
         return [
@@ -138,13 +144,15 @@ class HTMLDocumentController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,

backend/tracim_backend/views/contents_api/threads_controller.py

@@ -25,7 +25,7 @@ from tracim_backend.lib.utils.authorization import require_workspace_role
 from tracim_backend.exceptions import EmptyLabelNotAllowed
 from tracim_backend.models.context_models import ContentInContext
 from tracim_backend.models.context_models import RevisionInContext
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.contents import thread_type
 from tracim_backend.models.revision_protection import new_revision
 
@@ -45,13 +45,15 @@ class ThreadController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         return api.get_content_in_context(content)
 
@@ -68,13 +70,15 @@ class ThreadController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,
@@ -106,13 +110,15 @@ class ThreadController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revisions = content.revisions
         return [
@@ -132,13 +138,15 @@ class ThreadController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,

backend/tracim_backend/views/core_api/schemas.py

@@ -2,15 +2,17 @@
 import marshmallow
 from marshmallow import post_load
 from marshmallow.validate import OneOf
+from marshmallow.validate import Length
 from marshmallow.validate import Range
 
 from tracim_backend.lib.utils.utils import DATETIME_FORMAT
 from tracim_backend.models.auth import Profile
 from tracim_backend.models.contents import GlobalStatus
+from tracim_backend.models.contents import CONTENT_STATUS
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.contents import open_status
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
-from tracim_backend.models.contents import ContentStatusLegacy as ContentStatus
 from tracim_backend.models.context_models import ActiveContentFilter
+from tracim_backend.models.context_models import AutocompleteQuery
 from tracim_backend.models.context_models import ContentIdsQuery
 from tracim_backend.models.context_models import UserWorkspaceAndContentPath
 from tracim_backend.models.context_models import ContentCreation
@@ -46,7 +48,7 @@ class UserDigestSchema(marshmallow.Schema):
     user_id = marshmallow.fields.Int(dump_only=True, example=3)
     avatar_url = marshmallow.fields.Url(
         allow_none=True,
-        example="/api/v2/assets/avatars/suri-cate.jpg",
+        example="/api/v2/asset/avatars/suri-cate.jpg",
         description="avatar_url is the url to the image file. "
                     "If no avatar, then set it to null "
                     "(and frontend will interpret this with a default avatar)",
@@ -292,6 +294,17 @@ class CommentsPathSchema(WorkspaceAndContentIdPathSchema):
         return CommentPath(**data)
 
 
+class AutocompleteQuerySchema(marshmallow.Schema):
+    acp = marshmallow.fields.Str(
+        example='test',
+        description='search text to query',
+        validate=Length(min=2),
+    )
+    @post_load
+    def make_autocomplete(self, data):
+        return AutocompleteQuery(**data)
+
+
 class PageQuerySchema(marshmallow.Schema):
     page = marshmallow.fields.Int(
         example=2,
@@ -342,9 +355,9 @@ class FilterContentQuerySchema(marshmallow.Schema):
         validate=Range(min=0, max=1, error="Value must be 0 or 1"),
     )
     content_type = marshmallow.fields.String(
-        example=ContentType.Any,
-        default=ContentType.Any,
-        validate=OneOf(ContentType.allowed_type_values())
+        example=CONTENT_TYPES.Any_SLUG,
+        default=CONTENT_TYPES.Any_SLUG,
+        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug())
     )
 
     @post_load
@@ -594,7 +607,7 @@ class StatusSchema(marshmallow.Schema):
 class ContentTypeSchema(marshmallow.Schema):
     slug = marshmallow.fields.String(
         example='pagehtml',
-        validate=OneOf(ContentType.allowed_types()),
+        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
     )
     fa_icon = marshmallow.fields.String(
         example='fa-file-text-o',
@@ -648,7 +661,7 @@ class ContentCreationSchema(marshmallow.Schema):
     )
     content_type = marshmallow.fields.String(
         example='html-document',
-        validate=OneOf(ContentType.allowed_types_for_folding()),  # nopep8
+        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
     )
     parent_id = marshmallow.fields.Integer(
         example=35,
@@ -683,12 +696,12 @@ class ContentDigestSchema(marshmallow.Schema):
     label = marshmallow.fields.Str(example='Intervention Report 12')
     content_type = marshmallow.fields.Str(
         example='html-document',
-        validate=OneOf(ContentType.allowed_types()),
+        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
     )
     sub_content_types = marshmallow.fields.List(
         marshmallow.fields.String(
             example='html-content',
-            validate=OneOf(ContentType.allowed_types())
+            validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug())
         ),
         description='list of content types allowed as sub contents. '
                     'This field is required for folder contents, '
@@ -696,7 +709,7 @@ class ContentDigestSchema(marshmallow.Schema):
     )
     status = marshmallow.fields.Str(
         example='closed-deprecated',
-        validate=OneOf(ContentStatus.allowed_values()),
+        validate=OneOf(CONTENT_STATUS.get_all_slugs_values()),
         description='this slug is found in content_type available statuses',
         default=open_status
     )
@@ -721,6 +734,7 @@ class ReadStatusSchema(marshmallow.Schema):
 # Content
 #####
 
+
 class ContentSchema(ContentDigestSchema):
     current_revision_id = marshmallow.fields.Int(example=12)
     created = marshmallow.fields.DateTime(
@@ -840,7 +854,7 @@ class FileContentModifySchema(TextBasedContentModifySchema):
 class SetContentStatusSchema(marshmallow.Schema):
     status = marshmallow.fields.Str(
         example='closed-deprecated',
-        validate=OneOf(ContentStatus.allowed_values()),
+        validate=OneOf(CONTENT_STATUS.get_all_slugs_values()),
         description='this slug is found in content_type available statuses',
         default=open_status,
         required=True,

backend/tracim_backend/views/core_api/system_controller.py

@@ -5,7 +5,7 @@ from tracim_backend.exceptions import InsufficientUserProfile
 from tracim_backend.lib.utils.authorization import require_profile
 from tracim_backend.models import Group
 from tracim_backend.models.applications import applications
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 
 try:  # Python 3.5+
     from http import HTTPStatus
@@ -39,8 +39,8 @@ class SystemController(Controller):
         """
         Get list of alls content types availables in this tracim instance.
         """
-        content_types_slugs = ContentType.allowed_types_for_folding()
-        content_types = [ContentType(slug) for slug in content_types_slugs]
+        content_types_slugs = CONTENT_TYPES.endpoint_allowed_types_slug()
+        content_types = [CONTENT_TYPES.get_one_by_slug(slug) for slug in content_types_slugs]
         return content_types
 
     def bind(self, configurator: Configurator) -> None:

backend/tracim_backend/views/core_api/user_controller.py

@@ -1,4 +1,5 @@
 from pyramid.config import Configurator
+
 try:  # Python 3.5+
     from http import HTTPStatus
 except ImportError:
@@ -11,13 +12,14 @@ from tracim_backend.lib.core.group import GroupApi
 from tracim_backend.lib.core.user import UserApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.lib.core.content import ContentApi
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
 from tracim_backend.views.controllers import Controller
 from tracim_backend.lib.utils.authorization import require_same_user_or_profile
 from tracim_backend.lib.utils.authorization import require_profile
 from tracim_backend.exceptions import WrongUserPassword
 from tracim_backend.exceptions import PasswordDoNotMatch
 from tracim_backend.views.core_api.schemas import UserSchema
+from tracim_backend.views.core_api.schemas import AutocompleteQuerySchema
+from tracim_backend.views.core_api.schemas import UserDigestSchema
 from tracim_backend.views.core_api.schemas import SetEmailSchema
 from tracim_backend.views.core_api.schemas import SetPasswordSchema
 from tracim_backend.views.core_api.schemas import UserInfosSchema
@@ -32,6 +34,7 @@ from tracim_backend.views.core_api.schemas import UserWorkspaceAndContentIdPathS
 from tracim_backend.views.core_api.schemas import ContentDigestSchema
 from tracim_backend.views.core_api.schemas import ActiveContentFilterQuerySchema
 from tracim_backend.views.core_api.schemas import WorkspaceDigestSchema
+from tracim_backend.models.contents import CONTENT_TYPES
 
 SWAGGER_TAG__USER_ENDPOINTS = 'Users'
 
@@ -76,6 +79,46 @@ class UserController(Controller):
         return uapi.get_user_with_context(request.candidate_user)
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__USER_ENDPOINTS])
+    @require_profile(Group.TIM_ADMIN)
+    @hapic.output_body(UserDigestSchema(many=True))
+    def users(self, context, request: TracimRequest, hapic_data=None):
+        """
+        Get all users
+        """
+        app_config = request.registry.settings['CFG']
+        uapi = UserApi(
+            current_user=request.current_user,  # User
+            session=request.dbsession,
+            config=app_config,
+        )
+        users = uapi.get_all()
+        context_users = [
+            uapi.get_user_with_context(user) for user in users
+        ]
+        return context_users
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG__USER_ENDPOINTS])
+    @require_same_user_or_profile(Group.TIM_MANAGER)
+    @hapic.input_path(UserIdPathSchema())
+    @hapic.input_query(AutocompleteQuerySchema())
+    @hapic.output_body(UserDigestSchema(many=True))
+    def known_members(self, context, request: TracimRequest, hapic_data=None):
+        """
+        Get known users list
+        """
+        app_config = request.registry.settings['CFG']
+        uapi = UserApi(
+            current_user=request.candidate_user,  # User
+            session=request.dbsession,
+            config=app_config,
+        )
+        users = uapi.get_known_user(acp=hapic_data.query.acp)
+        context_users = [
+            uapi.get_user_with_context(user) for user in users
+        ]
+        return context_users
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG__USER_ENDPOINTS])
     @hapic.handle_exception(WrongUserPassword, HTTPStatus.FORBIDDEN)
     @require_same_user_or_profile(Group.TIM_ADMIN)
     @hapic.input_body(SetEmailSchema())
@@ -271,7 +314,7 @@ class UserController(Controller):
             before_content = api.get_one(
                 content_id=content_filter.before_content_id,
                 workspace=workspace,
-                content_type=ContentType.Any
+                content_type=CONTENT_TYPES.Any_SLUG
             )
         last_actives = api.get_last_active(
             workspace=workspace,
@@ -328,6 +371,8 @@ class UserController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.candidate_user,
             session=request.dbsession,
             config=app_config,
@@ -345,6 +390,8 @@ class UserController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.candidate_user,
             session=request.dbsession,
             config=app_config,
@@ -362,6 +409,8 @@ class UserController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.candidate_user,
             session=request.dbsession,
             config=app_config,
@@ -383,6 +432,14 @@ class UserController(Controller):
         configurator.add_route('user', '/users/{user_id}', request_method='GET')  # nopep8
         configurator.add_view(self.user, route_name='user')
 
+        # users lists
+        configurator.add_route('users', '/users', request_method='GET')  # nopep8
+        configurator.add_view(self.users, route_name='users')
+
+        # known members lists
+        configurator.add_route('known_members', '/users/{user_id}/known_members', request_method='GET')  # nopep8
+        configurator.add_view(self.known_members, route_name='known_members')
+
         # set user email
         configurator.add_route('set_user_email', '/users/{user_id}/email', request_method='PUT')  # nopep8
         configurator.add_view(self.set_user_email, route_name='set_user_email')

backend/tracim_backend/views/core_api/workspace_controller.py

@@ -31,6 +31,7 @@ from tracim_backend.exceptions import ContentNotFound
 from tracim_backend.exceptions import WorkspacesDoNotMatch
 from tracim_backend.exceptions import ParentNotFound
 from tracim_backend.views.controllers import Controller
+from tracim_backend.lib.utils.utils import password_generator
 from tracim_backend.views.core_api.schemas import FilterContentQuerySchema
 from tracim_backend.views.core_api.schemas import WorkspaceMemberCreationSchema
 from tracim_backend.views.core_api.schemas import WorkspaceMemberInviteSchema
@@ -46,7 +47,7 @@ from tracim_backend.views.core_api.schemas import ContentDigestSchema
 from tracim_backend.views.core_api.schemas import WorkspaceSchema
 from tracim_backend.views.core_api.schemas import WorkspaceIdPathSchema
 from tracim_backend.views.core_api.schemas import WorkspaceMemberSchema
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 
 SWAGGER_TAG_WORKSPACE_ENDPOINTS = 'Workspaces'
@@ -213,12 +214,18 @@ class WorkspaceController(Controller):
                 # TODO - G.M - 2018-07-05 - [UserCreation] Reenable email
                 # notification for creation
                 user = uapi.create_user(
-                    hapic_data.body.user_email_or_public_name,
-                    do_notify=False
+                    email=hapic_data.body.user_email_or_public_name,
+                    password= password_generator(),
+                    do_notify=True
                 )  # nopep8
                 newly_created = True
+                if app_config.EMAIL_NOTIFICATION_ACTIVATED and \
+                        app_config.EMAIL_NOTIFICATION_PROCESSING_MODE.lower() == 'sync':
+                    email_sent = True
+
             except EmailValidationFailed:
                 raise UserCreationFailed('no valid mail given')
+
         role = rapi.create_one(
             user=user,
             workspace=request.current_workspace,
@@ -259,7 +266,7 @@ class WorkspaceController(Controller):
         contents = api.get_all(
             parent_id=content_filter.parent_id,
             workspace=request.current_workspace,
-            content_type=content_filter.content_type or ContentType.Any,
+            content_type=content_filter.content_type or CONTENT_TYPES.Any_SLUG,
         )
         contents = [
             api.get_content_in_context(content) for content in contents
@@ -291,14 +298,14 @@ class WorkspaceController(Controller):
         parent = None
         if creation_data.parent_id:
             try:
-                parent = api.get_one(content_id=creation_data.parent_id, content_type=ContentType.Any)  # nopep8
+                parent = api.get_one(content_id=creation_data.parent_id, content_type=CONTENT_TYPES.Any_SLUG)  # nopep8
             except ContentNotFound as exc:
                 raise ParentNotFound(
                     'Parent with content_id {} not found'.format(creation_data.parent_id)
                 ) from exc
         content = api.create(
             label=creation_data.label,
-            content_type=creation_data.content_type,
+            content_type_slug=creation_data.content_type,
             workspace=request.current_workspace,
             parent=parent,
         )
@@ -327,16 +334,18 @@ class WorkspaceController(Controller):
         move_data = hapic_data.body
 
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             path_data.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         new_parent = api.get_one(
-            move_data.new_parent_id, content_type=ContentType.Any
+            move_data.new_parent_id, content_type=CONTENT_TYPES.Any_SLUG
         )
 
         new_workspace = request.candidate_workspace
@@ -354,7 +363,7 @@ class WorkspaceController(Controller):
             )
         updated_content = api.get_one(
             path_data.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         return api.get_content_in_context(updated_content)
 
@@ -374,13 +383,15 @@ class WorkspaceController(Controller):
         app_config = request.registry.settings['CFG']
         path_data = hapic_data.path
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
         content = api.get_one(
             path_data.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,
@@ -410,10 +421,11 @@ class WorkspaceController(Controller):
             session=request.dbsession,
             config=app_config,
             show_deleted=True,
+            show_archived=True,
         )
         content = api.get_one(
             path_data.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,
@@ -439,11 +451,13 @@ class WorkspaceController(Controller):
         app_config = request.registry.settings['CFG']
         path_data = hapic_data.path
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
         )
-        content = api.get_one(path_data.content_id, content_type=ContentType.Any)  # nopep8
+        content = api.get_one(path_data.content_id, content_type=CONTENT_TYPES.Any_SLUG)  # nopep8
         with new_revision(
                 session=request.dbsession,
                 tm=transaction.manager,
@@ -472,10 +486,11 @@ class WorkspaceController(Controller):
             session=request.dbsession,
             config=app_config,
             show_archived=True,
+            show_deleted=True,
         )
         content = api.get_one(
             path_data.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,

backend/tracim_backend/views/frontend.py

@@ -0,0 +1,67 @@
+import os
+
+from pyramid.renderers import render_to_response
+from pyramid.config import Configurator
+from tracim_backend.exceptions import PageNotFound
+from tracim_backend.models.applications import applications
+from tracim_backend.views import BASE_API_V2
+from tracim_backend.lib.utils.request import TracimRequest
+from tracim_backend.views.controllers import Controller
+import spectra
+
+INDEX_PAGE_NAME = 'index.mak'
+APP_FRONTEND_PATH = 'app/{minislug}.app.js'
+
+
+class FrontendController(Controller):
+
+    def __init__(self, dist_folder_path: str):
+        self.dist_folder_path = dist_folder_path
+
+    def _get_index_file_path(self):
+        index_file_path = os.path.join(self.dist_folder_path, INDEX_PAGE_NAME)
+        if not os.path.exists(index_file_path):
+            raise FileNotFoundError()
+        return index_file_path
+
+    def not_found_view(self, context, request: TracimRequest):
+
+        if request.path.startswith(BASE_API_V2):
+            raise PageNotFound('{} is not a valid path'.format(request.path)) from context  # nopep8
+        return self.index(context, request)
+
+    def index(self, context, request: TracimRequest):
+        app_config = request.registry.settings['CFG']
+        # TODO - G.M - 2018-08-07 - Refactor autogen valid app list for frontend
+        frontend_apps = []
+        for app in applications:
+            app_frontend_path = APP_FRONTEND_PATH.replace('{minislug}',
+                                                          app.minislug)  # nopep8
+            app_path = os.path.join(self.dist_folder_path,
+                                    app_frontend_path)  # nopep8
+            if os.path.exists(app_path):
+                frontend_apps.append(app)
+        return render_to_response(
+            self._get_index_file_path(),
+            {
+                'colors': {
+                    'primary': spectra.html('#7d4e24'),
+                },
+                'applications': frontend_apps,
+            }
+        )
+
+    def bind(self, configurator: Configurator) -> None:
+
+        configurator.add_notfound_view(self.not_found_view)
+        # index.html for /index.html and /
+        configurator.add_route('root', '/', request_method='GET')
+        configurator.add_view(self.index, route_name='root')
+        configurator.add_route('index', INDEX_PAGE_NAME, request_method='GET')
+        configurator.add_view(self.index, route_name='index')
+
+        for dirname in os.listdir(self.dist_folder_path):
+            configurator.add_static_view(
+                name=dirname,
+                path=os.path.join(self.dist_folder_path, dirname)
+            )

bash_library.sh

@@ -5,5 +5,5 @@ BROWN='\033[0;33m'
 NC='\033[0m' # No Color
 
 function log {
-    echo -e "\n${YELLOW}[$(date +'%H:%M:%S')]${BROWN} $ $1${NC}\n"
+    echo -e "\n${YELLOW}[$(date +'%H:%M:%S')]${BROWN} $ $1${NC}"
 }

build_full_frontend.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# shellcheck disable=SC1091
 . bash_library.sh # source bash_library.sh
 
 windoz=""
@@ -7,66 +8,54 @@ if  [[ $1 = "-w" ]]; then
     windoz="windoz"
 fi
 
-echo -e "\n${BROWN}/!\ ${NC}this script does not run 'npm install'\n${BROWN}/!\ ${NC}it also assumes your webpack dev server of frontend is running"
+echo -e "\n${BROWN}/!\ ${NC}this script does not run 'npm install'\n${BROWN}/!\ ${NC}"
 
-# Tracim Lib
-
-log "cd frontend_lib"
-cd frontend_lib
-log "npm run buildtracimlib$windoz"
-npm run buildtracimlib$windoz
-cd -
-
-# app Html Document
+# get the new sources
+git pull origin develop
 
-log "cd frontend_app_html-document"
-cd frontend_app_html-document
+# create folder frontend/dist/app/ if no exists
+if [ ! -d "frontend/dist/app/" ]; then
+  mkdir frontend/dist/app/
+fi
 
-log "npm run build$windoz # for frontend_app_html-document"
-npm run build$windoz
+# Tracim Lib
+(
+  log "build frontend_lib"
+  cd frontend_lib || exit
+  npm run buildtracimlib$windoz
+)
 
-log "cp dist/html-document.app.js"
-cp dist/html-document.app.js ../frontend/dist/app
 
-log "cp i18next.scanner/en/translation.json ../frontend/dist/app/tml-document_en_translation.json"
-cp i18next.scanner/en/translation.json ../frontend/dist/app/html-document_en_translation.json
+# app Html Document
+(
+  cd frontend_app_html-document || exit
+  ./build_html-document.sh
+)
 
-log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json"
-cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json
-cd -
 
 # app Thread
+(
+  cd frontend_app_thread || exit
+  ./build_thread.sh
+)
 
-log "cd frontend_app_thread"
-cd frontend_app_thread
-
-log "npm run build$windoz # for frontend_app_thread"
-npm run build$windoz
 
-log "cp dist/thread.app.js"
-cp dist/thread.app.js ../frontend/dist/app
-
-log "cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json"
-cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json
-
-log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json"
-cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json
-cd -
+# app Workspace
+(
+  cd frontend_app_workspace || exit
+  ./build_workspace.sh
+)
 
 # app Admin Workspace User
-
-log "cd frontend_app_admin_workspace_user"
-cd frontend_app_admin_workspace_user
-
-log "npm run build$windoz # for frontend_app_thread"
-npm run build$windoz
-
-log "cp dist/admin_workspace_user.app.js"
-cp dist/admin_workspace_user.app.js ../frontend/dist/app
-
-log "cp i18next.scanner/en/translation.json ../frontend/dist/app/admin_workspace_user_en_translation.json"
-cp i18next.scanner/en/translation.json ../frontend/dist/app/admin_workspace_user_en_translation.json
-
-log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/admin_workspace_user_fr_translation.json"
-cp i18next.scanner/fr/translation.json ../frontend/dist/app/admin_workspace_user_fr_translation.json
-cd -
+(
+  cd frontend_app_admin_workspace_user || exit
+  ./build_admin_workspace_user.sh
+)
+
+# build Tracim
+(
+  cd frontend || exit
+  npm run build
+)
+
+log "-- frontend build successful."

color.json.sample

@@ -0,0 +1,6 @@
+{
+  "primary": "#7d4e24",
+  "html-document": "#3f52e3",
+  "thread": "#ad4cf9",
+  "file": "#ff9900"
+}

frontend/.gitignore

@@ -1,4 +1,6 @@
 # Created by .ignore support plugin (hsz.mobi)
-.idea/
 .git/
 node_modules/
+dist/asset/tracim.app.entry.js
+dist/asset/tracim.vendor.bundle.js
+dist/asset/images/

frontend/dist/appInterface.js → frontend/dist/asset/tracim/appInterface.js

@@ -3,6 +3,8 @@
 
   getSelectedApp = name => {
     switch (name) {
+      case 'workspace':
+        return appWorkspace
       case 'html-document':
         return appHtmlDocument
       case 'thread':
@@ -74,6 +76,7 @@
   GLOBAL_eventReducer = ({detail: {type, data}}) => {
     switch (type) {
       case 'hide_popupCreateContent':
+      case 'hide_popupCreateWorkspace':
         console.log('%cGLOBAL_eventReducer Custom Event', 'color: #28a745', type, data)
         getSelectedApp(data.name).unmountApp('popupCreateContentContainer')
         break

frontend/dist/tinymceInit.js → frontend/dist/asset/tracim/tinymceInit.js

@@ -32,6 +32,7 @@
     });
 
     tinymce.init({
+      forced_root_block : "",
       selector: selector,
       menubar: false,
       resize: false,

frontend/dist/index.html

@@ -1,69 +1,67 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset='utf-8' />
-    <meta name="viewport" content="width=device-width, user-scalable=no">
-    <title>Tracim</title>
-    <link rel='shortcut icon' type='image/x-icon' href='/asset/favicon.ico' >
+<head>
+  <meta charset='utf-8' />
+  <meta name="viewport" content="width=device-width, user-scalable=no">
+  <title>Tracim</title>
+  <link rel='shortcut icon' type='image/x-icon' href='/asset/favicon.ico' >
 
-    <link rel="stylesheet" type="text/css" href="/font/font-awesome-4.7.0/css/font-awesome.css">
-    <link href="https://fonts.googleapis.com/css?family=Quicksand:300,400,500,700" rel="stylesheet">
-    <!--
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
-    -->
-    <link rel="stylesheet" type="text/css" href="/asset/hamburger/hamburgers.min.css">
-    <link rel="stylesheet" type="text/css" href="/dev/bootstrap-4.0.0-beta.css">
+  <link rel="stylesheet" type="text/css" href="/asset/font/font-awesome-4.7.0/css/font-awesome.css">
+  <link href="https://fonts.googleapis.com/css?family=Quicksand:300,400,500,700" rel="stylesheet">
+  <!--
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
+  -->
+  <link rel="stylesheet" type="text/css" href="/asset/hamburger/hamburgers.min.css">
+  <link rel="stylesheet" type="text/css" href="/asset/bootstrap/bootstrap-4.0.0-beta.css">
 
-    <style>
-      /* code bellow will be generated by backend */
-      .primaryColorFont { color: #7d4e24; }
-      .primaryColorFontDarken { color: #572800; }
-      .primaryColorFontLighten { color: #a3744a; }
-      .whiteFontColor {color: #fdfdfd;}
+  <style>
+    .primaryColorFont { color: #7d4e24; }
+    .primaryColorFontDarken { color: #522c00; }
+    .primaryColorFontLighten { color: #a37346; }
 
-      .primaryColorFontHover:hover { color: #7d4e24; }
-      .primaryColorFontDarkenHover:hover { color: #572800; }
-      .primaryColorFontLightenHover:hover { color: #a3744a; }
+    .primaryColorFontHover:hover { color: #7d4e24; }
+    .primaryColorFontDarkenHover:hover { color: #522c00; }
+    .primaryColorFontLightenHover:hover { color: #a37346; }
 
-      .primaryColorBg { background-color: #7d4e24; }
-      .primaryColorBgDarken { background-color: #572800; }
-      .primaryColorBgLighten { background-color: #a3744a; }
 
-      .primaryColorBgHover:hover { background-color: #7d4e24; }
-      .primaryColorBgDarkenHover:hover { background-color: #572800; }
-      .primaryColorBgLightenHover:hover { background-color: #a3744a; }
+    .primaryColorBg { background-color: #7d4e24; }
+    .primaryColorBgDarken { background-color: #522c00; }
+    .primaryColorBgLighten { background-color: #a37346; }
 
-      .primaryColorBorder { border-color: #7d4e24; }
-      .primaryColorBorderDarken { border-color: #572800; }
-      .primaryColorBorderLighten { border-color: #a3744a; }
-      .whiteColorBorder { border-color: #fdfdfd; }
+    .primaryColorBgHover:hover { background-color: #7d4e24; }
+    .primaryColorBgDarkenHover:hover { background-color: #522c00; }
+    .primaryColorBgLightenHover:hover { background-color: #a37346; }
 
-      .primaryColorBorderHover:hover { border-color: #7d4e24; }
-      .primaryColorBorderDarkenHover:hover { border-color: #572800; }
-      .primaryColorBorderLightenHover:hover { border-color: #a3744a; }
 
-    </style>
-  </head>
+    .primaryColorBorder { border-color: #7d4e24; }
+    .primaryColorBorderDarken { border-color: #522c00; }
+    .primaryColorBorderLighten { border-color: #a37346; }
 
-  <body>
-    <div id='content'></div>
+    .primaryColorBorderHover:hover { border-color: #7d4e24; }
+    .primaryColorBorderDarkenHover:hover { border-color: #522c00; }
+    .primaryColorBorderLightenHover:hover { border-color: #a37346; }
+  </style>
+</head>
 
-    <script src='/tracim.vendor.bundle.js'></script>
-    <script src='/tracim.app.entry.js'></script>
+<body>
+<div id='content'></div>
 
-    <script src='/app/html-document.app.js'></script>
-    <script src='/app/thread.app.js'></script>
-    <!-- <script src='/app/file.app.js'></script> -->
-    <script src='/app/admin_workspace_user.app.js'></script>
+<script type='text/javascript' src='/asset/tracim.vendor.bundle.js'></script>
+<script type='text/javascript' src='/asset/tracim.app.entry.js'></script>
 
-    <script src="/dev/jquery-3.2.1.js"></script>
-    <script src="/dev/popper-1.12.3.js"></script>
-    <script src="/dev/bootstrap-4.0.0-beta.2.js"></script>
+<script type='text/javascript' src='/app/workspace.app.js'></script>
+<script type='text/javascript' src='/app/html-document.app.js'></script>
+<script type='text/javascript' src='/app/thread.app.js'></script>
+<script type='text/javascript' src='/app/admin_workspace_user.app.js'></script>
 
-    <script type="text/javascript" src="/asset/tinymce/js/tinymce/jquery.tinymce.min.js"></script>
-    <script type="text/javascript" src="/asset/tinymce/js/tinymce/tinymce.min.js"></script>
+<script type='text/javascript' src='/asset/bootstrap/jquery-3.2.1.js'></script>
+<script type='text/javascript' src='/asset/bootstrap/popper-1.12.3.js'></script>
+<script type='text/javascript' src='/asset/bootstrap/bootstrap-4.0.0-beta.2.js'></script>
 
-    <script type='text/javascript' src='/appInterface.js'></script>
-    <script type='text/javascript' src='/tinymceInit.js'></script>
-  </body>
+<script type='text/javascript' src='/asset/tinymce/js/tinymce/jquery.tinymce.min.js'></script>
+<script type='text/javascript' src='/asset/tinymce/js/tinymce/tinymce.min.js'></script>
+
+<script type='text/javascript' src='/asset/tracim/appInterface.js'></script>
+<script type='text/javascript' src='/asset/tracim/tinymceInit.js'></script>
+</body>
 </html>