[CalendarServer-changes] [13757] CalendarServer/branches/users/gaya/groupsharee2/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jul 14 20:00:34 PDT 2014
Revision: 13757
http://trac.calendarserver.org//changeset/13757
Author: gaya at apple.com
Date: 2014-07-14 20:00:34 -0700 (Mon, 14 Jul 2014)
Log Message:
-----------
Checkpoint changes
Modified Paths:
--------------
CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_tables.py
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-14 22:12:05 UTC (rev 13756)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-15 03:00:34 UTC (rev 13757)
@@ -1789,7 +1789,7 @@
for memberUID in memberUIDs - boundUIDs:
shareeView = yield self.shareeView(memberUID)
- newMode = _BIND_MODE_GROUP if shareeView is None else shareeView.groupModeAfterAddingOneGroupSharee()
+ newMode = _BIND_MODE_GROUP if shareeView is None else shareeView._groupModeAfterAddingOneGroupSharee()
if newMode is not None:
yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
changed = True
@@ -1797,11 +1797,36 @@
returnValue(changed)
- def groupModeAfterAddingOneGroupSharee(self):
+ def _groupModeAfterAddingOneIndividualSharee(self, mode):
"""
+ return bind mode after adding one individual sharee with mode
+ """
+ addToGroupModeMap = {
+ _BIND_MODE_READ: _BIND_MODE_GROUP_READ,
+ _BIND_MODE_WRITE: _BIND_MODE_GROUP_WRITE,
+ }
+ return {
+ _BIND_MODE_GROUP_READ: addToGroupModeMap.get(mode),
+ _BIND_MODE_GROUP_WRITE: addToGroupModeMap.get(mode),
+ _BIND_MODE_GROUP: addToGroupModeMap.get(mode),
+ }.get(self._bindMode)
+
+
+ def _groupModeAfterRemovingOneIndividualSharee(self):
+ """
return group mode after adding one group sharee or None
"""
return {
+ _BIND_MODE_GROUP_READ: _BIND_MODE_GROUP,
+ _BIND_MODE_GROUP_WRITE: _BIND_MODE_GROUP,
+ }.get(self._bindMode)
+
+
+ def _groupModeAfterAddingOneGroupSharee(self):
+ """
+ return group mode after adding one group sharee or None
+ """
+ return {
_BIND_MODE_GROUP: _BIND_MODE_GROUP,
_BIND_MODE_READ: _BIND_MODE_GROUP_READ,
_BIND_MODE_GROUP_READ: _BIND_MODE_GROUP_READ,
@@ -1928,7 +1953,7 @@
# Higher level API
#
@inlineCallbacks
- def inviteUIDToShare(self, shareeUID, mode, summary, shareName=None):
+ def inviteUIDToShare(self, shareeUID, mode, summary=None, shareName=None):
"""
Invite a user to share this collection - either create the share if it does not exist, or
update the existing share with new values. Make sure a notification is sent as well.
@@ -1941,19 +1966,23 @@
@type summary: C{str}
"""
- record = yield self._txn.directoryService().recordWithUID(shareeUID.decode("utf-8"))
- if (
- record is None or
- record.recordType != RecordType.group or not (
+ if not (
config.Sharing.Enabled and
config.Sharing.Calendars.Enabled and
config.Sharing.Calendars.Groups.Enabled
- )
):
- returnValue(
- (yield super(Calendar, self).inviteUIDToShare(shareeUID, mode, summary, shareName))
- )
+ returnValue((yield super(Calendar, self).inviteUIDToShare(shareeUID, mode, summary, shareName)))
+ record = yield self._txn.directoryService().recordWithUID(shareeUID.decode("utf-8"))
+ if record is None:
+ returnValue((yield super(Calendar, self).inviteUIDToShare(shareeUID, mode, summary, shareName)))
+
+ if record.recordType != RecordType.group:
+ shareeView = yield self.shareeView(shareeUID)
+ groupMode = shareeView._groupModeAfterAddingOneIndividualSharee(mode) if shareeView else None
+ mode = mode if groupMode is None else groupMode
+ returnValue((yield super(Calendar, self).inviteUIDToShare(shareeUID, mode, summary, shareName)))
+
yield self.updateShareeGroupLink(shareeUID, mode=mode)
# invite every member of group
@@ -1963,7 +1992,7 @@
for memberUID in memberUIDs:
if memberUID != self._home.uid():
shareeView = yield self.shareeView(memberUID)
- newMode = _BIND_MODE_GROUP if shareeView is None else shareeView.groupModeAfterAddingOneGroupSharee()
+ newMode = _BIND_MODE_GROUP if shareeView is None else shareeView._groupModeAfterAddingOneGroupSharee()
if newMode is not None:
# everything but direct
shareeView = yield super(Calendar, self).inviteUIDToShare(memberUID, newMode, summary)
@@ -2010,43 +2039,48 @@
@type shareeUID: C{str}
"""
- # see if cached group
- groupID = (yield self._txn.groupByUID(shareeUID, create=False))[0]
- if groupID:
+ # see if group sharee for self & delete
+ gr = schema.GROUPS
+ gs = schema.GROUP_SHAREE
+ rows = yield Delete(
+ From=gs,
+ Where=(gs.CALENDAR_ID == self._resourceID).And(
+ gs.GROUP_ID == Select(
+ [gr.GROUP_ID],
+ From=gr,
+ Where=(gr.GROUP_UID == shareeUID)
+ )
+ ),
+ Return=[gs.GROUP_ID]
+ ).on(self._txn)
- # see if group sharee for self & delete
- gs = schema.GROUP_SHAREE
- rows = yield Delete(
- From=gs,
- Where=(gs.CALENDAR_ID == self._resourceID).And(
- gs.GROUP_ID == groupID
- ),
- Return=[gs.GROUP_ID]
- ).on(self._txn)
+ if rows:
+ # uninvite each member of group
+ memberUIDs = yield self._txn.groupMemberUIDs(rows[0][0])
+ for memberUID in memberUIDs:
+ if memberUID != self._home.uid():
+ shareeView = yield self.shareeView(memberUID)
+ if shareeView is not None:
+ newMode = yield shareeView._groupModeAfterRemovingOneGroupSharee()
+ if newMode is None:
+ # only group was shared, do delete share
+ yield super(Calendar, self).uninviteUIDFromShare(memberUID)
+ else:
+ # multiple groups or group and individual was shared, update to new mode
+ yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
- if rows:
- # uninvite each member of group
- memberUIDs = yield self._txn.groupMemberUIDs(groupID)
- for memberUID in memberUIDs:
- if memberUID != self._home.uid():
- shareeView = yield self.shareeView(memberUID)
- if shareeView is not None:
- newMode = yield shareeView._groupModeAfterRemovingOneGroupSharee()
- if newMode is None:
- # only group was shared, do delete share
- yield super(Calendar, self).uninviteUIDFromShare(memberUID)
- else:
- # multiple groups or group and individual was shared, update to new mode
- yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
+ else:
+ shareeView = yield self.shareeView(shareeUID)
+ if shareeView is not None:
+ newMode = yield shareeView._groupModeAfterRemovingOneIndividualSharee()
+ if newMode is None:
+ # no group was shared, so delete share
+ yield super(Calendar, self).uninviteUIDFromShare(shareeUID)
+ else:
+ # multiple groups or group and individual was shared, update to new mode
+ yield super(Calendar, self).inviteUIDToShare(shareeUID, newMode)
- returnValue(None)
- returnValue(
- (yield super(Calendar, self).uninviteUIDFromShare(shareeUID))
- )
-
-
-
icalfbtype_to_indexfbtype = {
"UNKNOWN" : 0,
"FREE" : 1,
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py 2014-07-14 22:12:05 UTC (rev 13756)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py 2014-07-15 03:00:34 UTC (rev 13757)
@@ -24,6 +24,8 @@
from txdav.base.propertystore.base import PropertyName
from txdav.common.datastore.sql_tables import _BIND_MODE_DIRECT
from txdav.common.datastore.sql_tables import _BIND_MODE_GROUP
+from txdav.common.datastore.sql_tables import _BIND_MODE_GROUP_READ
+from txdav.common.datastore.sql_tables import _BIND_MODE_GROUP_WRITE
from txdav.common.datastore.sql_tables import _BIND_MODE_READ
from txdav.common.datastore.sql_tables import _BIND_MODE_WRITE
from txdav.common.datastore.sql_tables import _BIND_STATUS_ACCEPTED
@@ -1000,6 +1002,9 @@
noinvites = yield calendar.sharingInvites()
self.assertEqual(len(noinvites), 0)
+ for invite in invites:
+ self.assertEqual((yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)), None)
+
yield self.commit()
# no extra notifications
@@ -1070,6 +1075,82 @@
self.assertEqual(len(invites), 0)
self.assertFalse(calendar.isShared())
+ shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_READ, "summary")
+ self.assertEqual(len(shareeViewsGroup02), 3)
+ shareeViewsGroup03 = yield calendar.inviteUIDToShare("group03", _BIND_MODE_READ, "summary")
+ self.assertEqual(len(shareeViewsGroup03), 3)
+ shareeViews = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViewsGroup02 + shareeViewsGroup03]).values()
+ self.assertEqual(len(shareeViews), 4)
+ shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 4)
+ invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
+ for i in range(len(invites)):
+ shareeView = shareeViews[i]
+ invite = invites[i]
+ self.assertEqual(invite.uid, shareeView.shareUID())
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_INVITED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
+ # accept
+ for invite in invites:
+ shareeHome = yield self.homeUnderTest(name=invite.shareeUID)
+ yield shareeHome.acceptShare(invite.uid)
+
+ yield self._check_notifications("user01", [invite.uid + "-reply" for invite in invites])
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ self.assertTrue(calendar.isShared())
+
+ yield self.commit()
+
+ # Uninvite one
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group02")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+
+ for invite in invites:
+ shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+ self.assertNotEqual(shareeView, None)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
+ # Uninvite other
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group03")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
+
+ for invite in invites:
+ self.assertEqual((yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)), None)
+
+
+ @inlineCallbacks
+ def test_accept_uninvite_two_groups_different_access(self):
+ """
+ Test that accept of two groups works, then uninvite each one.
+ """
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_WRITE, "summary")
self.assertEqual(len(shareeViewsGroup02), 3)
shareeViewsGroup03 = yield calendar.inviteUIDToShare("group03", _BIND_MODE_READ, "summary")
@@ -1116,22 +1197,395 @@
shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
self.assertNotEqual(shareeView, None)
self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
+ # Uninvite other
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group03")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
+
+ for invite in invites:
+ self.assertEqual((yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)), None)
+
+
+ @inlineCallbacks
+ def test_accept_uninvite_individual_and_group(self):
+ """
+ Test that accept of two groups works, then uninvite each one.
+ """
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ shareeViewUser07 = yield calendar.inviteUIDToShare("user07", _BIND_MODE_READ, "summary")
+ self.assertNotEqual(shareeViewUser07, None)
+ shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_READ, "summary")
+ self.assertEqual(len(shareeViewsGroup02), 3)
+
+ shareeViews = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViewsGroup02 + (shareeViewUser07,)]).values()
+ self.assertEqual(len(shareeViews), 3)
+ shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+ invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
+ for i in range(len(invites)):
+ shareeView = shareeViews[i]
+ invite = invites[i]
+ self.assertEqual(invite.uid, shareeView.shareUID())
+ self.assertEqual(invite.ownerUID, "user01")
self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP_READ if invite.shareeUID == "user07" else _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_INVITED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
+ # accept
+ for invite in invites:
+ shareeHome = yield self.homeUnderTest(name=invite.shareeUID)
+ yield shareeHome.acceptShare(invite.uid)
+
+ yield self._check_notifications("user01", [invite.uid + "-reply" for invite in invites])
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ self.assertTrue(calendar.isShared())
+
+ yield self.commit()
+
+ # Uninvite individual
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("user07")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+ for invite in invites:
+ shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+ self.assertNotEqual(shareeView, None)
+ self.assertEqual(invite.ownerUID, "user01")
self.assertEqual(invite.mode, _BIND_MODE_GROUP)
self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
self.assertEqual(invite.summary, "summary")
yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+ # Uninvite group
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group02")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
+
+ for invite in invites:
+ self.assertEqual((yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)), None)
+
+
+ @inlineCallbacks
+ def test_accept_uninvite_group_and_individual(self):
+ """
+ Test that accept of two groups works, then uninvite each one.
+ """
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_READ, "summary")
+ self.assertEqual(len(shareeViewsGroup02), 3)
+ shareeViewUser07 = yield calendar.inviteUIDToShare("user07", _BIND_MODE_READ, "summary")
+ self.assertNotEqual(shareeViewUser07, None)
+
+ shareeViews = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViewsGroup02 + (shareeViewUser07,)]).values()
+ self.assertEqual(len(shareeViews), 3)
+ shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+ invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
+ for i in range(len(invites)):
+ shareeView = shareeViews[i]
+ invite = invites[i]
+ self.assertEqual(invite.uid, shareeView.shareUID())
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP_READ if invite.shareeUID == "user07" else _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_INVITED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
yield self.commit()
+ # accept
+ for invite in invites:
+ shareeHome = yield self.homeUnderTest(name=invite.shareeUID)
+ yield shareeHome.acceptShare(invite.uid)
+
+ yield self._check_notifications("user01", [invite.uid + "-reply" for invite in invites])
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ self.assertTrue(calendar.isShared())
+
+ yield self.commit()
+
+ # Uninvite group
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group02")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 1)
+
+ for invite in invites:
+ shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+ self.assertNotEqual(shareeView, None)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+ self.assertEqual(invite.mode, _BIND_MODE_READ)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
# Uninvite other
calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("user07")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
+
+ for invite in invites:
+ self.assertEqual((yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)), None)
+
+
+ @inlineCallbacks
+ def test_accept_uninvite_individual_and_groups(self):
+ """
+ Test that accept of two groups works, then uninvite each one.
+ """
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ shareeViewUser07 = yield calendar.inviteUIDToShare("user07", _BIND_MODE_READ, "summary")
+ self.assertNotEqual(shareeViewUser07, None)
+ shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_READ, "summary")
+ self.assertEqual(len(shareeViewsGroup02), 3)
+ shareeViewsGroup03 = yield calendar.inviteUIDToShare("group03", _BIND_MODE_READ, "summary")
+ self.assertEqual(len(shareeViewsGroup03), 3)
+
+ shareeViews = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViewsGroup02 + (shareeViewUser07,) + shareeViewsGroup03]).values()
+ self.assertEqual(len(shareeViews), 4)
+ shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 4)
+ invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
+ for i in range(len(invites)):
+ shareeView = shareeViews[i]
+ invite = invites[i]
+ self.assertEqual(invite.uid, shareeView.shareUID())
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP_READ if invite.shareeUID == "user07" else _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_INVITED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
+ # accept
+ for invite in invites:
+ shareeHome = yield self.homeUnderTest(name=invite.shareeUID)
+ yield shareeHome.acceptShare(invite.uid)
+
+ yield self._check_notifications("user01", [invite.uid + "-reply" for invite in invites])
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ self.assertTrue(calendar.isShared())
+
+ yield self.commit()
+
+ # Uninvite individual
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("user07")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 4)
+ for invite in invites:
+ shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+ self.assertNotEqual(shareeView, None)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ # Uninvite group
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group02")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+
+ for invite in invites:
+ shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+ self.assertNotEqual(shareeView, None)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ # Uninvite group
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
yield calendar.uninviteUIDFromShare("group03")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
+
+ for invite in invites:
+ self.assertEqual((yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)), None)
+
+
+ @inlineCallbacks
+ def test_accept_uninvite_individual_and_groups_different_access(self):
+ """
+ Test that accept of two groups works, then uninvite each one.
+ """
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+ shareeViewUser07 = yield calendar.inviteUIDToShare("user07", _BIND_MODE_WRITE)
+ self.assertNotEqual(shareeViewUser07, None)
+ shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViewsGroup02), 3)
+ shareeViewsGroup03 = yield calendar.inviteUIDToShare("group03", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViewsGroup03), 3)
+ shareeViews = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViewsGroup02 + (shareeViewUser07,) + shareeViewsGroup03]).values()
+ self.assertEqual(len(shareeViews), 4)
+ shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 4)
+ invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
+ for i in range(len(invites)):
+ shareeView = shareeViews[i]
+ invite = invites[i]
+ self.assertEqual(invite.uid, shareeView.shareUID())
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP_WRITE if invite.shareeUID == "user07" else _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_WRITE if invite.shareeUID == "user07" else _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_INVITED)
+ self.assertEqual(invite.summary, None)
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
+ # accept
+ for invite in invites:
+ shareeHome = yield self.homeUnderTest(name=invite.shareeUID)
+ yield shareeHome.acceptShare(invite.uid)
+
+ yield self._check_notifications("user01", [invite.uid + "-reply" for invite in invites])
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ self.assertTrue(calendar.isShared())
+
+ yield self.commit()
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ shareeViewUser07 = yield calendar.inviteUIDToShare("user07", _BIND_MODE_READ)
+ self.assertNotEqual(shareeViewUser07, None)
+ shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_WRITE)
+ self.assertEqual(len(shareeViewsGroup02), 3)
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 4)
+
+ for invite in invites:
+ shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP_READ if invite.shareeUID == "user07" else _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_WRITE if shareeView in shareeViewsGroup02 else _BIND_MODE_READ)
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ shareeViewUser07 = yield calendar.inviteUIDToShare("user07", _BIND_MODE_WRITE)
+ self.assertNotEqual(shareeViewUser07, None)
+ shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViewsGroup02), 3)
+ shareeViewsGroup03 = yield calendar.inviteUIDToShare("group03", _BIND_MODE_WRITE,)
+ self.assertEqual(len(shareeViewsGroup02), 3)
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 4)
+
+ for invite in invites:
+ shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP_WRITE if invite.shareeUID == "user07" else _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_WRITE if shareeView in shareeViewsGroup03 else _BIND_MODE_READ)
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
+ # Uninvite individual
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("user07")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 4)
+ for invite in invites:
+ shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+ self.assertNotEqual(shareeView, None)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ if invite.shareeUID == "user06" else _BIND_MODE_WRITE)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
+ self.assertEqual(invite.summary, None)
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ # Uninvite group
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group02")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+
+ for invite in invites:
+ shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+ self.assertNotEqual(shareeView, None)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_WRITE)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
+ self.assertEqual(invite.summary, None)
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ # Uninvite group
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group03")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
+
+ for invite in invites:
+ self.assertEqual((yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)), None)
+
'''
@inlineCallbacks
def test_accept_decline_two_groups(self):
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_tables.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_tables.py 2014-07-14 22:12:05 UTC (rev 13756)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_tables.py 2014-07-15 03:00:34 UTC (rev 13757)
@@ -231,8 +231,8 @@
_BIND_MODE_DIRECT = _bindMode('direct')
_BIND_MODE_INDIRECT = _bindMode('indirect')
_BIND_MODE_GROUP = _bindMode('group')
-_BIND_MODE_GROUP_READ = _bindMode('group,read')
-_BIND_MODE_GROUP_WRITE = _bindMode('group,write')
+_BIND_MODE_GROUP_READ = _bindMode('group_read')
+_BIND_MODE_GROUP_WRITE = _bindMode('group_write')
_addressBookObjectKind = _schemaConstants(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140714/8b73929e/attachment-0001.html>
More information about the calendarserver-changes
mailing list