Fixed 'Share' option to open drive.google.com for Team Drives

Fixed 'Share' option to open drive.google.com for files and folders in
Team Drives.

Previously, the URL opened was just the alternateUrl (views the file
or folder in drive.google.com). Appending ?userstoinvite="" opens the
sharing dialog.

In the future, this URL will be returned from the Drive API.

The file/folder should open in drive.google.com with the sharing dialog
open.

Test: Right-click on a file or folder in Team Drives and select 'Share'.
Bug: 716301
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Id7d738fd1b16f67af3a012426b8eea0032489450
Reviewed-on: https://chromium-review.googlesource.com/1065834
Commit-Queue: Sasha Morrissey <sashab@chromium.org>
Reviewed-by: Joel Hockey <joelhockey@chromium.org>
Reviewed-by: Naoki Fukino <fukino@chromium.org>
Reviewed-by: Tatsuhisa Yamaguchi <yamaguchi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560962}

chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc

@@ -85,7 +85,6 @@ void FillEntryPropertiesValueForDrive(const drive::ResourceEntry& entry_proto,
   properties->shared_with_me.reset(new bool(shared_with_me));
   properties->shared.reset(new bool(entry_proto.shared()));
   properties->starred.reset(new bool(entry_proto.starred()));
-  properties->alternate_url.reset(new std::string(entry_proto.alternate_url()));
 
   const drive::PlatformFileInfoProto& file_info = entry_proto.file_info();
   properties->size.reset(new double(file_info.size()));
@@ -95,6 +94,24 @@ void FillEntryPropertiesValueForDrive(const drive::ResourceEntry& entry_proto,
       base::Time::FromInternalValue(entry_proto.last_modified_by_me())
           .ToJsTime()));
 
+  if (entry_proto.has_alternate_url()) {
+    properties->alternate_url.reset(
+        new std::string(entry_proto.alternate_url()));
+
+    // Set |share_url| to a modified version of |alternate_url| that opens the
+    // sharing dialog for files and folders (add ?userstoinvite="" to the URL).
+    // TODO(sashab): Add an endpoint to the Drive API that generates this URL,
+    // instead of manually modifying it here.
+    GURL share_url = GURL(entry_proto.alternate_url());
+    GURL::Replacements replacements;
+    std::string new_query =
+        (share_url.has_query() ? share_url.query() + "&" : "") +
+        "userstoinvite=%22%22";
+    replacements.SetQueryStr(new_query);
+    properties->share_url.reset(
+        new std::string(share_url.ReplaceComponents(replacements).spec()));
+  }
+
   if (!entry_proto.has_file_specific_info())
     return;
 

chrome/common/extensions/api/file_manager_private.idl

@@ -176,7 +176,8 @@ enum EntryPropertyName {
   shared,
   starred,
   externalFileUrl,
-  alternateUrl
+  alternateUrl,
+  shareUrl
 };
 
 // Entry property visibility for setEntryTag();
@@ -305,8 +306,12 @@ dictionary EntryProperties {
   // externalfile:// URL to open the file in browser.
   DOMString? externalFileUrl;
 
-  // https:// URL to open the file in the Drive website.
+  // https:// URL to open the file or folder in the Drive website.
   DOMString? alternateUrl;
+
+  // https:// URL to open the file or folder in the Drive website with the
+  // sharing dialog open.
+  DOMString? shareUrl;
 };
 
 // Information about total and remaining size on the mount point.

third_party/closure_compiler/externs/file_manager_private.js

@@ -31,6 +31,7 @@ var IconSet;
  *   croppedThumbnailUrl: (string|undefined),
  *   externalFileUrl: (string|undefined),
  *   alternateUrl: (string|undefined),
+ *   shareUrl: (string|undefined),
  *   imageWidth: (number|undefined),
  *   imageHeight: (number|undefined),
  *   imageRotation: (number|undefined),

ui/file_manager/file_manager/foreground/js/actions_model.js

@@ -71,26 +71,40 @@ function DriveShareAction(entry, volumeManager, ui) {
  * @param {!Array<!Entry>} entries
  * @param {!ActionModelUI} ui
  * @param {!VolumeManagerWrapper} volumeManager
- * @return {DriveShareAction|DriveManageAction}
+ * @return {DriveShareAction}
  */
 DriveShareAction.create = function(entries, volumeManager, ui) {
   if (entries.length !== 1)
     return null;
-
-  // The share URL for Team Drives currently does not support embedding. For
-  // Team Drives entries, instead point the user to the 'Manage' action.
-  var entry = entries[0];
-  if (util.isTeamDriveEntry(entry)) {
-    return new DriveManageAction(entry, volumeManager, ui);
-  }
-
-  return new DriveShareAction(entry, volumeManager, ui);
+  return new DriveShareAction(entries[0], volumeManager, ui);
 };
 
 /**
  * @override
  */
 DriveShareAction.prototype.execute = function() {
+  // For Team Drives entries, open the Sharing dialog in a new window.
+  if (util.isTeamDriveEntry(this.entry_)) {
+    chrome.fileManagerPrivate.getEntryProperties(
+        [this.entry_], ['shareUrl'], function(results) {
+          if (chrome.runtime.lastError) {
+            console.error(chrome.runtime.lastError.message);
+            return;
+          }
+          if (results.length != 1) {
+            console.error(
+                'getEntryProperties for shareUrl should return 1 entry ' +
+                '(returned ' + results.length + ')');
+            return;
+          }
+          if (results[0].shareUrl === undefined) {
+            console.error('getEntryProperties shareUrl is undefined');
+            return;
+          }
+          util.visitURL(results[0].shareUrl);
+        }.bind(this));
+    return;
+  }
   this.ui_.shareDialog.showEntry(this.entry_, function(result) {
     if (result == ShareDialog.Result.NETWORK_ERROR)
       this.ui_.errorDialog.show(str('SHARE_ERROR'), null, null, null);
@@ -478,6 +492,10 @@ DriveManageAction.prototype.execute = function() {
               '(returned ' + results.length + ')');
           return;
         }
+        if (results[0].alternateUrl === undefined) {
+          console.error('getEntryProperties alternateUrl is undefined');
+          return;
+        }
         util.visitURL(results[0].alternateUrl);
       }.bind(this));
 };
@@ -686,6 +704,7 @@ ActionsModel.prototype.initialize = function() {
     }
     // All entries need to be on the same volume to execute ActionsModel
     // commands.
+    // TODO(sashab): Move this to util.js.
     for (var i = 1; i < this.entries_.length; i++) {
       var volumeInfoToCompare =
           this.volumeManager_.getVolumeInfo(this.entries_[i]);

ui/file_manager/file_manager/foreground/js/actions_model_unittest.js

@@ -301,12 +301,10 @@ function testTeamDriveDirectoryEntry(callback) {
         var actions = model.getActions();
         assertEquals(3, Object.keys(actions).length);
 
-        // "Share" is enabled for Team Drive directories, and is the same as the
-        // "Manage in Drive" action.
+        // "Share" is enabled for Team Drive directories.
         var shareAction = actions[ActionsModel.CommonActionId.SHARE];
         assertTrue(!!shareAction);
         assertTrue(shareAction.canExecute());
-        assertTrue(shareAction instanceof DriveManageAction);
 
         // "Manage in drive" is enabled for Team Drive directories.
         var manageAction =

ui/file_manager/integration_tests/file_manager/share_and_manage_dialog.js

@@ -190,6 +190,8 @@ testcase.shareDirectoryDrive = function() {
   share('photos');
 };
 
+// TODO(sashab): Add tests for sharing a file on Team Drives.
+
 /**
  * Tests managing a hosted file (gdoc) on Drive.
  */