CalDavZap client integration finale

tracim/tracim/controllers/calendar.py

@@ -34,21 +34,25 @@ class CalendarConfigController(BaseController):
 
     @tg.expose('tracim.templates.calendar.config')
     def index(self):
-        # TODO: S'assurer d'être identifié !
+        # TODO BS 20160720: S'assurer d'être identifié !
         user = tmpl_context.identity.get('user')
         dictified_current_user = Context(CTX.CURRENT_USER).toDict(user)
 
         fake_api = DictLikeClass(
             current_user=dictified_current_user,
         )
-        calendar_urls = CalendarManager\
-            .get_readable_calendars_urls_for_user(user)
+        user_base_url = CalendarManager.get_user_base_url()
+        workspace_base_url = CalendarManager.get_workspace_base_url()
+        workspace_calendar_urls = CalendarManager\
+            .get_workspace_readable_calendars_urls_for_user(user)
 
         # Template will use User.auth_token, ensure it's validity
         user.ensure_auth_token()
 
         return DictLikeClass(
             fake_api=fake_api,
-            clendar_urls=calendar_urls,
+            user_base_url=user_base_url,
+            workspace_base_url=workspace_base_url,
+            workspace_clendar_urls=workspace_calendar_urls,
             auth_token=user.auth_token,
         )

tracim/tracim/lib/calendar.py

@@ -30,6 +30,9 @@ CALENDAR_TYPE_WORKSPACE = WorkspaceCalendar
 CALENDAR_USER_URL_TEMPLATE = 'user/{id}.ics/'
 CALENDAR_WORKSPACE_URL_TEMPLATE = 'workspace/{id}.ics/'
 
+CALENDAR_USER_BASE_URL = '/user/'
+CALENDAR_WORKSPACE_BASE_URL = '/workspace/'
+
 
 class CalendarManager(object):
     @classmethod
@@ -39,6 +42,18 @@ class CalendarManager(object):
         return cfg.RADICALE_CLIENT_BASE_URL_TEMPLATE
 
     @classmethod
+    def get_user_base_url(cls):
+        from tracim.config.app_cfg import CFG
+        cfg = CFG.get_instance()
+        return os.path.join(cfg.RADICALE_CLIENT_BASE_URL_TEMPLATE, 'user/')
+
+    @classmethod
+    def get_workspace_base_url(cls):
+        from tracim.config.app_cfg import CFG
+        cfg = CFG.get_instance()
+        return os.path.join(cfg.RADICALE_CLIENT_BASE_URL_TEMPLATE, 'workspace/')
+
+    @classmethod
     def get_user_calendar_url(cls, user_id: int):
         user_path = CALENDAR_USER_URL_TEMPLATE.format(id=str(user_id))
         return os.path.join(cls.get_base_url(), user_path)
@@ -262,8 +277,9 @@ class CalendarManager(object):
         }
 
     @classmethod
-    def get_readable_calendars_urls_for_user(cls, user: User) -> [str]:
-        calendar_urls = [cls.get_user_calendar_url(user.user_id)]
+    def get_workspace_readable_calendars_urls_for_user(cls, user: User)\
+            -> [str]:
+        calendar_urls = []
         workspace_api = WorkspaceApi(user)
         for workspace in workspace_api.get_all_for_user(user):
             if workspace.calendar_enabled:
@@ -272,3 +288,12 @@ class CalendarManager(object):
                 ))
 
         return calendar_urls
+
+    def is_discovery_path(self, path: str) -> bool:
+        """
+        If collection url in one of them, Caldav client is tring to discover
+        collections.
+        :param path: collection path
+        :return: True if given collection path is an discover path
+        """
+        return path in ('user', 'workspace')

tracim/tracim/lib/radicale/rights.py

@@ -15,6 +15,10 @@ def authorized(user, collection, permission):
         return False
     current_user = UserApi(None).get_one_by_email(user)
     manager = CalendarManager(current_user)
+
+    if manager.is_discovery_path(collection.path):
+        return True
+
     try:
         calendar = manager.find_calendar_with_path(collection.path)
     except NotFound:

tracim/tracim/templates/calendar/config.mak

@@ -1,9 +1,8 @@
 // Values copied from caldavzap config.js file.
 
 var globalAccountSettings=[
-% for clendar_url in clendar_urls:
     {
-        href: '${clendar_url}',
+        href: '${user_base_url}',
         userAuth:
         {
             userName: '${fake_api.current_user.email}',
@@ -16,47 +15,15 @@ var globalAccountSettings=[
         delegation: false,
         forceReadOnly: null,
         ignoreAlarms: false,
-        backgroundCalendars: []
-    },
-% endfor
-/**    {
-        href: 'http://127.0.0.1:5232/user/1.ics/',
-        userAuth:
-        {
-            userName: 'admin@admin.admin',
-            userPassword: 'admin@admin.admin'
-        },
-        timeOut: 90000,
-        lockTimeOut: 10000,
-        checkContentType: true,
-        settingsAccount: false,
-        delegation: false,
-        forceReadOnly: null,
-        ignoreAlarms: false,
-        backgroundCalendars: []
-    },
-    {
-        href: 'http://127.0.0.1:5232/workspace/1.ics/',
-        userAuth:
-        {
-            userName: 'admin@admin.admin',
-            userPassword: 'admin@admin.admin'
-        },
-        timeOut: 90000,
-        lockTimeOut: 10000,
-        checkContentType: true,
-        settingsAccount: false,
-        delegation: false,
-        forceReadOnly: null,
-        ignoreAlarms: false,
-        backgroundCalendars: []
+        backgroundCalendars: ['1.ics']
     },
+% if workspace_clendar_urls:
     {
-        href: 'http://127.0.0.1:5232/workspace/2.ics/',
+        href: '${workspace_base_url}',
         userAuth:
         {
-            userName: 'admin@admin.admin',
-            userPassword: 'admin@admin.admin'
+            userName: '${fake_api.current_user.email}',
+            userPassword: '${auth_token}'
         },
         timeOut: 90000,
         lockTimeOut: 10000,
@@ -67,7 +34,7 @@ var globalAccountSettings=[
         ignoreAlarms: false,
         backgroundCalendars: []
     },
-*/
+% endif
 ] ;
 
 var globalBackgroundSync=true;