Merge remote-tracking branch 'powerbi/master'

Author: ali-hamud

dist/powerbi-client.d.ts

@@ -45,6 +45,13 @@ declare module "util" {
      * @returns {string}
      */
     export function createRandomString(): string;
+    /**
+     * Generates a 20 charachter uuid.
+     *
+     * @export
+     * @returns {string}
+     */
+    export function generateUUID(): string;
     /**
      * Adds a parameter to the given url
      *
@@ -1245,6 +1252,7 @@ declare module "service" {
         /** TODO: Look for way to make wpmp private.  This is only public to allow stopping the wpmp in tests */
         wpmp: wpmp.WindowPostMessageProxy;
         private router;
+        private uniqueSessionId;
         private static DefaultInitEmbedUrl;
         /**
          * Creates an instance of a Power BI Service.
@@ -1293,6 +1301,7 @@ declare module "service" {
         load(element: HTMLElement, config?: embed.IEmbedConfigurationBase): embed.Embed;
         embedInternal(element: HTMLElement, config?: embed.IEmbedConfigurationBase, phasedRender?: boolean): embed.Embed;
         getNumberOfComponents(): number;
+        getSdkSessionId(): string;
         /**
          * Given a configuration based on a Power BI element, saves the component instance that reference the element for later lookup.
          *

dist/powerbi.js

@@ -2446,6 +2446,7 @@ describe('SDK-to-HPM', function () {
   let page1: page.Page;
   let visual1: visualDescriptor.VisualDescriptor;
   let uniqueId = 'uniqueId';
+  let sdkSessionId = 'sdkSessionId';
   let createUniqueId = 'uniqueId';
   let dashboardUniqueId = 'uniqueId';
   let visualUniqueId = 'uniqueId';
@@ -2513,6 +2514,7 @@ describe('SDK-to-HPM', function () {
     page1 = new page.Page(report, 'xyz');
     visual1 = new visualDescriptor.VisualDescriptor(page1, 'uvw', 'title', 'type', {});
     uniqueId = report.config.uniqueId;
+    sdkSessionId = powerbi.getSdkSessionId();
     createUniqueId = create.config.uniqueId;
     dashboardUniqueId = dashboard.config.uniqueId;
     visualUniqueId = embeddedVisual.config.uniqueId;
@@ -2567,7 +2569,7 @@ describe('SDK-to-HPM', function () {
         report.load(testData.loadConfiguration);
 
         // Assert
-        expect(spyHpm.post).toHaveBeenCalledWith('/report/load', testData.loadConfiguration, { uid: uniqueId }, iframe.contentWindow);
+        expect(spyHpm.post).toHaveBeenCalledWith('/report/load', testData.loadConfiguration, { uid: uniqueId, sdkSessionId: sdkSessionId }, iframe.contentWindow);
       });
 
       it('report.load() returns promise that rejects with validation error if the load configuration is invalid', function (done) {
@@ -2589,7 +2591,7 @@ describe('SDK-to-HPM', function () {
         // Act
         report.load(testData.loadConfiguration)
           .catch(error => {
-            expect(spyHpm.post).toHaveBeenCalledWith('/report/load', testData.loadConfiguration, { uid: uniqueId }, iframe.contentWindow);
+            expect(spyHpm.post).toHaveBeenCalledWith('/report/load', testData.loadConfiguration, { uid: uniqueId, sdkSessionId: sdkSessionId }, iframe.contentWindow);
             expect(error).toEqual(testData.errorResponse.body);
             // Assert
             done();
@@ -2613,7 +2615,7 @@ describe('SDK-to-HPM', function () {
         // Act
         report.load(testData.loadConfiguration)
           .then(response => {
-            expect(spyHpm.post).toHaveBeenCalledWith('/report/load', testData.loadConfiguration, { uid: uniqueId }, iframe.contentWindow);
+            expect(spyHpm.post).toHaveBeenCalledWith('/report/load', testData.loadConfiguration, { uid: uniqueId, sdkSessionId: sdkSessionId }, iframe.contentWindow);
             expect(response).toEqual(null);
             // Assert
             done();
@@ -2709,7 +2711,7 @@ describe('SDK-to-HPM', function () {
         let spyArgs = spyHpm.post.calls.mostRecent().args;
         expect(spyArgs[0]).toEqual('/report/load');
         expect(spyArgs[1]).toEqual(expectedConfiguration);
-        expect(spyArgs[2]).toEqual({ uid: visualUniqueId });
+        expect(spyArgs[2]).toEqual({ uid: visualUniqueId, sdkSessionId: sdkSessionId });
         expect(spyArgs[3]).toEqual(visualFrame.contentWindow);
       });
 
@@ -3167,7 +3169,7 @@ describe('SDK-to-HPM', function () {
             report.reload();
 
             // Assert
-            expect(spyHpm.post).toHaveBeenCalledWith('/report/load', jasmine.objectContaining(testData.loadConfiguration), { uid: uniqueId }, iframe.contentWindow);
+            expect(spyHpm.post).toHaveBeenCalledWith('/report/load', jasmine.objectContaining(testData.loadConfiguration), { uid: uniqueId, sdkSessionId: sdkSessionId }, iframe.contentWindow);
           });
       });
     });
@@ -3274,7 +3276,7 @@ describe('SDK-to-HPM', function () {
         create.createReport(testData.createConfiguration);
 
         // Assert
-        expect(spyHpm.post).toHaveBeenCalledWith('/report/create', testData.createConfiguration, { uid: createUniqueId }, createIframe.contentWindow);
+        expect(spyHpm.post).toHaveBeenCalledWith('/report/create', testData.createConfiguration, { uid: createUniqueId, sdkSessionId: sdkSessionId }, createIframe.contentWindow);
       });
 
       it('create.createReport() returns promise that rejects with validation error if the create configuration is invalid', function (done) {
@@ -3296,7 +3298,7 @@ describe('SDK-to-HPM', function () {
         // Act
         create.createReport(testData.createConfiguration)
           .catch(error => {
-            expect(spyHpm.post).toHaveBeenCalledWith('/report/create', testData.createConfiguration, { uid: createUniqueId }, createIframe.contentWindow);
+            expect(spyHpm.post).toHaveBeenCalledWith('/report/create', testData.createConfiguration, { uid: createUniqueId, sdkSessionId: sdkSessionId }, createIframe.contentWindow);
             expect(error).toEqual(testData.errorResponse.body);
             // Assert
             done();
@@ -3320,7 +3322,7 @@ describe('SDK-to-HPM', function () {
         // Act
         create.createReport(testData.createConfiguration)
           .then(response => {
-            expect(spyHpm.post).toHaveBeenCalledWith('/report/create', testData.createConfiguration, { uid: createUniqueId }, createIframe.contentWindow);
+            expect(spyHpm.post).toHaveBeenCalledWith('/report/create', testData.createConfiguration, { uid: createUniqueId, sdkSessionId: sdkSessionId }, createIframe.contentWindow);
             expect(response).toEqual(null);
             // Assert
             done();
@@ -3350,7 +3352,7 @@ describe('SDK-to-HPM', function () {
         dashboard.load(testData.loadConfiguration);
 
         // Assert
-        expect(spyHpm.post).toHaveBeenCalledWith('/dashboard/load', testData.loadConfiguration, { uid: dashboardUniqueId }, dashboardIframe.contentWindow);
+        expect(spyHpm.post).toHaveBeenCalledWith('/dashboard/load', testData.loadConfiguration, { uid: dashboardUniqueId, sdkSessionId: sdkSessionId }, dashboardIframe.contentWindow);
       });
     });
   });