diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-01-11 16:38:08 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-01-11 16:39:56 +0100 |
| commit | 0d1f724f9645e7ec0da6a4c3a1c22d0dcf785cb6 (patch) | |
| tree | c4cd05df02953f5e0d34ddd9a48a0ac16c3d859e /ucb | |
| parent | 10e3880eb10d8e5c08bd7a254577ba4b0bd25534 (diff) | |
Resolves: fdo#72277 https CMIS Alfresco "The specified device is invalid."
Change-Id: I34f8b5e19d9bea0c6d98a7f3258b67e82c50e1de
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.cxx | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 53777bc3b1d2..a2e1868c329c 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -297,9 +297,11 @@ namespace cmis ALFRESCO_CLOUD_SCOPE, ALFRESCO_CLOUD_REDIRECT_URI, ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ) ); + OUString pURL = m_aURL.getBindingUrl( ); + m_pSession = libcmis::SessionFactory::createSession( OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ), - rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), sal_False, oauth2Data ); + rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), pURL.startsWith("https")?true:false, oauth2Data ); if ( m_pSession == NULL ) ucbhelper::cancelCommandExecution( ucb::IOErrorCode_INVALID_DEVICE, diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 88fefb5cb4c0..918a3d47cdd6 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -159,9 +159,11 @@ namespace cmis ALFRESCO_CLOUD_SCOPE, ALFRESCO_CLOUD_REDIRECT_URI, ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ) ); + OUString pURL = m_aURL.getBindingUrl( ); + libcmis::Session* session = libcmis::SessionFactory::createSession( - OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ), - rUsername, rPassword, "", sal_False, oauth2Data ); + OUSTR_TO_STDSTR(pURL), + rUsername, rPassword, "", pURL.startsWith("https")?true:false, oauth2Data ); if (session == NULL ) ucbhelper::cancelCommandExecution( ucb::IOErrorCode_INVALID_DEVICE, |