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

.gitignore

@@ -1,4 +1,7 @@
 .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

.travis.yml

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

backend/tests_configs.ini

@@ -63,3 +63,70 @@ 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
+
+[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
+
+[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
+
+[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
+
+
+[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

backend/tracim_backend/config.py

@@ -161,9 +161,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',

backend/tracim_backend/exceptions.py

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

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.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/utils/utils.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import datetime
+import random
+import string
 from redis import Redis
 from rq import Queue
 
@@ -72,3 +74,25 @@ 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/models/applications.py

@@ -59,6 +59,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 +102,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
 
@@ -171,10 +172,10 @@ html_documents_type = ContentType(
 # TODO - G.M - 31-05-2018 - Set Better folder params
 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',
+    creation_label='Create a folder',
     available_statuses=CONTENT_STATUS.get_all(),
 )
 
@@ -261,7 +262,8 @@ CONTENT_TYPES = ContentTypeList(
     [
         thread_type,
         file_type,
-        markdownpluspage_type,
+        # TODO - G.M - 2018-08-02 - Restore markdown page content
+        #    markdownpluspage_type,
         html_documents_type,
     ]
 )

backend/tracim_backend/models/context_models.py

@@ -186,6 +186,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

backend/tracim_backend/tests/__init__.py

@@ -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)

backend/tracim_backend/tests/functional/test_system.py

@@ -1,5 +1,7 @@
 # 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.
@@ -24,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):
         """
@@ -96,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[1]
-        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[2]
-        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[3]
-        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[4]
-        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

@@ -2382,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'
@@ -2406,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):
         """
@@ -2646,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 -*-
     """
@@ -3025,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')
@@ -3080,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')
@@ -3138,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')
@@ -3195,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
 
@@ -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
@@ -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_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/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/views/contents_api/comment_controller.py

@@ -41,6 +41,8 @@ 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,
@@ -68,6 +70,8 @@ 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,
@@ -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,

backend/tracim_backend/views/contents_api/file_controller.py

@@ -61,6 +61,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,
@@ -95,6 +97,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,
@@ -120,6 +124,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,
@@ -154,6 +160,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,
@@ -181,6 +189,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,
@@ -205,6 +215,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,
@@ -238,6 +250,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,
@@ -270,6 +284,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,
@@ -301,6 +317,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,
@@ -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,6 +372,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,
@@ -375,6 +397,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,
@@ -413,6 +437,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,
@@ -440,6 +466,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,

backend/tracim_backend/views/contents_api/html_document_controller.py

@@ -46,6 +46,8 @@ 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,
@@ -69,6 +71,8 @@ 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,
@@ -107,6 +111,8 @@ 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,
@@ -138,6 +144,8 @@ 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,

backend/tracim_backend/views/contents_api/threads_controller.py

@@ -45,6 +45,8 @@ 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,
@@ -68,6 +70,8 @@ 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,
@@ -106,6 +110,8 @@ 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,
@@ -132,6 +138,8 @@ 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,

backend/tracim_backend/views/core_api/schemas.py

@@ -2,6 +2,7 @@
 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
@@ -11,6 +12,7 @@ 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.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
@@ -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,

backend/tracim_backend/views/core_api/user_controller.py

@@ -18,6 +18,8 @@ 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
@@ -37,6 +39,7 @@ from tracim_backend.models.contents import CONTENT_TYPES
 SWAGGER_TAG__USER_ENDPOINTS = 'Users'
 
 
+
 class UserController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__USER_ENDPOINTS])
@@ -77,6 +80,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())
@@ -329,6 +372,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,
@@ -346,6 +391,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,
@@ -363,6 +410,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,
@@ -384,6 +433,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

@@ -33,6 +33,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 ContentIdPathSchema
 from tracim_backend.views.core_api.schemas import WorkspaceMemberCreationSchema
@@ -216,12 +217,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,
@@ -389,6 +396,8 @@ 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,
@@ -436,6 +445,8 @@ 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,
@@ -472,6 +483,7 @@ class WorkspaceController(Controller):
             session=request.dbsession,
             config=app_config,
             show_deleted=True,
+            show_archived=True,
         )
         content = api.get_one(
             path_data.content_id,
@@ -501,6 +513,8 @@ 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,
@@ -534,6 +548,7 @@ class WorkspaceController(Controller):
             session=request.dbsession,
             config=app_config,
             show_archived=True,
+            show_deleted=True,
         )
         content = api.get_one(
             path_data.content_id,

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,84 +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
-
-log "cd frontend_app_workspace"
-cd frontend_app_workspace
-
-log "npm run build$windoz # for frontend_app_workspace"
-npm run build$windoz
-
-log "cp dist/workspace.app.js"
-cp dist/workspace.app.js ../frontend/dist/app
-
-log "cp i18next.scanner/en/translation.json ../frontend/dist/app/workspace_en_translation.json"
-cp i18next.scanner/en/translation.json ../frontend/dist/app/workspace_en_translation.json
-
-log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/workspace_fr_translation.json"
-cp i18next.scanner/fr/translation.json ../frontend/dist/app/workspace_fr_translation.json
-cd -
+(
+  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

@@ -76,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/index.html

@@ -6,20 +6,19 @@
     <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 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="/dev/bootstrap-4.0.0-beta.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;}
 
       .primaryColorFontHover:hover { color: #7d4e24; }
       .primaryColorFontDarkenHover:hover { color: #572800; }
@@ -47,23 +46,23 @@
   <body>
     <div id='content'></div>
 
-    <script src='/tracim.vendor.bundle.js'></script>
-    <script src='/tracim.app.entry.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='/app/workspace.app.js'></script>
-    <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='/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/file.app.js'></script> -->
+    <script type='text/javascript' src='/app/admin_workspace_user.app.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='/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="/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/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='/appInterface.js'></script>
-    <script type='text/javascript' src='/tinymceInit.js'></script>
+    <script type='text/javascript' src='/asset/tracim/appInterface.js'></script>
+    <script type='text/javascript' src='/asset/tracim/tinymceInit.js'></script>
   </body>
 </html>

frontend/i18next.scanner/en/translation.json

@@ -37,11 +37,6 @@
   "Change your status": "Change your status",
   "subscriber": "subscriber",
   "unsubscribed": "unsubscribed",
-  "Start a new Thread": "Start a new Thread",
-  "Writing a document": "Writing a document",
-  "Upload a file": "Upload a file",
-  "Start a videoconference": "Start a videoconference",
-  "View the Calendar": "View the Calendar",
   "Recent activity": "Recent activity",
   "Mark everything as read": "Mark everything as read",
   "See more": "See more",
@@ -50,24 +45,22 @@
   "Enter the name or email of the member": "Enter the name or email of the member",
   "Create an account": "Create an account",
   "Choose the role of the member": "Choose the role of the member",
-  "Supervisor": "Supervisor",
-  "Content Manager": "Content Manager",
-  "Contributor": "Contributor",
-  "Reader": "Reader",
   "Validate": "Validate",
   "Implement Tracim in your explorer": "Implement Tracim in your explorer",
   "Find all your documents deposited online directly on your computer via the workstation, without going through the software.": "Find all your documents deposited online directly on your computer via the workstation, without going through the software.",
   "Workspace Calendar": "Workspace Calendar",
   "Each workspace has its own calendar.": "Each workspace has its own calendar.",
   "Email Adress": "Email Adress",
-  "Explore the workspace": "Explore the workspace",
   "Old password": "Old password",
   "New password": "New password",
   "Name:": "Name:",
   "Email Adress:": "Email Adress:",
-  "An error has happened": "An error has happened",
   "You have subscribed to this workspace's notifications": "You have subscribed to this workspace's notifications",
   "Connection": "Connection",
   "Forgotten password ?": "Forgotten password ?",
-  "currently, you are ": "currently, you are "
+  "An error has happened when fetching workspace detail": "An error has happened when fetching workspace detail",
+  "An error has happened while fetching member list": "An error has happened while fetching member list",
+  "An error has happened while fetching recent activity list": "An error has happened while fetching recent activity list",
+  "An error has happened while fetching read status list": "An error has happened while fetching read status list",
+  "Hi {{name}} ! Currently, you are ": "Hi {{name}} ! Currently, you are "
 }

frontend/i18next.scanner/fr/translation.json

@@ -37,12 +37,6 @@
   "Change your status": "Changer de status",
   "subscriber": "Abonné(e)",
   "unsubscribed": "Non Abonné(e)",
-  "Start a new Thread": "Débuter une nouvelle discussion",
-  "Writing a document": "Rédiger un document",
-  "Upload a file": "Importer un fichier",
-  "Start a videoconference": "Débuter une visioconférence",
-  "View the Calendar": "Voir le Calendrier",
-  "Explore the workspace": "Explorer l'espace de travail",
   "Recent activity": "Activité récente",
   "Mark everything as read": "Tout marquer comme lu",
   "See more": "Voir plus",
@@ -50,10 +44,6 @@
   "Add a member": "Ajouter un membre",
   "Enter the name or email of the member": "Renseigner le nom ou l'email de l'utilisateur",
   "Create an account": "Créer un compte",
-  "Supervisor": "Responsable",
-  "Content Manager": "Gestionnaire de contenu",
-  "Contributor": "Contributeur",
-  "Reader": "Lecteur",
   "Validate": "Validé",
   "Implement Tracim in your explorer": "Implémenter Tracim dans votre explorateur",
   "Find all your documents deposited online directly on your computer via the workstation, without going through the software.": "Retrouvez tous vos documents déposés en ligne directement sur votre ordinateur via le poste de travail, sans passer par le logiciel.",
@@ -65,9 +55,12 @@
   "New password": "Nouveau mot de passe",
   "Name:": "Nom :",
   "Email Adress:": "Adresse mail :",
-  "An error has happened": "__NOT_TRANSLATED__",
   "You have subscribed to this workspace's notifications": "Vous êtes abonné aux notifications de cet espace de travail.",
   "Connection": "Connexion",
   "Forgotten password ?": "Mot de passe oublié ?",
-  "currently, you are ": "actuellement, vous êtes "
+  "An error has happened when fetching workspace detail": "__NOT_TRANSLATED__",
+  "An error has happened while fetching member list": "__NOT_TRANSLATED__",
+  "An error has happened while fetching recent activity list": "__NOT_TRANSLATED__",
+  "An error has happened while fetching read status list": "__NOT_TRANSLATED__",
+  "Hi {{name}} ! Currently, you are ": "Bonjour {{name}} ! Vous êtes actuellement"
 }

frontend/src/component/Workspace/OpenContentApp.jsx

@@ -22,13 +22,10 @@ export class OpenContentApp extends React.Component {
       console.log('%c<OpenContentApp> contentToOpen', 'color: #dcae84', contentToOpen)
 
       if (appOpenedType === contentToOpen.type) { // app already open
-        dispatchCustomEvent({
-          type: `${contentToOpen.type}_reloadContent`, // handled by html-document:src/container/AdminWorkspaceUser.jsx
-          data: contentToOpen
-        })
+        dispatchCustomEvent(`${contentToOpen.type}_reloadContent`, contentToOpen)
       } else { // open another app
         // if another app is already visible, hide it
-        if (appOpenedType !== false) dispatchCustomEvent({type: `${appOpenedType}_hideApp`})
+        if (appOpenedType !== false) dispatchCustomEvent(`${appOpenedType}_hideApp`, {})
         // open app
         renderAppFeature(
           contentType.find(ct => ct.slug === contentToOpen.type),

frontend/src/container/Account.jsx

@@ -1,6 +1,5 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import Sidebar from './Sidebar.jsx'
 import UserInfo from '../component/Account/UserInfo.jsx'
 import MenuSubComponent from '../component/Account/MenuSubComponent.jsx'
 import PersonalData from '../component/Account/PersonalData.jsx'
@@ -102,9 +101,7 @@ class Account extends React.Component {
     })()
 
     return (
-      <div className='sidebarpagecontainer'>
-        <Sidebar />
-
+      <div className='Account'>
         <PageWrapper customClass='account'>
           <PageTitle
             parentClass={'account'}

frontend/src/container/AdminWorkspacePage.jsx

@@ -0,0 +1,138 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import Sidebar from './Sidebar.jsx'
+import {
+  Delimiter,
+  PageWrapper,
+  PageTitle,
+  PageContent
+} from 'tracim_frontend_lib'
+import { translate } from 'react-i18next'
+
+class AdminWorkspacePage extends React.Component {
+  render () {
+    return (
+      <div className='sidebarpagecontainer'>
+        <Sidebar />
+
+        <PageWrapper customClass='adminWorkspacePage'>
+          <PageTitle
+            parentClass={'adminWorkspacePage'}
+            title={'Workspace management'}
+          />
+
+          <PageContent parentClass='adminWorkspacePage'>
+
+            <div className='adminWorkspacePage__description'>
+              This page informs all workspaces of the instances
+            </div>
+
+            <div className='adminWorkspacePage__createworkspace'>
+              <button className='adminWorkspacePage__createworkspace__btncreate btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover'>
+                {this.props.t('Create a workspace')}
+              </button>
+            </div>
+
+            <Delimiter customClass={'adminWorkspacePage__delimiter'} />
+
+            <div className='adminWorkspacePage__workspaceTable'>
+
+              <table class='table'>
+                <thead>
+                  <tr>
+                    <th scope='col'># ID</th>
+                    <th scope='col'>Workspace</th>
+                    <th scope='col'>Description</th>
+                    <th scope='col'>Users</th>
+                    <th scope='col'>Calendar</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <th>#1</th>
+                    <td>Design v_2</td>
+                    <td>Workspace about tracim v2 design</td>
+                    <td>8 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-check-square-o' />
+                      </div>
+                      Enable
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>#2</th>
+                    <td>New features</td>
+                    <td>Add a new features : Annotated files</td>
+                    <td>5 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-square-o' />
+                      </div>
+                      Disable
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>#3</th>
+                    <td>Fix Backend</td>
+                    <td>workspace referring to multiple issues on the backend </td>
+                    <td>3 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-check-square-o' />
+                      </div>
+                      Enable
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>#4</th>
+                    <td>Design v_2</td>
+                    <td>Workspace about tracim v2 design</td>
+                    <td>8 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-square-o' />
+                      </div>
+                      Disable
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>#5</th>
+                    <td>New features</td>
+                    <td>Add a new features : Annotated files</td>
+                    <td>5 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-square-o' />
+                      </div>
+                      Disable
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>#6</th>
+                    <td>Fix Backend</td>
+                    <td>workspace referring to multiple issues on the backend </td>
+                    <td>3 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-check-square-o' />
+                      </div>
+                      Enable
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+
+          </PageContent>
+        </PageWrapper>
+      </div>
+    )
+  }
+}
+
+AdminWorkspacePage.propTypes = {
+  availableApp: PropTypes.array.isRequired
+}
+
+export default translate()(AdminWorkspacePage)

frontend/src/container/AppFullscreenManager.jsx

@@ -4,28 +4,25 @@ import { withRouter } from 'react-router'
 import { Route } from 'react-router-dom'
 import { PAGE } from '../helper.js'
 import appFactory from '../appFactory.js'
-import Sidebar from './Sidebar.jsx'
 
 class AppFullscreenManager extends React.Component {
   constructor (props) {
     super(props)
     this.state = {
-      AmIMounted: false
+      isMounted: false
     }
   }
 
-  componentDidMount = () => this.setState({AmIMounted: true})
+  componentDidMount = () => this.setState({isMounted: true})
 
   render () {
     const { props } = this
 
     return (
-      <div className='sidebarpagecontainer'>
-        <Sidebar />
-
+      <div className='AppFullScreenManager'>
         <div id='appFullscreenContainer' />
 
-        {this.state.AmIMounted && (// we must wait for the component to be fully mounted to be sure the div#appFullscreenContainer exists in DOM
+        {this.state.isMounted && (// we must wait for the component to be fully mounted to be sure the div#appFullscreenContainer exists in DOM
           <div className='emptyDiForRoute'>
             <Route path={PAGE.ADMIN.WORKSPACE} render={() => {
               props.renderAppFullscreen({slug: 'admin_workspace_user', hexcolor: '#7d4e24', type: 'workspace'}, props.user, {})

frontend/src/container/Dashboard.jsx

@@ -1,6 +1,5 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import Sidebar from './Sidebar.jsx'
 import { translate } from 'react-i18next'
 import {
   PageWrapper,
@@ -45,7 +44,7 @@ class Dashboard extends React.Component {
       case 200:
         props.dispatch(setWorkspaceDetail(fetchWorkspaceDetail.json)); break
       default:
-        props.dispatch(newFlashMessage(props.t('An error has happened when fetching workspace detail'), 'warning')); break
+        props.dispatch(newFlashMessage(props.t('An error has happened while fetching workspace detail'), 'warning')); break
     }
 
     const fetchWorkspaceMemberList = await props.dispatch(getWorkspaceMemberList(props.user, state.workspaceIdInUrl))
@@ -93,9 +92,7 @@ class Dashboard extends React.Component {
     const { props, state } = this
 
     return (
-      <div className='sidebarpagecontainer'>
-        <Sidebar />
-
+      <div className='Dashboard' style={{width: '100%'}}>
         <PageWrapper customeClass='dashboard'>
           <PageTitle
             parentClass='dashboard__header'
@@ -124,7 +121,7 @@ class Dashboard extends React.Component {
               <div className='dashboard__userstatut'>
                 <div className='dashboard__userstatut__role'>
                   <div className='dashboard__userstatut__role__msg'>
-                    {props.t(`Hi ! ${props.user.public_name} `)}{props.t('currently, you are ')}
+                    {props.t('Hi {{name}} ! Currently, you are ', {name: props.user.public_name})}
                   </div>
 
                   {(() => {

frontend/src/container/Login.jsx

@@ -55,8 +55,8 @@ class Login extends React.Component {
       Cookies.set(COOKIE.USER_LOGIN, inputLogin.value)
       Cookies.set(COOKIE.USER_AUTH, userAuth)
 
-      history.push(PAGE.HOME)
-    } else if (fetchPostUserLogin.status === 400) {
+      history.push(PAGE.WORKSPACE.ROOT)
+    } else if (fetchPostUserLogin.status === 403) {
       dispatch(newFlashMessage(t('Email or password invalid'), 'danger'))
     }
   }
@@ -140,8 +140,8 @@ class Login extends React.Component {
           </div>
 
           <footer className='loginpage__footer'>
-            <div className='loginpage__footer__text whiteFontColor'>
-              copyright © 2013 - 2018 tracim project.
+            <div className='loginpage__footer__text d-flex align-items-center flex wrap'>
+            copyright © 2013 - 2018 <a href='http://www.tracim.fr/' target='_blank' className='ml-3'>tracim.fr</a>
             </div>
           </footer>
 

frontend/src/container/Sidebar.jsx

@@ -25,7 +25,7 @@ class Sidebar extends React.Component {
     super(props)
     this.state = {
       sidebarClose: false,
-      workspaceIdInUrl: props.match.params.idws ? parseInt(props.match.params.idws) : null
+      workspaceIdInUrl: props.match && props.match.params.idws ? parseInt(props.match.params.idws) : null
     }
 
     document.addEventListener('appCustomEvent', this.customEventReducer)
@@ -41,14 +41,17 @@ class Sidebar extends React.Component {
   }
 
   componentDidMount () {
+    // console.log('Sidebar Did Mount', this.props)
     this.loadAppConfigAndWorkspaceList()
   }
 
   componentDidUpdate (prevProps, prevState) {
+    const { props } = this
+
     // console.log('%c<Sidebar> Did Update', 'color: #c17838')
-    if (this.props.match.params.idws === undefined || isNaN(this.props.match.params.idws)) return
+    if (!props.match || props.match.params.idws === undefined || isNaN(props.match.params.idws)) return
 
-    const newWorkspaceId = parseInt(this.props.match.params.idws)
+    const newWorkspaceId = parseInt(props.match.params.idws)
     if (prevState.workspaceIdInUrl !== newWorkspaceId) this.setState({workspaceIdInUrl: newWorkspaceId})
   }
 
@@ -104,7 +107,7 @@ class Sidebar extends React.Component {
     return (
       <div className={classnames('sidebar primaryColorBgDarken', {'sidebarclose': sidebarClose})}>
         <div className='sidebarSticky'>
-          <div className='sidebar__expand primaryColorBg whiteColorBorder' onClick={this.handleClickToggleSidebar}>
+          <div className='sidebar__expand primaryColorBg' onClick={this.handleClickToggleSidebar}>
             <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
           </div>
 

frontend/src/container/Tracim.jsx

@@ -1,18 +1,18 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import { translate } from 'react-i18next'
+import Sidebar from './Sidebar.jsx'
 import Header from './Header.jsx'
 import Login from './Login.jsx'
-import Dashboard from './Dashboard.jsx'
 import Account from './Account.jsx'
+import AdminWorkspacePage from './AdminWorkspacePage.jsx'
 import AppFullscreenManager from './AppFullscreenManager.jsx'
 import FlashMessage from '../component/FlashMessage.jsx'
 import WorkspaceContent from './WorkspaceContent.jsx'
 import WIPcomponent from './WIPcomponent.jsx'
 import {
-  Route, withRouter, Switch
+  Route, withRouter, Redirect
 } from 'react-router-dom'
-import PrivateRoute from './PrivateRoute.jsx'
 import { COOKIE, PAGE } from '../helper.js'
 import {
   getUserIsConnected
@@ -22,6 +22,7 @@ import {
   setUserConnected
 } from '../action-creator.sync.js'
 import Cookies from 'js-cookie'
+import Dashboard from './Dashboard.jsx'
 
 class Tracim extends React.Component {
   constructor (props) {
@@ -40,6 +41,7 @@ class Tracim extends React.Component {
   }
 
   async componentDidMount () {
+    // console.log('<Tracim> did Mount')
     const { dispatch } = this.props
 
     const userFromCookies = {
@@ -66,27 +68,70 @@ class Tracim extends React.Component {
   handleRemoveFlashMessage = msg => this.props.dispatch(removeFlashMessage(msg))
 
   render () {
-    const { flashMessage, t } = this.props
+    const { props } = this
+
+    if (props.user.logged === null) return null // @TODO show loader
+
+    if (props.user.logged === false && props.location.pathname !== '/login') {
+      return <Redirect to={{pathname: '/login', state: {from: props.location}}} />
+    }
 
     return (
       <div className='tracim'>
         <Header />
-        <FlashMessage flashMessage={flashMessage} removeFlashMessage={this.handleRemoveFlashMessage} t={t} />
+        <FlashMessage flashMessage={props.flashMessage} removeFlashMessage={this.handleRemoveFlashMessage} t={props.t} />
 
         <div className='tracim__content'>
           <Route path={PAGE.LOGIN} component={Login} />
 
-          <PrivateRoute exact path='/' component={WorkspaceContent} />
-
-          <Switch>
-            <PrivateRoute path={PAGE.WORKSPACE.DASHBOARD(':idws')} component={Dashboard} />
-            <PrivateRoute path={PAGE.WORKSPACE.CALENDAR(':idws')} component={() => <div><br /><br /><br /><br />NYI</div>} />
-            <PrivateRoute path={PAGE.WORKSPACE.CONTENT(':idws', ':type?', ':idcts?')} component={WorkspaceContent} />
-          </Switch>
-
-          <PrivateRoute path={PAGE.ACCOUNT} component={Account} />
-          <PrivateRoute path={PAGE.ADMIN.ROOT} component={AppFullscreenManager} />
-          <PrivateRoute path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
+          <Route exact path='/' component={() => {
+            switch (props.user.logged) {
+              case true:
+                return <Redirect to={{pathname: PAGE.WORKSPACE.ROOT, state: {from: props.location}}} />
+              case false:
+                return <Redirect to={{pathname: '/login', state: {from: props.location}}} />
+              case null:
+                return null
+            }
+          }} />
+
+          <Route path='/workspaces/:idws?' render={() => // Workspace Router
+            <div className='sidebarpagecontainer'>
+              <Sidebar />
+
+              <Route exact path={PAGE.WORKSPACE.ROOT} render={() => props.workspaceList.length === 0 // handle '/' and redirect to first workspace
+                ? null // @FIXME this needs to be handled in case of new user that has no workspace
+                : <Redirect to={{pathname: `/workspaces/${props.workspaceList[0].id}/contents`, state: {from: props.location}}} />
+              } />
+
+              <Route exact path={`${PAGE.WORKSPACE.ROOT}/:idws`} render={props2 => // handle '/workspaces/:id' and add '/contents'
+                <Redirect to={{pathname: `/workspaces/${props2.match.params.idws}/contents`, state: {from: props.location}}} />
+              } />
+
+              <Route path={PAGE.WORKSPACE.DASHBOARD(':idws')} component={Dashboard} />
+              <Route path={PAGE.WORKSPACE.CALENDAR(':idws')} component={() => <div><br /><br /><br /><br />NYI</div>} />
+              <Route path={PAGE.WORKSPACE.CONTENT(':idws', ':type', ':idcts')} component={WorkspaceContent} />
+              <Route exact path={PAGE.WORKSPACE.CONTENT_LIST(':idws')} component={WorkspaceContent} />
+            </div>
+          } />
+
+          <Route path={PAGE.ACCOUNT} render={() =>
+            <div className='sidebarpagecontainer'>
+              <Sidebar />
+              <Account />
+            </div>
+          } />
+
+          <Route path={PAGE.ADMIN.ROOT} render={() =>
+            <div className='sidebarpagecontainer'>
+              <Sidebar />
+              <AppFullscreenManager />
+            </div>
+          } />
+
+          <Route path='/admin_temp/workspace' component={AdminWorkspacePage} />
+
+          <Route path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
 
           <div id='appFeatureContainer' />
         </div>
@@ -96,5 +141,5 @@ class Tracim extends React.Component {
   }
 }
 
-const mapStateToProps = ({ user, appList, contentType, flashMessage }) => ({ user, appList, contentType, flashMessage })
+const mapStateToProps = ({ user, appList, contentType, workspaceList, flashMessage }) => ({ user, appList, contentType, workspaceList, flashMessage })
 export default withRouter(connect(mapStateToProps)(translate()(Tracim)))

frontend/src/container/WorkspaceContent.jsx

@@ -3,7 +3,6 @@ import { connect } from 'react-redux'
 import { withRouter, Route } from 'react-router-dom'
 import appFactory from '../appFactory.js'
 import { PAGE } from '../helper.js'
-import Sidebar from './Sidebar.jsx'
 import Folder from '../component/Workspace/Folder.jsx'
 import ContentItem from '../component/Workspace/ContentItem.jsx'
 import ContentItemHeader from '../component/Workspace/ContentItemHeader.jsx'
@@ -108,7 +107,7 @@ class WorkspaceContent extends React.Component {
 
   handleClickContentItem = content => {
     console.log('%c<WorkspaceContent> content clicked', 'color: #c17838', content)
-    this.props.history.push(`/workspaces/${content.idWorkspace}/${content.type}/${content.id}`)
+    this.props.history.push(PAGE.WORKSPACE.CONTENT(content.idWorkspace, content.type, content.id))
   }
 
   handleClickEditContentItem = (e, content) => {
@@ -166,9 +165,7 @@ class WorkspaceContent extends React.Component {
       : []
 
     return (
-      <div className='sidebarpagecontainer'>
-        <Sidebar />
-
+      <div className='WorkspaceContent' style={{width: '100%'}}>
         <OpenContentApp
           // automatically open the app for the idContent in url
           idWorkspace={this.state.workspaceIdInUrl}

frontend/src/css/AdminWorkspacePage.styl

@@ -0,0 +1,11 @@
+.adminWorkspacePage
+  &__createworkspace
+    &__btncreate
+      margin 25px 15px
+  &__description
+    margin 25px 15px
+    font-size 20px
+  &__delimiter
+    margin 25px auto 65px auto
+  &__workspaceTable
+    margin 25px 15px

frontend/src/css/Dashboard.styl

@@ -31,7 +31,6 @@ coloricon()
     color lecteur
 
 .dashboard
-  margin-left 20px
   width 100%
   &__header
     flexwrap()

frontend/src/css/Generic.styl

@@ -111,7 +111,7 @@ a
 
 
 .pageContentGeneric
-  margin 10px 0 0 0
+  margin 10px 15px 0 15px
   width 100%
   height 100%
 

frontend/src/css/Login.styl

@@ -70,6 +70,12 @@
     &__text
       width 310px
       font-size 17px
+      color off-white
+      & > a
+        color off-white
+        font-size 19px
+        &:hover
+          text-decoration underline
 
 @media (min-width: min-lg) and (max-width: max-lg)
   .loginpage

frontend/src/css/Workspace.styl

@@ -4,7 +4,6 @@
     flex-wrap wrap
     margin-right 15px
   &__content
-    margin 0 15px
     &__button
       display flex
       justify-content flex-end

frontend/src/helper.js

@@ -24,14 +24,12 @@ export const workspaceConfig = {
 export const PAGE = {
   HOME: '/',
   WORKSPACE: {
+    ROOT: '/workspaces',
     DASHBOARD: (idws = ':idws') => `/workspaces/${idws}/dashboard`,
-    NEW: (idws, type) => `/workspaces/${idws}/${type}/new`,
+    NEW: (idws, type) => `/workspaces/${idws}/contents/${type}/new`,
     CALENDAR: (idws = ':idws') => `/workspaces/${idws}/calendar`,
     CONTENT_LIST: (idws = ':idws') => `/workspaces/${idws}/contents`,
-    CONTENT: (idws = ':idws', type = ':type?', idcts = ':idcts?') => `/workspaces/${idws}/${type}/${idcts}`, // @TODO add /contents/ in url and remove <Switch> in <Tracim>
-    // CONTENT_NEW: (idws = ':idws', ctstype = ':ctstype') => `/workspaces/${idws}/contents/${ctstype}/new`,
-    // CONTENT_EDIT: (idws = ':idws', idcts = ':idcts') => `/workspaces/${idws}/contents/${idcts}/edit`,
-    // CONTENT_TITLE_EDIT: (idws = ':idws', idcts = ':idcts') => `/workspaces/${idws}/contents/${idcts}/title/edit`,
+    CONTENT: (idws = ':idws', type = ':type', idcts = ':idcts') => `/workspaces/${idws}/contents/${type}/${idcts}`,
     ADMIN: (idws = ':idws') => `/workspaces/${idws}/admin`
   },
   LOGIN: '/login',

frontend/src/reducer/user.js

@@ -35,7 +35,7 @@ export default function user (state = defaultUser, action) {
       }
 
     case `${SET}/${USER_DISCONNECTED}`:
-      return defaultUser
+      return {...defaultUser, logged: false}
 
     case `${UPDATE}/${USER_DATA}`:
       return {...state, ...action.data}

frontend/webpack.config.js

@@ -28,10 +28,10 @@ module.exports = {
     ]
   },
   output: {
-    path: path.resolve(__dirname, 'dist'),
+    path: path.resolve(__dirname, 'dist/asset'),
     filename: 'tracim.app.entry.js',
     pathinfo: !isProduction,
-    publicPath: '/'
+    publicPath: '/asset/'
   },
   devServer: {
     contentBase: path.join(__dirname, 'dist/'),
@@ -70,8 +70,10 @@ module.exports = {
       use: ['style-loader', 'css-loader', 'stylus-loader']
     }, {
       test: /\.(jpg|png|svg)$/,
-      loader: 'url-loader',
+      loader: 'file-loader',
       options: {
+        name: '[name].[ext]',
+        outputPath: 'images/', // asset/ is in output.path
         limit: 2000
       }
     }]

frontend_app_admin_workspace_user/build_admin_workspace_user.sh

@@ -7,11 +7,11 @@ if [[ $1 = "-w" ]]; then
     windoz="windoz"
 fi
 
-log "npm run build$windoz"
+log "build frontend_app_admin_workspace_user"
 npm run build$windoz
-log "cp dist/admin_workspace_user.app.js ../frontend/dist/app"
+log "copying built file to frontend/"
 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"
+log "copying 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"
+log "copying fr translation.json"
 cp i18next.scanner/fr/translation.json ../frontend/dist/app/admin_workspace_user_fr_translation.json

frontend_app_html-document/build_html-document.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# shellcheck disable=SC1091
 . ../bash_library.sh # source bash_library.sh
 
 windoz=""
@@ -7,11 +8,11 @@ if [[ $1 = "-w" ]]; then
     windoz="windoz"
 fi
 
-log "npm run build$windoz"
+log "build frontend_app_html-document"
 npm run build$windoz
-log "cp dist/html-document.app.js ../frontend/dist/app"
+log "copying built file to frontend/"
 cp dist/html-document.app.js ../frontend/dist/app
-log "cp i18next.scanner/en/translation.json ../frontend/dist/app/html-document_en_translation.json"
+log "copying en translation.json"
 cp i18next.scanner/en/translation.json ../frontend/dist/app/html-document_en_translation.json
-log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json"
+log "copying fr translation.json"
 cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json

frontend_app_thread/build_thread.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# shellcheck disable=SC1091
 . ../bash_library.sh # source bash_library.sh
 
 windoz=""
@@ -7,11 +8,11 @@ if  [[ $1 = "-w" ]]; then
     windoz="windoz"
 fi
 
-log "npm run build$windoz"
+log "build frontend_app_thread"
 npm run build$windoz
-log "cp dist/thread.app.js ../frontend/dist/app"
+log "copying built file to frontend/"
 cp dist/thread.app.js ../frontend/dist/app
-log "cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json"
+log "copying 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"
+log "copying fr translation.json"
 cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json

frontend_app_workspace/build_workspace.sh

@@ -7,11 +7,11 @@ if [[ $1 = "-w" ]]; then
     windoz="windoz"
 fi
 
-log "npm run build$windoz"
+log "build frontend_app_workspace"
 npm run build$windoz
-log "cp dist/workspace.app.js ../frontend/dist/app"
+log "copying built file to frontend/"
 cp dist/workspace.app.js ../frontend/dist/app
-log "cp i18next.scanner/en/translation.json ../frontend/dist/app/workspace_en_translation.json"
+log "copying en translation.json"
 cp i18next.scanner/en/translation.json ../frontend/dist/app/workspace_en_translation.json
-log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/workspace_fr_translation.json"
+log "copying fr translation.json"
 cp i18next.scanner/fr/translation.json ../frontend/dist/app/workspace_fr_translation.json

install_frontend_dependencies.sh

@@ -1,61 +1,70 @@
 #!/bin/bash
 
+# shellcheck disable=SC1091
 . bash_library.sh # source bash_library.sh
 
 # install Tracim Lib
 
-log "cd frontend_lib"
-cd frontend_lib
-log "npm i"
-npm i
-log "sudo npm link"
-sudo npm link
-cd -
+(
+  log "cd frontend_lib"
+  cd frontend_lib
+  log "npm i"
+  npm i
+  log "sudo npm link"
+  sudo npm link || exit
+)
 
 # install app Html Document
 
-log "cd frontend_app_html-document"
-cd frontend_app_html-document
-log "npm i"
-npm i
-log "npm link tracim_frontend_lib"
-npm link tracim_frontend_lib
-cd -
+(
+  log "cd frontend_app_html-document"
+  cd frontend_app_html-document
+  log "npm i"
+  npm i
+  log "npm link tracim_frontend_lib"
+  npm link tracim_frontend_lib
+)
 
 # install app Thread
 
-log "cd frontend_app_thread"
-cd frontend_app_thread
-log "npm i"
-npm i
-log "npm link tracim_frontend_lib"
-npm link tracim_frontend_lib
-cd -
+(
+  log "cd frontend_app_thread"
+  cd frontend_app_thread
+  log "npm i"
+  npm i
+  log "npm link tracim_frontend_lib"
+  npm link tracim_frontend_lib
+)
 
 # install app Workspace
 
-log "cd frontend_app_workspace"
-cd frontend_app_workspace
-log "npm i"
-npm i
-log "npm link tracim_frontend_lib"
-npm link tracim_frontend_lib
-cd -
+(
+  log "cd frontend_app_workspace"
+  cd frontend_app_workspace
+  log "npm i"
+  npm i
+  log "npm link tracim_frontend_lib"
+  npm link tracim_frontend_lib
+)
 
 # install app Admin Workspace User
 
-log "cd frontend_app_admin_workspace_user"
-cd frontend_app_admin_workspace_user
-log "npm i"
-npm i
-log "npm link tracim_frontend_lib"
-npm link tracim_frontend_lib
-cd -
+(
+  log "cd frontend_app_admin_workspace_user"
+  cd frontend_app_admin_workspace_user
+  log "npm i"
+  npm i
+  log "npm link tracim_frontend_lib"
+  npm link tracim_frontend_lib
+)
 
 # install Tracim Frontend
 
-log "cd frontend"
-cd frontend
-log "npm i"
-npm i
-cd -
+(
+  log "cd frontend"
+  cd frontend
+  log "npm i"
+  npm i
+  log "npm link tracim_frontend_lib"
+  npm link tracim_frontend_lib
+)