Fetch files shared in Team Drives by specifying allTeamDrives corpora.

google_apis/drive/drive_api_url_generator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/drive/drive_api_url_generator.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 24 matching lines @@
 const char kDriveV2UploadExistingFileUrlPrefix[] = "upload/drive/v2/files/";
 const char kDriveV2BatchUploadUrl[] = "upload/drive";
 const char kDriveV2PermissionsUrlFormat[] = "drive/v2/files/%s/permissions";
 const char kDriveV2DownloadUrlFormat[] = "drive/v2/files/%s?alt=media";
 const char kDriveV2ThumbnailUrlFormat[] = "d/%s=w%d-h%d";
 const char kDriveV2ThumbnailUrlWithCropFormat[] = "d/%s=w%d-h%d-c";
 const char kDriveV2TeamDrivesUrl[] = "drive/v2/teamdrives";
 
 const char kIncludeTeamDriveItems[] = "includeTeamDriveItems";
 const char kSupportsTeamDrives[] = "supportsTeamDrives";
+const char kCorpora[] = "corpora";
+const char kCorporaAllTeamDrives[] = "default,allTeamDrives";
+const char kCorporaDefault[] = "default";
+const char kCorporaTeamDrive[] = "teamDrive";
+const char kTeamDriveId[] = "teamDriveId";
 
 // apps.delete and file.authorize API is exposed through a special endpoint
 // v2internal that is accessible only by the official API key for Chrome.
 const char kDriveV2InternalAppsUrl[] = "drive/v2internal/apps";
 const char kDriveV2AppsDeleteUrlFormat[] = "drive/v2internal/apps/%s";
 const char kDriveV2FilesAuthorizeUrlFormat[] =
     "drive/v2internal/files/%s/authorize?appId=%s";
 const char kDriveV2InternalFileUrlPrefix[] = "drive/v2internal/files/";
 
 GURL AddResumableUploadParam(const GURL& url) {
@@ skipping 123 matching lines @@
   if (enable_team_drives_)
     url = net::AppendOrReplaceQueryParameter(url, kSupportsTeamDrives, "true");
   if (!visibility.empty())
     url = net::AppendOrReplaceQueryParameter(url, "visibility", visibility);
 
   return url;
 }
 
 GURL DriveApiUrlGenerator::GetFilesListUrl(int max_results,
                                            const std::string& page_token,
+                                           FilesListCorpora corpora,
+                                           const std::string& team_drive_id,
                                            const std::string& q) const {
   GURL url = base_url_.Resolve(kDriveV2FilesUrl);
   if (enable_team_drives_) {
     url = net::AppendOrReplaceQueryParameter(url, kSupportsTeamDrives, "true");
-    url = net::AppendOrReplaceQueryParameter(url, kIncludeTeamDriveItems,
-                                             "true");
+    url =
+        net::AppendOrReplaceQueryParameter(url, kIncludeTeamDriveItems, "true");

[hashimoto, 2017/06/02 09:44:46]

Are kSupportsTeamDrives and kIncludeTeamDriveItems needed only when the corpora
doesn't include Team Drives?

[yamaguchi, 2017/06/02 12:04:01]

Changed to turn off includeTeamDriveItems for the default corpus.

supportsTeamDrives is perhaps not needed especially for this case, but I think
we probably should have this parameter because this is a parameter to indicate
the client application is aware of (=designed to handle response related to)
Team Drives.

The reference in the API document says:

+    url = net::AppendOrReplaceQueryParameter(url, kCorpora,
+                                             GetCorporaString_(corpora));
+    if (!team_drive_id.empty())
+      url =
+          net::AppendOrReplaceQueryParameter(url, kTeamDriveId, team_drive_id);
   }
   // maxResults is 100 by default.
   if (max_results != 100) {
     url = net::AppendOrReplaceQueryParameter(
         url, "maxResults", base::IntToString(max_results));
   }
 
   if (!page_token.empty())
     url = net::AppendOrReplaceQueryParameter(url, "pageToken", page_token);
 
@@ skipping 27 matching lines @@
     const std::string& team_drive_id) const {
   DCHECK_GE(start_change_id, 0);
 
   GURL url = base_url_.Resolve(kDriveV2ChangelistUrl);
   if (enable_team_drives_) {
     url = net::AppendOrReplaceQueryParameter(url, kSupportsTeamDrives, "true");
     url = net::AppendOrReplaceQueryParameter(url, kIncludeTeamDriveItems,
                                              "true");
     if (!team_drive_id.empty()) {
       url =
-          net::AppendOrReplaceQueryParameter(url, "teamDriveId", team_drive_id);
+          net::AppendOrReplaceQueryParameter(url, kTeamDriveId, team_drive_id);
     }
   }
   // includeDeleted is "true" by default.
   if (!include_deleted)
     url = net::AppendOrReplaceQueryParameter(url, "includeDeleted", "false");
 
   // maxResults is "100" by default.
   if (max_results != 100) {
     url = net::AppendOrReplaceQueryParameter(
         url, "maxResults", base::IntToString(max_results));
@@ skipping 132 matching lines @@
   if (max_results != 10) {
     url = net::AppendOrReplaceQueryParameter(url, "maxResults",
                                              base::IntToString(max_results));
   }
   if (!page_token.empty())
     url = net::AppendOrReplaceQueryParameter(url, "pageToken", page_token);
 
   return url;
 }
 
+// static
+const char* DriveApiUrlGenerator::GetCorporaString_(FilesListCorpora corpora) {
+  switch (corpora) {
+    case CORPORA_TEAM_DRIVE:
+      return kCorporaTeamDrive;
+    case CORPORA_ALL_TEAM_DRIVES:
+      return kCorporaAllTeamDrives;
+    default:

[hashimoto, 2017/06/02 09:44:46]

Please have cases for all possible enums.
Instead of default:, you can add NOTREACHED to after this switch.

[yamaguchi, 2017/06/02 12:04:01]

Done.

+      DCHECK(corpora == CORPORA_DEFAULT);
+      return kCorporaDefault;
+  }
+}
+
 }  // namespace google_apis