Merge branch 'dev' into Bug_Fixes

Author: muthurathinam

README.md

@@ -60,13 +60,17 @@ Refer devDependencies in [package.json](./package.json) for the compatible msal
 ```
 
 ```typescript
-const clientID = "your_client_id"; // Client Id of the registered application
-const graphScopes = ["user.read", "mail.send"]; // An array of graph scopes
+const clientId = "your_client_id"; // Client Id of the registered application
+const callback = (errorDesc, token, error, tokenType) => {};
+// An Optional options for initializing the MSAL @see https://github.com/AzureAD/microsoft-authentication-library-for-js/wiki/MSAL-basics#configuration-options
 const options = {
-	// An Optional options for initializing the MSAL @see https://github.com/AzureAD/microsoft-authentication-library-for-js/wiki/MSAL-basics#configuration-options
 	redirectUri: "Your redirect URI",
 };
-const authProvider = new MicrosoftGraph.MSALAuthenticationProvider(clientId, graphScopes, options);
+const graphScopes = ["user.read", "mail.send"]; // An array of graph scopes
+
+// Initialize the MSAL @see https://github.com/AzureAD/microsoft-authentication-library-for-js/wiki/MSAL-basics#initialization-of-msal
+const userAgentApplication = new Msal.UserAgentApplication(clientId, undefined, callback, options);
+const authProvider = new MicrosoftGraph.MSALAuthenticationProvider(userAgentApplication, graphScopes);
 ```
 
 #### Creating an instance of MSALAuthenticationProvider in node environment
@@ -78,15 +82,21 @@ npm install msal@<version>
 ```
 
 ```typescript
+import { UserAgentApplication } from "msal";
+
 import { MSALAuthenticationProvider } from "./node_modules/@microsoft/microsoft-graph-client/lib/src/MSALAuthenticationProvider";
 
 const clientId = "your_client_id"; // Client Id of the registered application
-const graphScopes = ["user.read", "mail.send"]; // An array of graph scopes
+const callback = (errorDesc, token, error, tokenType) => {};
+// An Optional options for initializing the MSAL @see https://github.com/AzureAD/microsoft-authentication-library-for-js/wiki/MSAL-basics#configuration-options
 const options = {
-	// An Optional options for initializing the MSAL @see https://github.com/AzureAD/microsoft-authentication-library-for-js/wiki/MSAL-basics#configuration-options
 	redirectUri: "Your redirect URI",
 };
-const authProvider = new MSALAuthenticationProvider(clientId, scopes, options);
+const graphScopes = ["user.read", "mail.send"]; // An array of graph scopes
+
+// Initialize the MSAL @see https://github.com/AzureAD/microsoft-authentication-library-for-js/wiki/MSAL-basics#initialization-of-msal
+const userAgentApplication = new UserAgentApplication(clientId, undefined, callback, options);
+const authProvider = new MSALAuthenticationProvider(userAgentApplication, scopes);
 ```
 
 User can integrate own preferred authentication library by implementing `IAuthenticationProvider` interface. Refer implementing [Custom Authentication Provider](./docs/CustomAuthenticationProvider.md).

samples/browser/src/main.js

@@ -10,9 +10,12 @@ let client, scopes;
 const init = async () => {
 	scopes = ["user.read", "profile", "User.ReadWrite", "User.Readwrite.All", "User.Invite.All", "contacts.read", "Notes.ReadWrite", "Notes.Read", "Notes.Create", "Files.Read", "Files.Read.All", "Files.ReadWrite", "Files.ReadWrite.All", "Mail.Read", "Mail.ReadWrite", "Mail.Send"];
 
-	let msalProvider = new MicrosoftGraph.MSALAuthenticationProvider(Secrets.clientId, scopes, {
+	const callback = (errorDesc, token, error, tokenType) => {};
+	const options = {
 		redirectUri: "http://localhost:8080",
-	});
+	};
+	const userAgentApplication = new Msal.UserAgentApplication(Secrets.clientId, undefined, callback, options);
+	let msalProvider = new MicrosoftGraph.MSALAuthenticationProvider(userAgentApplication, scopes);
 	client = new MicrosoftGraph.Client({
 		debugLogging: true,
 		authProvider: msalProvider,

src/MSALAuthenticationProvider.ts

@@ -21,38 +21,31 @@ import { MSALAuthenticationProviderOptions } from "./MSALAuthenticationProviderO
  * @extends AuthenticationProvider
  */
 export class MSALAuthenticationProvider implements AuthenticationProvider {
-	/**
-	 * @private
-	 * A member holding the clientId of an application
-	 */
-	private clientId: string;
-
 	/**
 	 * @private
 	 * A member holding the list of graph scopes
 	 */
 	private scopes: string[];
 
 	/**
-	 * @private
+	 * @public
 	 * A member holding an instance of UserAgentApplication returned from MSAL
 	 */
-	private userAgentApplication: UserAgentApplication;
+	public userAgentApplication: UserAgentApplication;
 
 	/**
 	 * @public
 	 * @constructor
 	 * Creates an instance of MSALAuthenticationProvider
-	 * @param {string} clientId - The clientId value of an application
+	 * @param {string | UserAgentApplication} clientIdOrUserAgentApplication - The clientId value of an application or an instance of UserAgentApplication
 	 * @param {string[]} scopes - An array of graph scopes
 	 * @param {any} [options] - An options object for MSAL initialization
 	 * @returns An instance of MSALAuthenticationProvider
 	 */
-	public constructor(clientId: string, scopes: string[], options?: any) {
+	public constructor(clientIdOrUserAgentApplication: string | UserAgentApplication, scopes: string[], options?: any) {
 		const callback = (errorDesc, token, error, tokenType) => {}; // tslint:disable-line: no-empty
-		this.clientId = clientId;
 		this.scopes = scopes;
-		this.userAgentApplication = new UserAgentApplication(this.clientId, undefined, callback, options);
+		this.userAgentApplication = typeof clientIdOrUserAgentApplication === "string" ? new UserAgentApplication(clientIdOrUserAgentApplication, undefined, callback, options) : clientIdOrUserAgentApplication;
 	}
 
 	/**

src/browser/MSALAuthenticationProvider.ts

@@ -25,40 +25,33 @@ declare const Msal: any;
  * @extends AuthenticationProvider
  */
 export class MSALAuthenticationProvider implements AuthenticationProvider {
-	/**
-	 * @private
-	 * A member holding the clientId of an application
-	 */
-	private clientId: string;
-
 	/**
 	 * @private
 	 * A member holding the list of graph scopes
 	 */
 	private scopes: string[];
 
 	/**
-	 * @private
+	 * @public
 	 * A member holding an instance of UserAgentApplication returned from MSAL
 	 */
-	private userAgentApplication: any;
+	public userAgentApplication: any;
 
 	/**
 	 * @public
 	 * @constructor
 	 * Creates an instance of MSALAuthenticationProvider
-	 * @param {string} clientId - The clientId value of an application
+	 * @param {string | any} clientIdOrUserAgentApplication - The clientId value of an application or an instance of UserAgentApplication
 	 * @param {string[]} scopes - An array of graph scopes
 	 * @param {any} [options] - An options object for MSAL initialization
 	 * @returns An instance of MSALAuthenticationProvider
 	 */
-	public constructor(clientId: string, scopes: string[], options?: any) {
+	public constructor(clientIdOrUserAgentApplication: string | any, scopes: string[], options?: any) {
 		const callback = (errorDesc, token, error, tokenType) => {
 			// tslint:disable-line: no-empty
 		};
-		this.clientId = clientId;
 		this.scopes = scopes;
-		this.userAgentApplication = new Msal.UserAgentApplication(this.clientId, undefined, callback, options);
+		this.userAgentApplication = typeof clientIdOrUserAgentApplication === "string" ? new Msal.UserAgentApplication(clientIdOrUserAgentApplication, undefined, callback, options) : clientIdOrUserAgentApplication;
 	}
 
 	/**