deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-06-28 18:30:09 +02:00
Code Issues Projects Releases Wiki Activity

Update --list-shared-folders to support external shared folders

Browse source 
* Update --list-shared-folders to support external shared folders
This commit is contained in:
abraunegg 2020-07-01 09:22:25 +10:00
parent 7538ea115a
commit 055837988a
2 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/onedrive.d
View file

@ -63,6 +63,9 @@ private {
// What is 'shared with me' Query
string sharedWithMe = globalGraphEndpoint ~ "/v1.0/me/drive/sharedWithMe";
// What are my 'tenant' details
string sharepointTenantId = globalGraphEndpoint ~ "/v1.0/organization";
// Item Queries
string itemByIdUrl = globalGraphEndpoint ~ "/v1.0/me/drive/items/";
string itemByPathUrl = globalGraphEndpoint ~ "/v1.0/me/drive/root:/";
@ -161,6 +164,7 @@ final class OneDriveApi
siteDriveUrl = usl4GraphEndpoint ~ "/v1.0/sites/";
// Shared With Me
sharedWithMe = usl4GraphEndpoint ~ "/v1.0/me/drive/sharedWithMe";
sharepointTenantId = usl4GraphEndpoint ~ "/v1.0/organization";
break;
case "USL5":
log.log("Configuring Azure AD for US Government Endpoints (DOD)");
@ -179,6 +183,7 @@ final class OneDriveApi
siteDriveUrl = usl5GraphEndpoint ~ "/v1.0/sites/";
// Shared With Me
sharedWithMe = usl5GraphEndpoint ~ "/v1.0/me/drive/sharedWithMe";
sharepointTenantId = usl5GraphEndpoint ~ "/v1.0/organization";
break;
case "DE":
log.log("Configuring Azure AD Germany");
@ -197,6 +202,7 @@ final class OneDriveApi
siteDriveUrl = deGraphEndpoint ~ "/v1.0/sites/";
// Shared With Me
sharedWithMe = deGraphEndpoint ~ "/v1.0/me/drive/sharedWithMe";
sharepointTenantId = deGraphEndpoint ~ "/v1.0/organization";
break;
case "CN":
log.log("Configuring AD China operated by 21Vianet");
@ -215,6 +221,7 @@ final class OneDriveApi
siteDriveUrl = cnGraphEndpoint ~ "/v1.0/sites/";
// Shared With Me
sharedWithMe = cnGraphEndpoint ~ "/v1.0/me/drive/sharedWithMe";
sharepointTenantId = cnGraphEndpoint ~ "/v1.0/organization";
break;
// Default - all other entries
default:
@ -327,7 +334,7 @@ final class OneDriveApi
{
import std.stdio, std.regex;
char[] response;
string url = authUrl ~ "?client_id=" ~ clientId ~ "&scope=Files.ReadWrite%20Files.ReadWrite.all%20Sites.Read.All%20Sites.ReadWrite.All%20offline_access&response_type=code&redirect_uri=" ~ redirectUrl;
string url = authUrl ~ "?client_id=" ~ clientId ~ "&scope=User.Read%20Files.ReadWrite%20Files.ReadWrite.all%20Sites.Read.All%20Sites.ReadWrite.All%20offline_access&response_type=code&redirect_uri=" ~ redirectUrl;
string authFilesString = cfg.getValueString("auth_files");
if (authFilesString == "") {
log.log("Authorize this app visiting:\n");
@ -413,6 +420,15 @@ final class OneDriveApi
return get(url);
}
// https://docs.microsoft.com/en-us/onedrive/developer/rest-api/api/site_get
JSONValue getTenantID()
{
checkAccessTokenExpired();
const(char)[] url;
url = sharepointTenantId;
return get(url);
}
// https://docs.microsoft.com/en-us/graph/api/drive-sharedwithme
JSONValue getSharedWithMe()
{

31
src/sync.d
View file

@ -5477,6 +5477,14 @@ final class SyncEngine
{
// List OneDrive Business Shared Folders
log.log("\nListing available OneDrive Business Shared Folders:");
// Get My Tenent Details
string myTenantID;
JSONValue tenantDetailsResponse = onedrive.getTenantID();
foreach (searchResult; tenantDetailsResponse["value"].array) {
myTenantID = searchResult["id"].str;
}
// Query the GET /me/drive/sharedWithMe API
JSONValue graphQuery = onedrive.getSharedWithMe();
if (graphQuery.type() == JSONType.object) {
@ -5507,19 +5515,28 @@ final class SyncEngine
}
// Output query result
log.log("---------------------------------------");
log.log("Shared Folder: ", sharedFolderName);
// Default output
log.log("Shared Folder: ", sharedFolderName);
if ((sharedByName != "") && (sharedByEmail != "")) {
log.log("Shared By: ", sharedByName, " (", sharedByEmail, ")");
log.log("Shared By: ", sharedByName, " (", sharedByEmail, ")");
} else {
if (sharedByName != "") {
log.log("Shared By: ", sharedByName);
log.log("Shared By: ", sharedByName);
}
}
log.vlog("Item Id: ", searchResult["remoteItem"]["id"].str);
log.vlog("Parent Drive Id: ", searchResult["remoteItem"]["parentReference"]["driveId"].str);
if ("id" in searchResult["remoteItem"]["parentReference"]) {
log.vlog("Parent Item Id: ", searchResult["remoteItem"]["parentReference"]["id"].str);
if (searchResult["remoteItem"]["sharepointIds"]["tenantId"].str == myTenantID) {
log.log("External Organisation: no");
} else {
log.log("External Organisation: yes");
}
// Extra verbose output
log.vlog("Item Id: ", searchResult["remoteItem"]["id"].str);
log.vlog("Parent Drive Id: ", searchResult["remoteItem"]["parentReference"]["driveId"].str);
if ("id" in searchResult["remoteItem"]["parentReference"]) {
log.vlog("Parent Item Id: ", searchResult["remoteItem"]["parentReference"]["id"].str);
}
log.vlog("Tenant ID: ", searchResult["remoteItem"]["sharepointIds"]["tenantId"].str);
}
}
write("\n");