Add more directory proxy commands

git-svn-id: https://svn.calendarserver.org/repository/calendarserver/CalendarServer/trunk@12552 e27351fd-9f3e-4f54-a53b-843176b1656c

txdav/dps/client.py

@@ -34,6 +34,8 @@ def makeEvenBetterRequest():
     print("guid: {r}".format(r=record))
     records = (yield ds.recordsWithRecordType(RecordType.user))
     print("recordType: {r}".format(r=records))
+    records = (yield ds.recordsWithEmailAddress("cdaboo@bitbucket.calendarserver.org"))
+    print("emailAddress: {r}".format(r=records))
 
 
 def succeeded(result):

txdav/dps/protocol.py

@@ -119,7 +119,7 @@ def recordToDict(self, record):
     @RecordWithShortNameCommand.responder
     @inlineCallbacks
     def recordWithShortName(self, recordType, shortName):
-        recordType = recordType.decode("utf-8")
+        recordType = recordType  # keep as bytes
         shortName = shortName.decode("utf-8")
         log.debug("RecordWithShortName: {r} {n}", r=recordType, n=shortName)
         record = (yield self._directory.recordWithShortName(
@@ -164,7 +164,7 @@ def recordWithGUID(self, guid):
     @RecordsWithRecordTypeCommand.responder
     @inlineCallbacks
     def recordsWithRecordType(self, recordType):
-        recordType = recordType.decode("utf-8")
+        recordType = recordType  # as bytes
         log.debug("RecordsWithRecordType: {r}", r=recordType)
         records = (yield self._directory.recordsWithRecordType(
             RecordType.lookupByName(recordType))
@@ -177,3 +177,19 @@ def recordsWithRecordType(self, recordType):
         }
         log.debug("Responding with: {response}", response=response)
         returnValue(response)
+
+
+    @RecordsWithEmailAddressCommand.responder
+    @inlineCallbacks
+    def recordsWithEmailAddress(self, emailAddress):
+        emailAddress = emailAddress.decode("utf-8")
+        log.debug("RecordsWithEmailAddress: {e}", e=emailAddress)
+        records = (yield self._directory.recordsWithEmailAddress(emailAddress))
+        fieldsList = []
+        for record in records:
+            fieldsList.append(self.recordToDict(record))
+        response = {
+            "fieldsList": pickle.dumps(fieldsList),
+        }
+        log.debug("Responding with: {response}", response=response)
+        returnValue(response)

txdav/dps/service.py

@@ -37,7 +37,8 @@
 
 from .protocol import (
     DirectoryProxyAMPProtocol, RecordWithShortNameCommand, RecordWithUIDCommand,
-    RecordWithGUIDCommand, RecordsWithRecordTypeCommand
+    RecordWithGUIDCommand, RecordsWithRecordTypeCommand,
+    RecordsWithEmailAddressCommand
 )
 
 from twisted.internet import reactor
@@ -160,6 +161,20 @@ def _call(ampProto):
         return d
 
 
+    def recordsWithEmailAddress(self, emailAddress):
+
+        def _call(ampProto):
+            return ampProto.callRemote(
+                RecordsWithEmailAddressCommand,
+                emailAddress=emailAddress
+            )
+
+        d = self._getConnection()
+        d.addCallback(_call)
+        d.addCallback(self._processMultipleRecords)
+        return d
+
+
 class DirectoryRecord(BaseDirectoryRecord):
     pass