Merge pull request #49 from Microsoft/merge_master

0.11.2 - Add Token Type

package.json

@@ -1,6 +1,6 @@
 {
   "name": "powerbi-models",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Contains JavaScript & TypeScript object models for Microsoft Power BI JavaScript SDK. For each model there is a TypeScript interface, a json schema definitions, and a validation function to ensure and object is valid.",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",
@@ -56,7 +56,7 @@
     "ts-loader": "^0.8.2",
     "tslint": "^3.14.0",
     "typedoc": "^0.4.4",
-    "typescript": "^1.8.10",
+    "typescript": "^2.2.1",
     "typings": "^1.3.2",
     "webpack": "^1.13.2",
     "webpack-stream": "^3.2.0",

src/models.ts

@@ -82,6 +82,7 @@ export interface IReportLoadConfiguration {
   filters?: (IBasicFilter | IAdvancedFilter)[];
   permissions?: Permissions;
   viewMode?: ViewMode;
+  tokenType?: TokenType;
 }
 
 export const validateReportLoad = validate(loadSchema, {
@@ -96,6 +97,7 @@ export interface IReportCreateConfiguration {
    accessToken: string;
    datasetId: string;
    settings?: ISettings;
+   tokenType?: TokenType;
  }
 
 export const validateCreateReport = validate(createReportSchema);
@@ -106,6 +108,7 @@ export interface IDashboardLoadConfiguration {
     accessToken: string;
     id: string;
     pageView?: PageView;
+    tokenType?: TokenType;
 }
 
 export const validateDashboardLoad = validate(dashboardLoadSchema);
@@ -447,6 +450,11 @@ export enum ViewMode {
   Edit
 }
 
+export enum TokenType {
+  Aad,
+  Embed
+}
+
 export interface ISaveAsParameters {
   name: string;
 }

src/schemas/dashboardLoadConfiguration.json

@@ -21,7 +21,13 @@
       "messages": {
         "type": "pageView must be a string with one of the following values: \"actualSize\", \"fitToWidth\", \"oneColumn\""
       }
-    }
+    },
+    "tokenType": {
+      "type": "number",
+      "enum": [0, 1],
+      "default": 0,
+      "invalidMessage": "tokenType property is invalid"
+     }
   },
   "required": [
     "accessToken",

src/schemas/reportCreateConfiguration.json

@@ -15,6 +15,12 @@
          "type": "datasetId must be a string",
          "required": "datasetId is required"
        }
+     },
+     "tokenType": {
+      "type": "number",
+      "enum": [0, 1],
+      "default": 0,
+      "invalidMessage": "tokenType property is invalid"
      }
    },
    "required": [

src/schemas/reportLoadConfiguration.json

@@ -51,6 +51,12 @@
       "enum": [0, 1],
       "default": 0,
       "invalidMessage": "viewMode property is invalid"
+    },
+    "tokenType": {
+      "type": "number",
+      "enum": [0, 1],
+      "default": 0,
+      "invalidMessage": "tokenType property is invalid"
     }
   },
   "required": [