Update release/latest to v1.3.5 (#665)

shweaver-MSFT · web-flow · commit 1e82d23b3c1a · 2020-09-30T17:03:52.000-07:00
* Updated to version 1.3.5 * Integrating changes from #609 * Update package-lock.json
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,4 @@
 {
-  "packages": [
-    "packages/mgt"
-  ],
-  "version": "1.3.3"
+  "packages": ["packages/mgt"],
+  "version": "1.3.5"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/mgt/package-lock.json b/packages/mgt/package-lock.json
diff --git a/packages/mgt/package.json b/packages/mgt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/mgt",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "The Microsoft Graph Toolkit",
   "keywords": [
     "microsoft graph",
@@ -54,6 +54,23 @@
     "msal": "^1.3.2",
     "office-ui-fabric-core": "11.0.0"
   },
+  "devDependencies": {
+    "cpx": "1.5.0",
+    "shx": "0.3.2",
+    "npm-run-all": "4.1.5",
+    "tslint": "6.1.3",
+    "@webcomponents/webcomponentsjs": "2.4.4",
+    "rollup": "^1.29.1",
+    "rollup-plugin-babel": "^4.3.3",
+    "rollup-plugin-babel-minify": "^9.1.1",
+    "rollup-plugin-commonjs": "^10.1.0",
+    "rollup-plugin-json": "^4.0.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-postcss": "^2.5.0",
+    "rollup-plugin-terser": "^5.2.0",
+    "rollup-plugin-typescript": "^1.0.1",
+    "es-dev-server": "1.57.5"
+  },
   "jest-junit": {
     "suiteName": "jest tests",
     "output": "testResults/junit.xml",
diff --git a/packages/mgt/src/components/mgt-login/mgt-login.ts b/packages/mgt/src/components/mgt-login/mgt-login.ts
@@ -178,6 +178,8 @@ export class MgtLogin extends MgtTemplatedComponent {
         if (this.userDetails.personImage) {
           this._image = this.userDetails.personImage;
         }
+
+        this.fireCustomEvent('loginCompleted');
       } else {
         this.userDetails = null;
       }
diff --git a/packages/mgt/src/components/mgt-tasks/mgt-tasks.ts b/packages/mgt/src/components/mgt-tasks/mgt-tasks.ts
@@ -653,7 +653,7 @@ export class MgtTasks extends MgtTemplatedComponent {
     this._hiddenTasks = this._hiddenTasks.filter(id => id !== task.id);
   }
 
-  private async assignPeople(task: ITask, people: Array<User | Person | Contact>) {
+  private async assignPeople(task: ITask, people: (User | Person | Contact)[]) {
     const ts = this.getTaskSource();
     if (!ts) {
       return;
diff --git a/packages/mgt/src/graph/graph.people.ts b/packages/mgt/src/graph/graph.people.ts
@@ -151,7 +151,7 @@ export async function findContactByEmail(graph: IGraph, email: string): Promise<
  * @returns {(Promise<Array<Person | Contact>>)}
  * @memberof Graph
  */
-export function findUserByEmail(graph: IGraph, email: string): Promise<Array<Person | Contact>> {
+export function findUserByEmail(graph: IGraph, email: string): Promise<(Person | Contact)[]> {
   return Promise.all([findPeople(graph, email), findContactByEmail(graph, email)]).then(([people, contacts]) => {
     return ((people as any[]) || []).concat(contacts || []);
   });
diff --git a/packages/mgt/src/utils/EventDispatcher.ts b/packages/mgt/src/utils/EventDispatcher.ts
@@ -18,7 +18,7 @@ export type EventHandler<E> = (event: E) => void;
  * @template E
  */
 export class EventDispatcher<E> {
-  private eventHandlers: Array<EventHandler<E>> = [];
+  private eventHandlers: EventHandler<E>[] = [];
   /**
    * fires event handler
    *
diff --git a/packages/mgt/src/utils/version.ts b/packages/mgt/src/utils/version.ts
@@ -8,4 +8,4 @@
 // THIS FILE IS AUTO GENERATED
 // ANY CHANGES WILL BE LOST DURING BUILD
 
-export const PACKAGE_VERSION = '1.3.4';
+export const PACKAGE_VERSION = '1.3.5';
diff --git a/samples/examples/login-popup.html b/samples/examples/login-popup.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<script type="module" src="../../packages/mgt/dist/es6/index.js"></script>
+</head>
+
+<body>
+	<!-- <mgt-msal-provider client-id="af4ad92c-e141-49ac-9d86-23af45007101"></mgt-msal-provider> -->
+
+	<mgt-login></mgt-login>
+
+	<div id="loginStatus" style="padding-top: 20px">
+	</div>
+
+	<script type="module">
+		import { Providers, ProviderState, MsalProvider, LoginType } from '../../packages/mgt/dist/es6/index.js';
+
+		Providers.globalProvider = new MsalProvider({
+			clientId: 'af4ad92c-e141-49ac-9d86-23af45007101',
+			loginType: LoginType.Popup
+		});
+
+		document.querySelector('mgt-login').addEventListener('loginCompleted', e => {
+			console.log(e);
+			document.getElementById('loginStatus').innerText = "Login completed successfully";
+		});
+	</script>
+
+</html>
diff --git a/samples/examples/login-redirect-nopopup.html b/samples/examples/login-redirect-nopopup.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<script type="module" src="../../packages/mgt/dist/es6/index.js"></script>
+</head>
+
+<body>
+	<mgt-msal-provider client-id="af4ad92c-e141-49ac-9d86-23af45007101"></mgt-msal-provider>
+
+	<mgt-login></mgt-login>
+
+	<div id="loginStatus" style="padding-top: 20px">
+	</div>
+
+	<script type="module">
+		import { Providers, ProviderState } from '../../packages/mgt/dist/es6/index.js';
+
+		document.querySelector('mgt-login').addEventListener('loginCompleted', e => {
+			console.log(e);
+			document.getElementById('loginStatus').innerText = "Login completed successfully";
+		});
+	</script>
+
+</html>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`{`
`2`		`- "packages": [`
`3`		`- "packages/mgt"`
`4`		`- ],`
`5`		`- "version": "1.3.3"`
	`2`	`+ "packages": ["packages/mgt"],`
	`3`	`+ "version": "1.3.5"`
`6`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,8 @@ export class MgtLogin extends MgtTemplatedComponent {`
`178`	`178`	`if (this.userDetails.personImage) {`
`179`	`179`	`this._image = this.userDetails.personImage;`
`180`	`180`	`}`
	`181`	`+`
	`182`	`+ this.fireCustomEvent('loginCompleted');`
`181`	`183`	`} else {`
`182`	`184`	`this.userDetails = null;`
`183`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ export class MgtTasks extends MgtTemplatedComponent {`
`653`	`653`	`this._hiddenTasks = this._hiddenTasks.filter(id => id !== task.id);`
`654`	`654`	`}`
`655`	`655`
`656`		`- private async assignPeople(task: ITask, people: Array<User \| Person \| Contact>) {`
	`656`	`+ private async assignPeople(task: ITask, people: (User \| Person \| Contact)[]) {`
`657`	`657`	`const ts = this.getTaskSource();`
`658`	`658`	`if (!ts) {`
`659`	`659`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export type EventHandler<E> = (event: E) => void;`
`18`	`18`	`* @template E`
`19`	`19`	`*/`
`20`	`20`	`export class EventDispatcher<E> {`
`21`		`- private eventHandlers: Array<EventHandler<E>> = [];`
	`21`	`+ private eventHandlers: EventHandler<E>[] = [];`
`22`	`22`	`/**`
`23`	`23`	`* fires event handler`
`24`	`24`	`*`