Merge pull request #372 from siata13/dev

Fix OneDrive and Bing services cors bugs.

Author: estruyf

src/services/FilesSearchService.ts

@@ -183,7 +183,7 @@ export class FilesSearchService {
       const blob: Blob = await fileDownloadResult.blob();
       return new File([blob], fileName);
     } catch (err) {
-      console.error(`[FileBrowserService.fetchFileContent] Err='${err.message}'`);
+      console.error(`[FileSearchService.fetchFileContent] Err='${err.message}'`);
       return null;
     }
   }
@@ -193,7 +193,10 @@ export class FilesSearchService {
    */
   public downloadBingContent = async (absoluteFileUrl: string, fileName: string): Promise<File> => {
     try {
-      const fileDownloadResult = await this.context.httpClient.get(absoluteFileUrl, SPHttpClient.configurations.v1);
+      const fileDownloadResult = await this.context.httpClient.get(absoluteFileUrl, SPHttpClient.configurations.v1, {
+        method: "GET",
+        mode: "cors"
+      });
 
       if (!fileDownloadResult || !fileDownloadResult.ok) {
         throw new Error(`Something went wrong when downloading the file. Status='${fileDownloadResult.status}'`);
@@ -203,7 +206,7 @@ export class FilesSearchService {
       const blob: Blob = await fileDownloadResult.blob();
       return new File([blob], fileName);
     } catch (err) {
-      console.error(`[FileBrowserService.fetchFileContent] Err='${err.message}'`);
+      console.error(`[FileSearchService.fetchFileContent] Err='${err.message}'`);
       return null;
     }
   }

src/services/OneDriveService.ts

@@ -56,6 +56,29 @@ export class OneDriveService extends FileBrowserService {
     return filesQueryResult;
   }
 
+  /**
+   * Downloads document content from OneDrive location.
+   */
+  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"
+      });
+
+      if (!fileDownloadResult || !fileDownloadResult.ok) {
+        throw new Error(`Something went wrong when downloading the file. Status='${fileDownloadResult.status}'`);
+      }
+
+      // Return file created from blob
+      const blob : Blob = await fileDownloadResult.blob();
+      return  new File([blob], fileName);
+    } catch (err) {
+      console.error(`[OneDriveService.fetchFileContent] Err='${err.message}'`);
+      return null;
+    }
+  }
+
   /**
      * Gets users one drive personal documents library path
      */
@@ -147,4 +170,12 @@ export class OneDriveService extends FileBrowserService {
     }
     return this.oneDrivePersonalUrl;
   }
+
+  /**
+   * Creates an absolute URL
+   */
+  protected buildAbsoluteUrl = (relativeUrl: string) => {
+    const oneDriveHost = `https://${this.oneDrivePersonalUrl.split("//")[1].split("/")[0]}`;
+    return oneDriveHost + relativeUrl;
+  }
 }