ports/contrib
3
3
Fork 2
Code Issues Pull Requests Activity
ccd6e6d1ca
contrib/libcmis/libcmis_gdrive.patch

703 lines
27 KiB
Diff
Raw Blame History

diff -ur libcmis.org/src/libcmis/gdrive-document.cxx libcmis/src/libcmis/gdrive-document.cxx
--- libcmis.org/src/libcmis/gdrive-document.cxx 2021-07-27 19:11:02.679247008 +0200
+++ libcmis/src/libcmis/gdrive-document.cxx 2021-07-27 19:11:18.873246420 +0200
@@ -145,23 +145,17 @@
{
if ( !os.get( ) )
throw libcmis::Exception( "Missing stream" );
- if ( !isImmutable( ) )
- throw libcmis::Exception( string ( "Document " + getId( )+
- " is not editable" ) );
- string putUrl = getUploadUrl( ) + getId( );
- putUrl += "?uploadType=media";
-
- // If it's a Google document, convert it
- if ( isGoogleDoc( ) )
- putUrl += "&convert=true";
+
+ string putUrl = GDRIVE_UPLOAD_LINK + getId( ) + "?uploadType=media";
// Upload stream
boost::shared_ptr< istream> is ( new istream ( os->rdbuf( ) ) );
vector <string> headers;
headers.push_back( string( "Content-Type: " ) + contentType );
+ string res;
try
{
- getSession()->httpPutRequest( putUrl, *is, headers );
+ res = getSession()->httpPatchRequest( putUrl, *is, headers )->getStream()->str();
}
catch ( const CurlException& e )
{
@@ -181,35 +175,10 @@
{
if ( !os.get( ) )
throw libcmis::Exception( "Missing stream" );
-
- if ( !isImmutable( ) )
- throw libcmis::Exception( string ( "Document " + getId( )+
- " is not editable" ) );
- string metaUrl = getUrl( );
-
- // If it's a Google document, convert it
- if ( isGoogleDoc( ) )
- metaUrl += "?convert=true";
-
- // Update file name meta information
- if ( !fileName.empty( ) && fileName != getContentFilename( ) )
- {
- Json metaJson;
- Json fileJson( fileName.c_str( ) );
- metaJson.add("title", fileJson );
-
- std::istringstream is( metaJson.toString( ) );
- vector<string> headers;
- headers.push_back( "Content-Type: application/json" );
- try
- {
- getSession()->httpPutRequest( metaUrl, is, headers );
- }
- catch ( const CurlException& e )
- {
- throw e.getCmisException( );
- }
- }
+
+ // TODO: when would the filename need an update?
+ if (!fileName.empty() && fileName != getContentFilename())
+ std::cout << "filename change is not implemented in setContentStream" << std::endl;
// Upload stream
uploadStream( os, contentType );
@@ -251,7 +220,7 @@
vector< libcmis::DocumentPtr > GDriveDocument::getAllVersions( )
{
vector< libcmis::DocumentPtr > revisions;
- string versionUrl = getUrl( ) + "/revisions";
+ string versionUrl = GDRIVE_METADATA_LINK + getId( ) + "/revisions";
// Run the http request to get the properties definition
string res;
try
@@ -263,7 +232,7 @@
throw e.getCmisException( );
}
Json jsonRes = Json::parse( res );
- Json::JsonVector objs = jsonRes["items"].getList( );
+ Json::JsonVector objs = jsonRes["revisions"].getList( );
string parentId = getStringProperty( "cmis:parentId" );
diff -ur libcmis.org/src/libcmis/gdrive-folder.cxx libcmis/src/libcmis/gdrive-folder.cxx
--- libcmis.org/src/libcmis/gdrive-folder.cxx 2021-07-27 19:11:02.678247008 +0200
+++ libcmis/src/libcmis/gdrive-folder.cxx 2021-07-27 19:11:18.874246420 +0200
@@ -62,8 +62,8 @@
// Instead of sending multiple queries for children,
// we send a single query to search for objects where parents
// include the folderID.
- string query = getSession( )->getBindingUrl( ) +
- "/files?q=\"" + getId( ) + "\"+in+parents+and+trashed+=+false";
+ string query = GDRIVE_METADATA_LINK + "?q=\"" + getId( ) + "\"+in+parents+and+trashed+=+false" +
+ "&fields=files(kind,id,name,parents,mimeType,createdTime,modifiedTime,thumbnailLink,size)";
string res;
try
@@ -76,7 +76,7 @@
}
Json jsonRes = Json::parse( res );
- Json::JsonVector objs = jsonRes["items"].getList( );
+ Json::JsonVector objs = jsonRes["files"].getList( );
// Create children objects from Json objects
for(unsigned int i = 0; i < objs.size(); i++)
@@ -95,7 +95,7 @@
string GDriveFolder::uploadProperties( Json properties )
{
// URL for uploading meta data
- string metaUrl = getSession()->getBindingUrl() + "/files/";
+ string metaUrl = GDRIVE_METADATA_LINK + "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime";
// add parents to the properties
properties.add( "parents", GdriveUtils::createJsonFromParentId( getId( ) ) );
@@ -147,9 +147,15 @@
Json propsJson = GdriveUtils::toGdriveJson( properties );
- // Add filename to properties
- Json jsonFilename( fileName.c_str( ) );
- propsJson.add( "title", jsonFilename );
+ if(!fileName.empty()) {
+ // use provided filename
+ Json jsonFilename( fileName.c_str( ) );
+
+ propsJson.add( "name", jsonFilename );
+ }
+ if(!contentType.empty()) {
+ propsJson.add( "mimeType", Json(contentType.c_str()));
+ }
// Upload meta-datas
string res = uploadProperties( propsJson);
@@ -171,12 +177,9 @@
libcmis::UnfileObjects::Type /*unfile*/,
bool /*continueOnError*/ )
{
- // Object remove doesn't work with folder
- // Using trash instead
try
{
- istringstream is( "" );
- getSession( )->httpPostRequest( getUrl( ) + "/trash", is, "" );
+ getSession( )->httpDeleteRequest( GDRIVE_METADATA_LINK + getId( ) );
}
catch ( const CurlException& e )
{
diff -ur libcmis.org/src/libcmis/gdrive-object.cxx libcmis/src/libcmis/gdrive-object.cxx
--- libcmis.org/src/libcmis/gdrive-object.cxx 2021-07-27 19:11:02.675247009 +0200
+++ libcmis/src/libcmis/gdrive-object.cxx 2021-07-27 19:11:18.874246420 +0200
@@ -89,8 +89,8 @@
property.reset( new GDriveProperty( it->first, it->second ) );
m_properties[ property->getPropertyType( )->getId()] = property;
- // we map "title" to both "cmis:name" and "cmis:getContentStreamFileName"
- if ( it->first == "title" )
+ // we map "name" to both "cmis:name" and "cmis:getContentStreamFileName"
+ if ( it->first == "name" )
{
property.reset( new GDriveProperty( "cmis:name", it->second) );
m_properties[ property->getPropertyType( )->getId()] = property;
@@ -142,16 +142,13 @@
{
if ( m_renditions.empty( ) )
{
- string downloadUrl = getStringProperty( "downloadUrl" );
- if ( !downloadUrl.empty( ) )
- {
- string mimeType = getStringProperty( "cmis:contentStreamMimeType" );
- if ( !mimeType.empty( ) )
- {
- RenditionPtr rendition(
- new Rendition( mimeType, mimeType, mimeType, downloadUrl ));
- m_renditions.push_back( rendition );
- }
+ string downloadUrl = GDRIVE_METADATA_LINK + getId( ) + "?alt=media";
+ string mimeType = getStringProperty( "cmis:contentStreamMimeType" );
+ if ( !mimeType.empty( ) )
+ {
+ RenditionPtr rendition(
+ new Rendition( mimeType, mimeType, mimeType, downloadUrl ));
+ m_renditions.push_back( rendition );
}
vector< string > exportLinks = getMultiStringProperty( "exportLinks" );
@@ -192,7 +189,7 @@
{
vector< string > headers;
headers.push_back( "Content-Type: application/json" );
- response = getSession( )->httpPutRequest( getUrl( ), is, headers );
+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers );
}
catch ( const CurlException& e )
{
@@ -228,7 +225,7 @@
{
try
{
- getSession( )->httpDeleteRequest( getUrl( ) );
+ getSession( )->httpDeleteRequest( GDRIVE_METADATA_LINK + getId( ) );
}
catch ( const CurlException& e )
{
@@ -239,8 +236,8 @@
void GDriveObject::move( FolderPtr /*source*/, FolderPtr destination )
{
Json parentsJson;
- Json parentsValue = GdriveUtils::createJsonFromParentId( destination->getId( ) );
- parentsJson.add( "parents", parentsValue );
+ parentsJson.add( "addParents", Json(destination->getId( ).c_str()) );
+ parentsJson.add( "removeParents", Json(getStringProperty( "cmis:parentId" ).c_str()) );
istringstream is( parentsJson.toString( ) );
libcmis::HttpResponsePtr response;
@@ -248,7 +245,7 @@
{
vector< string > headers;
headers.push_back( "Content-Type: application/json" );
- response = getSession( )->httpPutRequest( getUrl( ), is, headers );
+ response = getSession( )->httpPatchRequest( getUrl( ), is, headers );
}
catch ( const CurlException& e )
{
@@ -262,12 +259,10 @@
string GDriveObject::getUrl( )
{
- return getSession( )->getBindingUrl( ) + "/files/" + getId( );
-}
-
-string GDriveObject::getUploadUrl( )
-{
- return GDRIVE_UPLOAD_LINKS;
+ // thumbnailLink causes some operations to fail with internal server error,
+ // see https://issuetracker.google.com/issues/36760667
+ return GDRIVE_METADATA_LINK + getId( ) +
+ "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime,size";
}
vector< string> GDriveObject::getMultiStringProperty( const string& propertyName )
diff -ur libcmis.org/src/libcmis/gdrive-repository.cxx libcmis/src/libcmis/gdrive-repository.cxx
--- libcmis.org/src/libcmis/gdrive-repository.cxx 2021-07-27 19:11:02.676247009 +0200
+++ libcmis/src/libcmis/gdrive-repository.cxx 2021-07-27 19:11:18.874246420 +0200
@@ -35,7 +35,7 @@
m_name = "Google Drive";
m_description = "Google Drive repository";
m_productName = "Google Drive";
- m_productVersion = "v2";
+ m_productVersion = "v3";
m_rootId = "root";
m_capabilities[ ACL ] = "discover";
diff -ur libcmis.org/src/libcmis/gdrive-session.cxx libcmis/src/libcmis/gdrive-session.cxx
--- libcmis.org/src/libcmis/gdrive-session.cxx 2021-07-27 19:11:02.675247009 +0200
+++ libcmis/src/libcmis/gdrive-session.cxx 2021-07-27 19:11:18.874246420 +0200
@@ -124,9 +124,13 @@
libcmis::ObjectPtr GDriveSession::getObject( string objectId )
{
+ if(objectId == "root") {
+ return getRootFolder();
+ }
// Run the http request to get the properties definition
string res;
- string objectLink = m_bindingUrl + "/files/" + objectId;
+ string objectLink = GDRIVE_METADATA_LINK + objectId +
+ "?fields=kind,id,name,parents,mimeType,createdTime,modifiedTime,thumbnailLink,size";
try
{
res = httpGetRequest( objectLink )->getStream()->str();
@@ -188,9 +192,10 @@
{
// Normal child case
// Ask for the ID of the child if there is any
- string childIdUrl = m_bindingUrl + "/files/" + objectId +
- "/children/?q=title+=+'" + segment +
- "'&fields=items:id";
+ // somewhat flawed as names are not necessarily unique in GDrive...
+ string query = libcmis::escape("'" + objectId + "' in parents and trashed = false and name='" + segment + "'");
+
+ string childIdUrl = m_bindingUrl + "/files/?q=" + query + "&fields=files(id)";
string res;
try
@@ -204,7 +209,7 @@
Json jsonRes = Json::parse( res );
// Did we get an id?
- Json::JsonVector items = jsonRes["items"].getList();
+ Json::JsonVector items = jsonRes["files"].getList();
if ( items.empty( ) )
throw libcmis::Exception( "Object not found: " + path, "objectNotFound" );
@@ -219,6 +224,27 @@
return getObject( objectId );
}
+libcmis::FolderPtr GDriveSession::getRootFolder()
+{
+ // permissions/scope with just drive.file don't allow to get it with the "root" alias/by its actual object-ID
+ Json propsJson;
+
+ // GDrive folder is a file with a different mime type.
+ string mimeType = GDRIVE_FOLDER_MIME_TYPE;
+
+ // Add mimetype to the propsJson
+ Json jsonMimeType( mimeType.c_str( ) );
+ propsJson.add( "mimeType", jsonMimeType );
+ propsJson.add( "id", "root" );
+
+ // Upload meta-datas
+ propsJson.add("cmis:name", "VirtualRoot");
+
+ libcmis::FolderPtr folderPtr( new GDriveFolder( this, propsJson ) );
+
+ return folderPtr;
+}
+
libcmis::ObjectTypePtr GDriveSession::getType( string id )
{
libcmis::ObjectTypePtr type( new GdriveObjectType( id ) );
diff -ur libcmis.org/src/libcmis/gdrive-session.hxx libcmis/src/libcmis/gdrive-session.hxx
--- libcmis.org/src/libcmis/gdrive-session.hxx 2021-07-27 19:11:02.675247009 +0200
+++ libcmis/src/libcmis/gdrive-session.hxx 2021-07-27 19:11:18.875246420 +0200
@@ -57,6 +57,8 @@
virtual std::vector< libcmis::ObjectTypePtr > getBaseTypes( );
+ virtual libcmis::FolderPtr getRootFolder();
+
virtual std::string getRefreshToken();
private:
diff -ur libcmis.org/src/libcmis/gdrive-utils.cxx libcmis/src/libcmis/gdrive-utils.cxx
--- libcmis.org/src/libcmis/gdrive-utils.cxx 2021-07-27 19:11:02.677247008 +0200
+++ libcmis/src/libcmis/gdrive-utils.cxx 2021-07-27 19:11:18.875246420 +0200
@@ -44,17 +44,17 @@
convertedKey = "cmis:createdBy";
else if ( key == "description" )
convertedKey = "cmis:description";
- else if ( key == "createdDate" )
+ else if ( key == "createdTime" )
convertedKey = "cmis:creationDate";
else if ( key == "lastModifyingUserName" )
convertedKey = "cmis:lastModifiedBy";
- else if ( key == "modifiedDate" )
+ else if ( key == "modifiedTime" )
convertedKey = "cmis:lastModificationDate";
- else if ( key == "title" )
+ else if ( key == "name" )
convertedKey = "cmis:contentStreamFileName";
else if ( key == "mimeType" )
convertedKey = "cmis:contentStreamMimeType";
- else if ( key == "fileSize" )
+ else if ( key == "size" )
convertedKey = "cmis:contentStreamLength";
else if ( key == "editable" )
convertedKey = "cmis:isImmutable";
@@ -72,21 +72,21 @@
else if ( key == "cmis:createdBy" )
convertedKey = "ownerNames";
else if ( key == "cmis:creationDate" )
- convertedKey = "createdDate";
+ convertedKey = "createdTime";
else if ( key == "cmis:description" )
convertedKey = "description";
else if ( key == "cmis:lastModifiedBy" )
convertedKey = "lastModifyingUserName";
else if ( key == "cmis:lastModificationDate" )
- convertedKey = "modifiedDate";
+ convertedKey = "modifiedTime";
else if ( key == "cmis:contentStreamFileName" )
- convertedKey = "title";
+ convertedKey = "name";
else if ( key == "cmis:name" )
- convertedKey = "title";
+ convertedKey = "name";
else if ( key == "cmis:contentStreamMimeType" )
convertedKey = "mimeType";
else if ( key == "cmis:contentStreamLength" )
- convertedKey = "fileSize";
+ convertedKey = "size";
else if ( key == "cmis:isImmutable" )
convertedKey = "editable";
else if ( key == "cmis:parentId" )
@@ -124,9 +124,9 @@
bool GdriveUtils::checkUpdatable( const string& key )
{
// taken from https://developers.google.com/drive/v2/reference/files
- bool updatable = ( key == "title" ||
+ bool updatable = ( key == "name" ||
key == "description" ||
- key == "modifiedDate" ||
+ key == "modifiedTime" ||
key == "lastViewedByMeDate" );
return updatable;
}
@@ -143,18 +143,11 @@
Json GdriveUtils::createJsonFromParentId( const string& parentId )
{
- Json parentValue( parentId.c_str( ) );
-
// parents is a Json array
Json firstParent;
- firstParent.add( "id", parentValue );
-
- Json::JsonVector parents;
- parents.insert( parents.begin( ), firstParent );
+ firstParent.add( Json( parentId.c_str() ) );
- Json parentsValue( parents );
-
- return parentsValue;
+ return firstParent;
}
vector< string > GdriveUtils::parseGdriveProperty( string key, Json json )
diff -ur libcmis.org/src/libcmis/gdrive-utils.hxx libcmis/src/libcmis/gdrive-utils.hxx
--- libcmis.org/src/libcmis/gdrive-utils.hxx 2021-07-27 19:11:02.677247008 +0200
+++ libcmis/src/libcmis/gdrive-utils.hxx 2021-07-27 19:11:18.875246420 +0200
@@ -35,7 +35,8 @@
#include "json-utils.hxx"
static const std::string GDRIVE_FOLDER_MIME_TYPE = "application/vnd.google-apps.folder" ;
-static const std::string GDRIVE_UPLOAD_LINKS = "https://www.googleapis.com/upload/drive/v2/files/";
+static const std::string GDRIVE_UPLOAD_LINK = "https://www.googleapis.com/upload/drive/v3/files/";
+static const std::string GDRIVE_METADATA_LINK = "https://www.googleapis.com/drive/v3/files/";
class GdriveUtils
{
diff -ur libcmis.org/src/libcmis/oauth2-handler.cxx libcmis/src/libcmis/oauth2-handler.cxx
--- libcmis.org/src/libcmis/oauth2-handler.cxx 2021-07-27 19:11:02.676247009 +0200
+++ libcmis/src/libcmis/oauth2-handler.cxx 2021-07-27 19:11:18.875246420 +0200
@@ -92,8 +92,11 @@
"code=" + authCode +
"&client_id=" + m_data->getClientId() +
"&redirect_uri=" + m_data->getRedirectUri() +
- "&scope=" + libcmis::escape( m_data->getScope() ) +
"&grant_type=authorization_code" ;
+ if(boost::starts_with(m_data->getTokenUrl(), "https://oauth2.googleapis.com/"))
+ post += "&client_secret=" + m_data->getClientSecret();
+ else
+ post += "&scope=" + libcmis::escape( m_data->getScope() );
istringstream is( post );
@@ -104,7 +107,7 @@
resp = m_session->httpPostRequest ( m_data->getTokenUrl(), is,
"application/x-www-form-urlencoded" );
}
- catch ( const CurlException& )
+ catch ( const CurlException& e)
{
throw libcmis::Exception(
"Couldn't get tokens from the authorization code ");
@@ -122,6 +125,8 @@
"refresh_token=" + m_refresh +
"&client_id=" + m_data->getClientId() +
"&grant_type=refresh_token" ;
+ if(boost::starts_with(m_data->getTokenUrl(), "https://oauth2.googleapis.com/"))
+ post += "&client_secret=" + m_data->getClientSecret();
istringstream is( post );
libcmis::HttpResponsePtr resp;
@@ -130,7 +135,7 @@
resp = m_session->httpPostRequest( m_data->getTokenUrl( ), is,
"application/x-www-form-urlencoded" );
}
- catch (const CurlException& )
+ catch (const CurlException& e )
{
throw libcmis::Exception( "Couldn't refresh token ");
}
diff -ur libcmis.org/src/libcmis/oauth2-providers.cxx libcmis/src/libcmis/oauth2-providers.cxx
--- libcmis.org/src/libcmis/oauth2-providers.cxx 2021-07-27 19:11:02.679247008 +0200
+++ libcmis/src/libcmis/oauth2-providers.cxx 2021-07-27 19:11:18.886246420 +0200
@@ -80,172 +80,8 @@
}
-string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& authUrl,
- const string& username, const string& password )
-{
- /* This member function implements 'Google OAuth 2.0'
- *
- * The interaction is carried out by libcmis, with no web browser involved.
- *
- * Normal sequence (without 2FA) is:
- * 1) a get to activate login page
- * receive first login page, html format
- * 2) subsequent post to sent email
- * receive html page for password input
- * 3) subsequent post to send password
- * receive html page for application consent
- * 4) subsequent post to send a consent for the application
- * receive a single-use authorization code
- * this code is returned as a string
- *
- * Sequence with 2FA is:
- * 1) a get to activate login page
- * receive first login page, html format
- * 2) subsequent post to sent email
- * receive html page for password input
- * 3) subsequent post to send password
- * receive html page for pin input
- * 3b) subsequent post to send pin number
- * receive html page for application consent
- * 4) subsequent post to send a consent for the application
- * receive a single-use authorization code
- * this code is returned as a string
- */
-
- static const string CONTENT_TYPE( "application/x-www-form-urlencoded" );
- // STEP 1: get login page
- string res;
- try
- {
- // send the first get, receive the html login page
- res = session->httpGetRequest( authUrl )->getStream( )->str( );
- }
- catch ( const CurlException& )
- {
- return string( );
- }
-
- // STEP 2: send email
-
- string loginEmailPost, loginEmailLink;
- if ( !parseResponse( res.c_str( ), loginEmailPost, loginEmailLink ) )
- return string( );
-
- loginEmailPost += "Email=";
- loginEmailPost += escapeForm( username );
-
- istringstream loginEmailIs( loginEmailPost );
- string loginEmailRes;
- try
- {
- // send a post with user email, receive the html page for password input
- loginEmailRes = session->httpPostRequest ( loginEmailLink, loginEmailIs, CONTENT_TYPE )
- ->getStream( )->str( );
- }
- catch ( const CurlException& )
- {
- return string( );
- }
-
- // STEP 3: password page
-
- string loginPasswdPost, loginPasswdLink;
- if ( !parseResponse( loginEmailRes.c_str( ), loginPasswdPost, loginPasswdLink ) )
- return string( );
-
- loginPasswdPost += "Passwd=";
- loginPasswdPost += escapeForm( password );
-
- istringstream loginPasswdIs( loginPasswdPost );
- string loginPasswdRes;
- try
- {
- // send a post with user password, receive the application consent page
- loginPasswdRes = session->httpPostRequest ( loginPasswdLink, loginPasswdIs, CONTENT_TYPE )
- ->getStream( )->str( );
- }
- catch ( const CurlException& )
- {
- return string( );
- }
-
- string approvalPost, approvalLink;
- if ( !parseResponse( loginPasswdRes. c_str( ), approvalPost, approvalLink) )
- return string( );
-
- // when 2FA is enabled, link doesn't start with 'http'
- if ( approvalLink.compare(0, 4, "http") != 0 )
- {
- // STEP 3b: 2 Factor Authentication, pin code request
-
- string loginChallengePost( approvalPost );
- string loginChallengeLink( approvalLink );
-
- libcmis::OAuth2AuthCodeProvider fallbackProvider = libcmis::SessionFactory::getOAuth2AuthCodeProvider( );
- unique_ptr< char, void (*)( void * ) > pin{ fallbackProvider( "", "", "" ), free };
-
- if( !pin )
- {
- // unset OAuth2AuthCode Provider to avoid showing pin request again in the HttpSession::oauth2Authenticate
- libcmis::SessionFactory::setOAuth2AuthCodeProvider( NULL );
- return string( );
- }
-
- loginChallengeLink = "https://accounts.google.com" + loginChallengeLink;
- loginChallengePost += string( PIN_INPUT_NAME ) + "=";
- loginChallengePost += string( pin.get() );
-
- istringstream loginChallengeIs( loginChallengePost );
- string loginChallengeRes;
- try
- {
- // send a post with pin, receive the application consent page
- loginChallengeRes = session->httpPostRequest ( loginChallengeLink, loginChallengeIs, CONTENT_TYPE )
- ->getStream( )->str( );
- }
- catch ( const CurlException& )
- {
- return string( );
- }
-
- approvalPost = string();
- approvalLink = string();
-
- if ( !parseResponse( loginChallengeRes. c_str( ), approvalPost, approvalLink) )
- return string( );
- }
- else if( approvalLink.compare( "https://accounts.google.com/ServiceLoginAuth" ) == 0 )
- {
- // wrong password,
- // unset OAuth2AuthCode Provider to avoid showing pin request again in the HttpSession::oauth2Authenticate
- libcmis::SessionFactory::setOAuth2AuthCodeProvider( NULL );
- return string( );
- }
-
- // STEP 4: allow libcmis to access google drive
- approvalPost += "submit_access=true";
-
- istringstream approvalIs( approvalPost );
- string approvalRes;
- try
- {
- // send a post with application consent
- approvalRes = session->httpPostRequest ( approvalLink, approvalIs,
- CONTENT_TYPE) ->getStream( )->str( );
- }
- catch ( const CurlException& e )
- {
- throw e.getCmisException( );
- }
-
- // Take the authentication code from the text bar
- string code = parseCode( approvalRes.c_str( ) );
-
- return code;
-}
-
-string OAuth2Providers::OAuth2Onedrive( HttpSession* /*session*/, const string& /*authUrl*/,
- const string& /*username*/, const string& /*password*/ )
+string OAuth2Providers::OAuth2Dummy( HttpSession* /*session*/, const string& /*authUrl*/,
+ const string& /*username*/, const string& /*password*/ )
{
return string( );
}
@@ -314,12 +150,8 @@
// For Alfresco in the cloud, only match the hostname as there can be several
// binding URLs created with it.
return OAuth2Alfresco;
- else if ( boost::starts_with( url, "https://www.googleapis.com/drive/v2" ) )
- return OAuth2Gdrive;
- else if ( boost::starts_with( url, "https://graph.microsoft.com/v1.0" ) )
- return OAuth2Onedrive;
- return OAuth2Gdrive;
+ return OAuth2Dummy;
}
int OAuth2Providers::parseResponse ( const char* response, string& post, string& link )
diff -ur libcmis.org/src/libcmis/oauth2-providers.hxx libcmis/src/libcmis/oauth2-providers.hxx
--- libcmis.org/src/libcmis/oauth2-providers.hxx 2021-07-27 19:11:02.678247008 +0200
+++ libcmis/src/libcmis/oauth2-providers.hxx 2021-07-27 19:11:18.886246420 +0200
@@ -39,12 +39,8 @@
class OAuth2Providers
{
public :
- static std::string OAuth2Gdrive( HttpSession* session, const std::string& authUrl,
+ static std::string OAuth2Dummy( HttpSession* session, const std::string& authUrl,
const std::string& username, const std::string& password );
-
- static std::string OAuth2Onedrive( HttpSession* session, const std::string& authUrl,
- const std::string& username, const std::string& password );
-
static std::string OAuth2Alfresco( HttpSession* session, const std::string& authUrl,
const std::string& username, const std::string& password );
diff -ur libcmis.org/src/libcmis/session-factory.cxx libcmis/src/libcmis/session-factory.cxx
--- libcmis.org/src/libcmis/session-factory.cxx 2021-07-27 19:11:02.679247008 +0200
+++ libcmis/src/libcmis/session-factory.cxx 2021-07-27 19:11:18.886246420 +0200
@@ -66,7 +66,7 @@
if ( !bindingUrl.empty( ) )
{
// Try the special cases based on the binding URL
- if ( bindingUrl == "https://www.googleapis.com/drive/v2" )
+ if ( bindingUrl == "https://www.googleapis.com/drive/v3" )
{
session = new GDriveSession( bindingUrl, username, password,
oauth2, verbose );
Reference in New Issue View Git Blame Copy Permalink