Changeset 113 for Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CWebDAVCalendarClient.cpp

Timestamp:

10/28/07 23:41:34 (1 year ago)

Author:

daboo

Message:

Calendar ctag handling. Don't list the calendars/address books when first starting up if
we have a fresh cache.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CWebDAVCalendarClient.cpp (modified) (15 diffs)

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CWebDAVCalendarClient.cpp

@@ -29 +29 @@
 //#include "CDisplayItem.h"
 #include "CGeneralException.h"
+#include "CPasswordManager.h"
 #include "CStatusWindow.h"
 #include "CStreamFilter.h"
@@ -568 +569 @@
 }
 
+void CWebDAVCalendarClient::_UpdateSyncToken(const CCalendarStoreNode& node, iCal::CICalendar& cal)
+{
+        // Start UI action
+        StINETClientAction _action(this, "Status::Calendar::Checking", "Error::Calendar::OSErrCheckCalendar", "Error::Calendar::NoBadCheckCalendar", node.GetName());
+
+        // Determine URL and lock
+        cdstring rurl = GetRURL(&node);
+        cdstring lock_token = GetLockToken(rurl);
+
+        // Get current ETag
+        cdstring etag = GetETag(rurl, lock_token);
+        
+        cal.SetETag(etag);
+}
+
 void CWebDAVCalendarClient::_SizeCalendar(CCalendarStoreNode& node)
 {
@@ -1123 +1139 @@
 cdstring CWebDAVCalendarClient::GetETag(const cdstring& rurl, const cdstring& lock_token)
 {
+        cdstring result = GetProperty(rurl, lock_token, http::webdav::cProperty_getetag);
+
+        // Handle server bug: ETag value MUST be quoted per HTTP/1.1 €3.11
+        if (!result.empty() && !result.isquoted())
+                result.quote(true);
+
+        return result;
+}
+
+cdstring CWebDAVCalendarClient::GetProperty(const cdstring& rurl, const cdstring& lock_token, const xmllib::XMLName& property)
+{
         cdstring result;
 
         // Create WebDAV propfind
         xmllib::XMLNameList props;
-        props.push_back(http::webdav::cProperty_getetag);
+        props.push_back(property);
         auto_ptr<http::webdav::CWebDAVPropFind> request(new http::webdav::CWebDAVPropFind(this, rurl, http::webdav::eDepth0, props));
         http::CHTTPOutputDataString dout;
@@ -1142 +1169 @@
 
                 // Look at each propfind result and determine type of calendar
+                cdstring decoded_rurl = rurl;
+                decoded_rurl.DecodeURL();
                 for(http::webdav::CWebDAVPropFindParser::CPropFindResults::const_iterator iter = parser.Results().begin(); iter != parser.Results().end(); iter++)
                 {
@@ -1149 +1178 @@
                 
                         // Must match rurl
-                        if (name.compare_end(rurl))
+                        if (name.compare_end(decoded_rurl))
                         {
-                                if ((*iter)->GetTextProperties().count(http::webdav::cProperty_getetag.FullName()) != 0)
+                                if ((*iter)->GetTextProperties().count(property.FullName()) != 0)
                                 {
-                                        result = (*(*iter)->GetTextProperties().find(http::webdav::cProperty_getetag.FullName())).second;
-                                        
-                                        // Handle server bug: ETag value MUST be quoted per HTTP/1.1 €3.11
-                                        if (!result.isquoted())
-                                                result.quote(true);
+                                        result = (*(*iter)->GetTextProperties().find(property.FullName())).second;
                                         break;
                                 }
@@ -1166 +1191 @@
         {
                 HandleHTTPError(request.get());
-                return result;
         }
 
@@ -1193 +1217 @@
 
                 // Look at each propfind result and extract any Hrefs
+                cdstring decoded_rurl = rurl;
+                decoded_rurl.DecodeURL();
                 for(http::webdav::CWebDAVPropFindParser::CPropFindResults::const_iterator iter1 = parser.Results().begin(); iter1 != parser.Results().end(); iter1++)
                 {
@@ -1200 +1226 @@
                 
                         // Must match rurl
-                        if (name.compare_end(rurl))
+                        if (name.compare_end(decoded_rurl))
                         {
                                 if ((*iter1)->GetNodeProperties().count(propname.FullName()) != 0)
@@ -1242 +1268 @@
 
                 // Look at each principal-match result and return first one that is appropriate
+                cdstring decoded_rurl = rurl;
+                decoded_rurl.DecodeURL();
                 for(http::webdav::CWebDAVPropFindParser::CPropFindResults::const_iterator iter1 = parser.Results().begin(); iter1 != parser.Results().end(); iter1++)
                 {
@@ -1247 +1275 @@
                         cdstring name((*iter1)->GetResource());
                         name.DecodeURL();
-                        if ((parser.Results().size() > 1) && (name.find("/users/") == cdstring::npos))
-                                continue;
+                        //if ((parser.Results().size() > 1) && (name.find("/users/") == cdstring::npos))
+                        //      continue;
                 
                         for(xmllib::XMLNameList::const_iterator iter2 = props.begin(); iter2 != props.end(); iter2++)
@@ -1263 +1291 @@
                                 }
                         }
+                        
+                        // We'll take the first one, whatever that is
+                        break;
                 }
         }
@@ -1528 +1559 @@
                         return;
                 }
+                
+                // Recache user id & password after successful logon
+                if (GetAccount()->GetAuthenticator().RequiresUserPswd())
+                {
+                        CAuthenticatorUserPswd* auth = GetAccount()->GetAuthenticatorUserPswd();
+
+                        // Only bother if it contains something
+                        if (!auth->GetPswd().empty())
+                        {
+                                CPasswordManager::GetManager()->AddPassword(GetAccount(), auth->GetPswd());
+                        }
+                }
         }
         
@@ -1556 +1599 @@
 
                                 // Get authorization object (prompt the user) and redo the request
-                                mAuthorization = GetAuthorization(first_time, request->GetResponseHeader(cHeaderWWWAuthenticate));
+                                cdstrvect hdrs;
+                                mAuthorization = GetAuthorization(first_time, request->GetResponseHeaders(cHeaderWWWAuthenticate, hdrs));
                                 
                                 // Check for auth cancellation
@@ -1574 +1618 @@
                         }
                         
+                        // Recache user id & password after successful logon
+                        if (!first_time && GetAccount()->GetAuthenticator().RequiresUserPswd())
+                        {
+                                CAuthenticatorUserPswd* auth = GetAccount()->GetAuthenticatorUserPswd();
+
+                                // Only bother if it contains something
+                                if (!auth->GetPswd().empty())
+                                {
+                                        CPasswordManager::GetManager()->AddPassword(GetAccount(), auth->GetPswd());
+                                }
+                        }
+
                         // If we get here we are complete with auth loop
                         break;
@@ -1613 +1669 @@
 }
 
-CHTTPAuthorization* CWebDAVCalendarClient::GetAuthorization(bool first_time, const cdstring& www_authenticate)
+CHTTPAuthorization* CWebDAVCalendarClient::GetAuthorization(bool first_time, const cdstrvect& www_authenticate)
 {
         // Loop while trying to authentciate