[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - ucb/source

[Mihai Varga]

 ucb/source/ucp/cmis/cmis_content.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit dd3772343e933175f9aeddfa566024850772d2aa
Author: Mihai Varga <mihai.mv13 at gmail.com>
Date:   Tue Jul 22 18:34:40 2014 +0300

    OneDrive authFallback added in cmis_content
    
    Change-Id: I19e185defdaf5f2e421f547ce9e900b97b83268e

diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index de6d5c0..5775715 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -297,6 +297,7 @@ namespace cmis
 
             // Get the auth credentials
             AuthProvider authProvider( xEnv, m_xIdentifier->getContentIdentifier( ), m_aURL.getBindingUrl( ) );
+            AuthProvider::setXEnv( xEnv );
 
             string rUsername = OUSTR_TO_STDSTR( m_aURL.getUsername( ) );
             string rPassword = OUSTR_TO_STDSTR( m_aURL.getPassword( ) );
@@ -315,10 +316,13 @@ namespace cmis
                         ALFRESCO_CLOUD_SCOPE, ALFRESCO_CLOUD_REDIRECT_URI,
                         ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ) );
                 if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL )
+                {
+                    libcmis::SessionFactory::setOAuth2AuthCodeProvider( authProvider.onedriveAuthCodeFallback );
                     oauth2Data.reset( new libcmis::OAuth2Data(
                         ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL,
                         ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI,
                         ONEDRIVE_CLIENT_ID, ONEDRIVE_CLIENT_SECRET ) );
+                }
 
                 m_pSession = libcmis::SessionFactory::createSession(
                         OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),