<!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>[13227] twext/trunk/twext/who</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/13227">13227</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-09 11:35:10 -0700 (Wed, 09 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>shortNames no longer mandatory; LDAP mapping for uid is</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhodirectorypy">twext/trunk/twext/who/directory.py</a></li>
<li><a href="#twexttrunktwextwholdap_servicepy">twext/trunk/twext/who/ldap/_service.py</a></li>
<li><a href="#twexttrunktwextwholdaptesttest_utilpy">twext/trunk/twext/who/ldap/test/test_util.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_directorypy">twext/trunk/twext/who/test/test_directory.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhodirectorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/directory.py (13226 => 13227)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/directory.py        2014-04-09 17:59:13 UTC (rev 13226)
+++ twext/trunk/twext/who/directory.py        2014-04-09 18:35:10 UTC (rev 13227)
</span><span class="lines">@@ -330,7 +330,6 @@
</span><span class="cx">     requiredFields = (
</span><span class="cx">         FieldName.uid,
</span><span class="cx">         FieldName.recordType,
</span><del>-        FieldName.shortNames,
</del><span class="cx">     )
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="twexttrunktwextwholdap_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/_service.py (13226 => 13227)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_service.py        2014-04-09 17:59:13 UTC (rev 13226)
+++ twext/trunk/twext/who/ldap/_service.py        2014-04-09 18:35:10 UTC (rev 13227)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> from ..idirectory import (
</span><span class="cx">     DirectoryServiceError, DirectoryAvailabilityError,
</span><span class="cx">     FieldName as BaseFieldName, RecordType as BaseRecordType,
</span><del>-    IPlaintextPasswordVerifier
</del><ins>+    IPlaintextPasswordVerifier, DirectoryConfigurationError
</ins><span class="cx"> )
</span><span class="cx"> from ..directory import (
</span><span class="cx">     DirectoryService as BaseDirectoryService,
</span><span class="lines">@@ -276,6 +276,9 @@
</span><span class="cx">         if self.fieldName.recordType in fieldNameToAttributesMap:
</span><span class="cx">             raise TypeError(&quot;Record type field may not be mapped&quot;)
</span><span class="cx"> 
</span><ins>+        if BaseFieldName.uid not in fieldNameToAttributesMap:
+            raise DirectoryConfigurationError(&quot;Mapping for uid required&quot;)
+
</ins><span class="cx">         self._fieldNameToAttributesMap = fieldNameToAttributesMap
</span><span class="cx">         self._attributeToFieldNameMap = reverseDict(
</span><span class="cx">             fieldNameToAttributesMap
</span></span></pre></div>
<a id="twexttrunktwextwholdaptesttest_utilpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_util.py (13226 => 13227)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_util.py        2014-04-09 17:59:13 UTC (rev 13226)
+++ twext/trunk/twext/who/ldap/test/test_util.py        2014-04-09 18:35:10 UTC (rev 13227)
</span><span class="lines">@@ -26,16 +26,22 @@
</span><span class="cx"> )
</span><span class="cx"> from ...test.test_xml import UnknownConstant
</span><span class="cx"> from .._constants import LDAPOperand
</span><del>-from .._service import DirectoryService, RecordTypeSchema
</del><ins>+from .._service import (
+    DirectoryService, RecordTypeSchema, DEFAULT_FIELDNAME_ATTRIBUTE_MAP
+)
</ins><span class="cx"> from .._util import (
</span><span class="cx">     ldapQueryStringFromQueryStrings,
</span><span class="cx">     ldapQueryStringFromMatchExpression,
</span><span class="cx">     ldapQueryStringFromCompoundExpression,
</span><span class="cx">     ldapQueryStringFromExpression,
</span><span class="cx"> )
</span><ins>+from ...idirectory import FieldName as BaseFieldName
</ins><span class="cx"> 
</span><span class="cx"> 
</span><ins>+TEST_FIELDNAME_MAP = dict(DEFAULT_FIELDNAME_ATTRIBUTE_MAP)
+TEST_FIELDNAME_MAP[BaseFieldName.uid] = (u&quot;__who_uid__&quot;,)
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx"> class LDAPQueryTestCase(unittest.TestCase):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Tests for LDAP query generation.
</span><span class="lines">@@ -44,7 +50,10 @@
</span><span class="cx">     def service(self):
</span><span class="cx">         # Use intentionally funky conenction info, since we don't expect
</span><span class="cx">         # to connect.
</span><del>-        return DirectoryService(u&quot;ldap://cretin/&quot;, u&quot;o=plugh&quot;)
</del><ins>+        return DirectoryService(
+            u&quot;ldap://cretin/&quot;, u&quot;o=plugh&quot;,
+            fieldNameToAttributesMap=TEST_FIELDNAME_MAP
+        )
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def fieldNameMap(self, service):
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_directory.py (13226 => 13227)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_directory.py        2014-04-09 17:59:13 UTC (rev 13226)
+++ twext/trunk/twext/who/test/test_directory.py        2014-04-09 18:35:10 UTC (rev 13227)
</span><span class="lines">@@ -696,27 +696,6 @@
</span><span class="cx">         self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def test_initWithNoShortNames(self):
-        &quot;&quot;&quot;
-        Directory records must have a short name.
-        &quot;&quot;&quot;
-        fields = self.fields_wsanchez.copy()
-        del fields[FieldName.shortNames]
-        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
-
-        fields = self.fields_wsanchez.copy()
-        fields[FieldName.shortNames] = ()
-        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
-
-        fields = self.fields_wsanchez.copy()
-        fields[FieldName.shortNames] = (u&quot;&quot;,)
-        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
-
-        fields = self.fields_wsanchez.copy()
-        fields[FieldName.shortNames] = (u&quot;wsanchez&quot;, u&quot;&quot;)
-        self.assertRaises(InvalidDirectoryRecordError, self.makeRecord, fields)
-
-
</del><span class="cx">     def test_initNormalizeEmailLowercase(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Email addresses are normalized to lowercase.
</span></span></pre>
</div>
</div>

</body>
</html>