wwebsite_url required + fix most url issue for mail_template

backend/tests_configs.ini

@@ -4,7 +4,7 @@ depot_storage_name = test
 depot_storage_dir = /tmp/test/depot
 user.auth_token.validity = 604800
 preview_cache_dir = /tmp/test/preview_cache
-
+website.base_url = http://localhost:6543
 [app:command_test]
 use = egg:tracim_backend
 sqlalchemy.url = sqlite:///tracim_test.sqlite
@@ -12,6 +12,7 @@ depot_storage_name = test
 depot_storage_dir = /tmp/test/depot
 user.auth_token.validity = 604800
 preview_cache_dir = /tmp/test/preview_cache
+website.base_url = http://localhost:6543
 
 [mail_test]
 sqlalchemy.url = sqlite:///:memory:
@@ -37,6 +38,7 @@ email.notification.smtp.server = 127.0.0.1
 email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password
+website.base_url = http://localhost:6543
 
 [mail_test_async]
 sqlalchemy.url = sqlite:///:memory:
@@ -63,6 +65,7 @@ email.notification.smtp.server = 127.0.0.1
 email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password
+website.base_url = http://localhost:6543
 
 [functional_test]
 sqlalchemy.url = sqlite:///tracim_test.sqlite
@@ -72,6 +75,7 @@ user.auth_token.validity = 604800
 preview_cache_dir = /tmp/test/preview_cache
 preview.jpg.restricted_dims = True
 email.notification.activated = false
+website.base_url = http://localhost:6543
 
 [functional_test_no_db]
 sqlalchemy.url = sqlite://
@@ -81,6 +85,7 @@ user.auth_token.validity = 604800
 preview_cache_dir = /tmp/test/preview_cache
 preview.jpg.restricted_dims = True
 email.notification.activated = false
+website.base_url = http://localhost:6543
 
 [functional_test_with_mail_test_sync]
 sqlalchemy.url = sqlite:///tracim_test.sqlite
@@ -105,7 +110,7 @@ email.notification.smtp.server = 127.0.0.1
 email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password
-
+website.base_url = http://localhost:6543
 
 [functional_test_with_mail_test_async]
 sqlalchemy.url = sqlite:///tracim_test.sqlite
@@ -129,4 +134,5 @@ 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
+email.notification.smtp.password = just_a_password
+website.base_url = http://localhost:6543

backend/tracim_backend/config.py

@@ -81,6 +81,12 @@ class CFG(object):
             'website.base_url',
             '',
         )
+        if not self.WEBSITE_BASE_URL:
+            raise Exception(
+                'website.base_url is needed in order to have correct path in'
+                'few place like in email.'
+                'You should set it with frontend root url.'
+            )
 
         # TODO - G.M - 26-03-2018 - [Cleanup] These params seems deprecated for tracimv2,  # nopep8
         # Verify this

backend/tracim_backend/lib/mail_notifier/notifier.py

@@ -17,9 +17,12 @@ from tracim_backend.lib.mail_notifier.utils import SmtpConfiguration, EST
 from tracim_backend.lib.mail_notifier.sender import send_email_through
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.lib.utils.logger import logger
-from tracim_backend.models import User
+from tracim_backend.lib.utils.utils import get_login_frontend_url
+from tracim_backend.lib.utils.utils import get_email_logo_frontend_url
 from tracim_backend.models.auth import User
 from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.models.context_models import ContentInContext
+from tracim_backend.models.context_models import WorkspaceInContext
 from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.data import Content
 from tracim_backend.models.data import UserRoleInWorkspace
@@ -234,7 +237,13 @@ class EmailManager(object):
             show_archived=True,
             show_deleted=True,
         ).get_one(event_content_id, CONTENT_TYPES.Any_SLUG)
-        main_content = content.parent if content.type == CONTENT_TYPES.Comment.slug else content
+        workspace_api = WorkspaceApi(
+            session=self.session,
+            current_user=user,
+            config=self.config,
+        )
+        workpace_in_context = workspace_api.get_workspace_with_context(workspace_api.get_one(content.workspace_id))  # nopep8
+        main_content = content.parent if content.type == CONTENT_TYPES.Comment.slug else content  # nopep8
         notifiable_roles = WorkspaceApi(
             current_user=user,
             session=self.session,
@@ -265,7 +274,7 @@ class EmailManager(object):
             # INFO - G.M - 2017-11-15 - set content_id in header to permit reply
             # references can have multiple values, but only one in this case.
             replyto_addr = self.config.EMAIL_NOTIFICATION_REPLY_TO_EMAIL.replace( # nopep8
-                '{content_id}',str(content.content_id)
+                '{content_id}', str(content.content_id)
             )
 
             reference_addr = self.config.EMAIL_NOTIFICATION_REFERENCES_EMAIL.replace( #nopep8
@@ -297,8 +306,21 @@ class EmailManager(object):
             # To link this email to a content we create a virtual parent
             # in reference who contain the content_id.
             message['References'] = formataddr(('',reference_addr))
-            body_text = self._build_email_body_for_content(self.config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT, role, content, user)
-            body_html = self._build_email_body_for_content(self.config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_HTML, role, content, user)
+            content_in_context = content_api.get_content_in_context(content)
+            body_text = self._build_email_body_for_content(
+                self.config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT,
+                role,
+                content_in_context,
+                workpace_in_context,
+                user
+            )
+            body_html = self._build_email_body_for_content(
+                self.config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_HTML,
+                role,
+                content_in_context,
+                workpace_in_context,
+                user
+            )
 
             part1 = MIMEText(body_text, 'plain', 'utf-8')
             part2 = MIMEText(body_html, 'html', 'utf-8')
@@ -362,9 +384,9 @@ class EmailManager(object):
             'user': user,
             'password': password,
             # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for logo_url  # nopep8
-            'logo_url': '',
+            'logo_url': get_email_logo_frontend_url(self.config),
             # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for login_url  # nopep8
-            'login_url': self.config.WEBSITE_BASE_URL,
+            'login_url': get_login_frontend_url(self.config),
         }
         body_text = self._render_template(
             mako_template_filepath=text_template_file_path,
@@ -415,8 +437,9 @@ class EmailManager(object):
             self,
             mako_template_filepath: str,
             role: UserRoleInWorkspace,
-            content: Content,
-            actor: User
+            content_in_context: ContentInContext,
+            workspace_in_context: WorkspaceInContext,
+            actor: User,
     ) -> str:
         """
         Build an email body and return it as a string
@@ -424,24 +447,21 @@ class EmailManager(object):
         :param role: the role related to user to whom the email must be sent. The role is required (and not the user only) in order to show in the mail why the user receive the notification
         :param content: the content item related to the notification
         :param actor: the user at the origin of the action / notification (for example the one who wrote a comment
-        :param config: the global configuration
         :return: the built email body as string. In case of multipart email, this method must be called one time for text and one time for html
         """
         logger.debug(self, 'Building email content from MAKO template {}'.format(mako_template_filepath))
-
+        content = content_in_context.content
         main_title = content.label
         content_intro = ''
         content_text = ''
         call_to_action_text = ''
 
-        # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for call_to_action_url  # nopep8
-        call_to_action_url =''
+        call_to_action_url = content_in_context.frontend_url
         # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for status_icon_url  # nopep8
         status_icon_url = ''
-        # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for workspace_url  # nopep8
-        workspace_url = ''
+        workspace_url = workspace_in_context.frontend_url
         # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for logo_url  # nopep8
-        logo_url = ''
+        logo_url = get_email_logo_frontend_url(self.config)
 
         action = content.get_last_action().id
         if ActionDescription.COMMENT == action:

backend/tracim_backend/lib/utils/utils.py

@@ -2,6 +2,8 @@
 import datetime
 import random
 import string
+from enum import Enum
+
 from redis import Redis
 from rq import Queue
 
@@ -10,6 +12,32 @@ from tracim_backend.config import CFG
 DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
 DEFAULT_WEBDAV_CONFIG_FILE = "wsgidav.conf"
 DEFAULT_TRACIM_CONFIG_FILE = "development.ini"
+CONTENT_FRONTEND_URL_SCHEMA = 'workspaces/{workspace_id}/contents/{content_type}/{content_id}'  # nopep8
+WORKSPACE_FRONTEND_URL_SCHEMA = 'workspaces/{workspace_id}'  # nopep8
+
+
+def get_root_frontend_url(config: CFG) -> str:
+    """
+    Return website base url with always '/' at the end
+    """
+    base_url = ''
+    if config.WEBSITE_BASE_URL[-1] == '/':
+        base_url = config.WEBSITE_BASE_URL
+    else:
+        base_url = config.WEBSITE_BASE_URL + '/'
+    return base_url
+
+
+def get_login_frontend_url(config: CFG):
+    """
+    Return login page url
+    """
+    return get_root_frontend_url(config) + 'login'
+
+
+def get_email_logo_frontend_url(config: CFG):
+    # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for email_logo_frontend_url  # nopep8
+    return 'data:image/png;base64,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'  # nopep8'
 
 
 def get_redis_connection(config: CFG) -> Redis:
@@ -96,3 +124,4 @@ def password_generator(
     :return: password as string
     """
     return ''.join(random.choice(chars) for char_number in range(length))
+

backend/tracim_backend/models/context_models.py

@@ -7,6 +7,9 @@ from slugify import slugify
 from sqlalchemy.orm import Session
 from tracim_backend.config import CFG
 from tracim_backend.config import PreviewDim
+from tracim_backend.lib.utils.utils import get_root_frontend_url
+from tracim_backend.lib.utils.utils import CONTENT_FRONTEND_URL_SCHEMA
+from tracim_backend.lib.utils.utils import WORKSPACE_FRONTEND_URL_SCHEMA
 from tracim_backend.models import User
 from tracim_backend.models.auth import Profile
 from tracim_backend.models.data import Content
@@ -14,7 +17,7 @@ from tracim_backend.models.data import ContentRevisionRO
 from tracim_backend.models.data import Workspace
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.roles import WorkspaceRoles
-from tracim_backend.models.workspace_menu_entries import default_workspace_menu_entry
+from tracim_backend.models.workspace_menu_entries import default_workspace_menu_entry  # nopep8
 from tracim_backend.models.workspace_menu_entries import WorkspaceMenuEntry
 from tracim_backend.models.contents import CONTENT_TYPES
 
@@ -462,6 +465,14 @@ class WorkspaceInContext(object):
         # apps)
         return default_workspace_menu_entry(self.workspace)
 
+    @property
+    def frontend_url(self):
+        root_frontend_url = get_root_frontend_url(self.config)
+        workspace_frontend_url = WORKSPACE_FRONTEND_URL_SCHEMA.format(
+            workspace_id=self.workspace_id,
+        )
+        return root_frontend_url + workspace_frontend_url
+
 
 class UserRoleWorkspaceInContext(object):
     """
@@ -660,6 +671,16 @@ class ContentInContext(object):
         assert self._user
         return not self.content.has_new_information_for(self._user)
 
+    @property
+    def frontend_url(self):
+        root_frontend_url = get_root_frontend_url(self.config)
+        content_frontend_url = CONTENT_FRONTEND_URL_SCHEMA.format(
+            workspace_id=self.workspace_id,
+            content_type=self.content_type,
+            content_id=self.content_id,
+        )
+        return root_frontend_url + content_frontend_url
+
 
 class RevisionInContext(object):
     """

backend/tracim_backend/templates/mail/content_update_body_html.mak

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

backend/tracim_backend/templates/mail/created_account_body_html.mak

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

backend/tracim_backend/tests/library/test_webdav.py

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

backend/tracim_backend/views/core_api/schemas.py

@@ -48,7 +48,7 @@ class UserDigestSchema(marshmallow.Schema):
     user_id = marshmallow.fields.Int(dump_only=True, example=3)
     avatar_url = marshmallow.fields.Url(
         allow_none=True,
-        example="/api/v2/assets/avatars/suri-cate.jpg",
+        example="/api/v2/asset/avatars/suri-cate.jpg",
         description="avatar_url is the url to the image file. "
                     "If no avatar, then set it to null "
                     "(and frontend will interpret this with a default avatar)",

backend/tracim_backend/views/frontend.py

@@ -27,7 +27,7 @@ class FrontendController(Controller):
     def not_found_view(self, context, request: TracimRequest):
 
         if request.path.startswith(BASE_API_V2):
-            raise PageNotFound('{} is not a valid path'.format(request.path)) from context # nopep8
+            raise PageNotFound('{} is not a valid path'.format(request.path)) from context  # nopep8
         return self.index(context, request)
 
     def index(self, context, request: TracimRequest):