Merge pull request #407 from siata13/dev

Dev

Author: estruyf

src/controls/filePicker/FilePicker.types.ts

@@ -32,6 +32,11 @@ export interface IFilePickerResult {
    */
   fileAbsoluteUrl: string;
 
+  /**
+   * Absolute not modified file SharePoint URL.
+   */
+  spItemUrl?: string;
+
   /**
    * Downloads file picker result content.
    */

src/controls/filePicker/OneDriveFilesTab/OneDriveFilesTab.tsx

@@ -132,7 +132,7 @@ export class OneDriveFilesTab extends React.Component<IOneDriveFilesTabProps, IO
    */
   private _handleSelectionChange = (filePickerResult: IFilePickerResult) => {
     if (filePickerResult) {
-      filePickerResult.downloadFileContent = () => { return this.props.oneDriveService.downloadSPFileContent(filePickerResult.fileAbsoluteUrl, filePickerResult.fileName); };
+      filePickerResult.downloadFileContent = () => { return this.props.oneDriveService.downloadSPFileContent(filePickerResult.spItemUrl, filePickerResult.fileName); };
     }
     this.setState({
       filePickerResult

src/controls/filePicker/controls/FileBrowser/FileBrowser.tsx

@@ -434,6 +434,7 @@ export class FileBrowser extends React.Component<IFileBrowserProps, IFileBrowser
         fileAbsoluteUrl: selectedItem.absoluteUrl,
         fileName: GeneralHelper.getFileNameFromUrl(selectedItem.name),
         fileNameWithoutExtension: GeneralHelper.getFileNameWithoutExtension(selectedItem.name),
+        spItemUrl: selectedItem.spItemUrl,
         downloadFileContent: null
       };
     }

src/services/OneDriveService.ts

@@ -2,11 +2,9 @@
 import { sp, RenderListDataOptions } from "@pnp/sp";
 import { WebPartContext } from "@microsoft/sp-webpart-base";
 
-import { SPHttpClient, SPHttpClientResponse, ISPHttpClientOptions } from '@microsoft/sp-http';
-import { IGetListDataAsStreamResult, IRow } from './IOneDriveService';
-import { GeneralHelper } from "../Utilities";
+import { SPHttpClient } from '@microsoft/sp-http';
 import { FileBrowserService } from "./FileBrowserService";
-import { IFile, FilesQueryResult } from "./FileBrowserService.types";
+import { FilesQueryResult } from "./FileBrowserService.types";
 import { ApplicationCustomizerContext } from "@microsoft/sp-application-base";
 
 export class OneDriveService extends FileBrowserService {
@@ -61,9 +59,18 @@ export class OneDriveService extends FileBrowserService {
    */
   public downloadSPFileContent = async (absoluteFileUrl: string, fileName: string): Promise<File> => {
     try {
-      const fileDownloadResult = await this.context.spHttpClient.get(absoluteFileUrl, SPHttpClient.configurations.v1, {
-        method: "GET",
-        mode: "cors"
+      // replace url OneDrive site URL with current web url
+      const urlTokens = absoluteFileUrl.split("/_api/");
+      let fileUrl = `${this.context.pageContext.web.absoluteUrl}/_api/${urlTokens[1]}?`;
+
+      const fileInfoResult = await this.context.spHttpClient.get(fileUrl, SPHttpClient.configurations.v1);
+      const fileInfo = await fileInfoResult.json();
+      const oneDrvieFileUrl = fileInfo["@content.downloadUrl"];
+
+      const fileDownloadResult = await this.context.httpClient.get(oneDrvieFileUrl, SPHttpClient.configurations.v1, {
+        headers: new Headers(),
+        method: 'GET',
+        mode: 'cors'
       });
 
       if (!fileDownloadResult || !fileDownloadResult.ok) {