<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13757] CalendarServer/branches/users/gaya/groupsharee2/txdav</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13757">13757</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-07-14 20:00:34 -0700 (Mon, 14 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Checkpoint changes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoresqlpy">CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoretesttest_sql_sharingpy">CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcommondatastoresql_tablespy">CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_tables.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py (13756 => 13757)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1789,7 +1789,7 @@
</span><span class="cx">
</span><span class="cx"> for memberUID in memberUIDs - boundUIDs:
</span><span class="cx"> shareeView = yield self.shareeView(memberUID)
</span><del>- newMode = _BIND_MODE_GROUP if shareeView is None else shareeView.groupModeAfterAddingOneGroupSharee()
</del><ins>+ newMode = _BIND_MODE_GROUP if shareeView is None else shareeView._groupModeAfterAddingOneGroupSharee()
</ins><span class="cx"> if newMode is not None:
</span><span class="cx"> yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
</span><span class="cx"> changed = True
</span><span class="lines">@@ -1797,11 +1797,36 @@
</span><span class="cx"> returnValue(changed)
</span><span class="cx">
</span><span class="cx">
</span><del>- def groupModeAfterAddingOneGroupSharee(self):
</del><ins>+ def _groupModeAfterAddingOneIndividualSharee(self, mode):
</ins><span class="cx"> """
</span><ins>+ 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):
+ """
</ins><span class="cx"> return group mode after adding one group sharee or None
</span><span class="cx"> """
</span><span class="cx"> return {
</span><ins>+ _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 {
</ins><span class="cx"> _BIND_MODE_GROUP: _BIND_MODE_GROUP,
</span><span class="cx"> _BIND_MODE_READ: _BIND_MODE_GROUP_READ,
</span><span class="cx"> _BIND_MODE_GROUP_READ: _BIND_MODE_GROUP_READ,
</span><span class="lines">@@ -1928,7 +1953,7 @@
</span><span class="cx"> # Higher level API
</span><span class="cx"> #
</span><span class="cx"> @inlineCallbacks
</span><del>- def inviteUIDToShare(self, shareeUID, mode, summary, shareName=None):
</del><ins>+ def inviteUIDToShare(self, shareeUID, mode, summary=None, shareName=None):
</ins><span class="cx"> """
</span><span class="cx"> Invite a user to share this collection - either create the share if it does not exist, or
</span><span class="cx"> update the existing share with new values. Make sure a notification is sent as well.
</span><span class="lines">@@ -1941,19 +1966,23 @@
</span><span class="cx"> @type summary: C{str}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- record = yield self._txn.directoryService().recordWithUID(shareeUID.decode("utf-8"))
- if (
- record is None or
- record.recordType != RecordType.group or not (
</del><ins>+ if not (
</ins><span class="cx"> config.Sharing.Enabled and
</span><span class="cx"> config.Sharing.Calendars.Enabled and
</span><span class="cx"> config.Sharing.Calendars.Groups.Enabled
</span><del>- )
</del><span class="cx"> ):
</span><del>- returnValue(
- (yield super(Calendar, self).inviteUIDToShare(shareeUID, mode, summary, shareName))
- )
</del><ins>+ returnValue((yield super(Calendar, self).inviteUIDToShare(shareeUID, mode, summary, shareName)))
</ins><span class="cx">
</span><ins>+ 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)))
+
</ins><span class="cx"> yield self.updateShareeGroupLink(shareeUID, mode=mode)
</span><span class="cx">
</span><span class="cx"> # invite every member of group
</span><span class="lines">@@ -1963,7 +1992,7 @@
</span><span class="cx"> for memberUID in memberUIDs:
</span><span class="cx"> if memberUID != self._home.uid():
</span><span class="cx"> shareeView = yield self.shareeView(memberUID)
</span><del>- newMode = _BIND_MODE_GROUP if shareeView is None else shareeView.groupModeAfterAddingOneGroupSharee()
</del><ins>+ newMode = _BIND_MODE_GROUP if shareeView is None else shareeView._groupModeAfterAddingOneGroupSharee()
</ins><span class="cx"> if newMode is not None:
</span><span class="cx"> # everything but direct
</span><span class="cx"> shareeView = yield super(Calendar, self).inviteUIDToShare(memberUID, newMode, summary)
</span><span class="lines">@@ -2010,43 +2039,48 @@
</span><span class="cx"> @type shareeUID: C{str}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- # see if cached group
- groupID = (yield self._txn.groupByUID(shareeUID, create=False))[0]
- if groupID:
</del><ins>+ # 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)
</ins><span class="cx">
</span><del>- # 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)
</del><ins>+ 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)
</ins><span class="cx">
</span><del>- 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)
</del><ins>+ 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)
</ins><span class="cx">
</span><del>- returnValue(None)
</del><span class="cx">
</span><del>- returnValue(
- (yield super(Calendar, self).uninviteUIDFromShare(shareeUID))
- )
-
-
-
</del><span class="cx"> icalfbtype_to_indexfbtype = {
</span><span class="cx"> "UNKNOWN" : 0,
</span><span class="cx"> "FREE" : 1,
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoretesttest_sql_sharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py (13756 => 13757)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> from txdav.base.propertystore.base import PropertyName
</span><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_MODE_DIRECT
</span><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_MODE_GROUP
</span><ins>+from txdav.common.datastore.sql_tables import _BIND_MODE_GROUP_READ
+from txdav.common.datastore.sql_tables import _BIND_MODE_GROUP_WRITE
</ins><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_MODE_READ
</span><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_MODE_WRITE
</span><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_STATUS_ACCEPTED
</span><span class="lines">@@ -1000,6 +1002,9 @@
</span><span class="cx"> noinvites = yield calendar.sharingInvites()
</span><span class="cx"> self.assertEqual(len(noinvites), 0)
</span><span class="cx">
</span><ins>+ for invite in invites:
+ self.assertEqual((yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)), None)
+
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> # no extra notifications
</span><span class="lines">@@ -1070,6 +1075,82 @@
</span><span class="cx"> self.assertEqual(len(invites), 0)
</span><span class="cx"> self.assertFalse(calendar.isShared())
</span><span class="cx">
</span><ins>+ 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())
+
</ins><span class="cx"> shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_WRITE, "summary")
</span><span class="cx"> self.assertEqual(len(shareeViewsGroup02), 3)
</span><span class="cx"> shareeViewsGroup03 = yield calendar.inviteUIDToShare("group03", _BIND_MODE_READ, "summary")
</span><span class="lines">@@ -1116,22 +1197,395 @@
</span><span class="cx"> shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
</span><span class="cx"> self.assertNotEqual(shareeView, None)
</span><span class="cx"> self.assertEqual(invite.ownerUID, "user01")
</span><ins>+ 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")
</ins><span class="cx"> self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
</span><ins>+ 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")
</ins><span class="cx"> self.assertEqual(invite.mode, _BIND_MODE_GROUP)
</span><span class="cx"> self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
</span><span class="cx"> self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
</span><span class="cx"> self.assertEqual(invite.summary, "summary")
</span><span class="cx"> yield self._check_notifications(invite.shareeUID, [invite.uid, ])
</span><span class="cx">
</span><ins>+ # 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, ])
+
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # 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()
+
</ins><span class="cx"> # Uninvite other
</span><span class="cx"> calendar = yield self.calendarUnderTest(home="user01", name="calendar")
</span><ins>+ 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")
</ins><span class="cx"> yield calendar.uninviteUIDFromShare("group03")
</span><ins>+ 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")
</ins><span class="cx"> invites = yield calendar.sharingInvites()
</span><span class="cx"> self.assertEqual(len(invites), 0)
</span><ins>+ self.assertFalse(calendar.isShared())
</ins><span class="cx">
</span><ins>+ 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)
</ins><span class="cx">
</span><ins>+ 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)
+
</ins><span class="cx"> '''
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_accept_decline_two_groups(self):
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2txdavcommondatastoresql_tablespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_tables.py (13756 => 13757)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -231,8 +231,8 @@
</span><span class="cx"> _BIND_MODE_DIRECT = _bindMode('direct')
</span><span class="cx"> _BIND_MODE_INDIRECT = _bindMode('indirect')
</span><span class="cx"> _BIND_MODE_GROUP = _bindMode('group')
</span><del>-_BIND_MODE_GROUP_READ = _bindMode('group,read')
-_BIND_MODE_GROUP_WRITE = _bindMode('group,write')
</del><ins>+_BIND_MODE_GROUP_READ = _bindMode('group_read')
+_BIND_MODE_GROUP_WRITE = _bindMode('group_write')
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> _addressBookObjectKind = _schemaConstants(
</span></span></pre>
</div>
</div>
</body>
</html>