Renamed msalInstance as msalApplication

Author: muthurathinam-m

README.md

@@ -80,9 +80,9 @@ const graphScopes = ["user.read", "mail.send"]; // An array of graph scopes
 
 // Important Note: This library implements loginPopup and acquireTokenPopup flow, remember this while initializing the msal
 // Initialize the MSAL @see https://github.com/AzureAD/microsoft-authentication-library-for-js#1-instantiate-the-useragentapplication
-const msalInstance = new Msal.UserAgentApplication(msalConfig);
+const msalApplication = new Msal.UserAgentApplication(msalConfig);
 const options = new MicrosoftGraph.MSALAuthenticationProviderOptions(graphScopes);
-const authProvider = new MicrosoftGraph.ImplicitMSALAuthenticationProvider(msalInstance, options);
+const authProvider = new MicrosoftGraph.ImplicitMSALAuthenticationProvider(msalApplication, options);
 ```
 
 #### Creating an instance of ImplicitMSALAuthenticationProvider in node environment
@@ -109,9 +109,9 @@ const graphScopes = ["user.read", "mail.send"]; // An array of graph scopes
 
 // Important Note: This library implements loginPopup and acquireTokenPopup flow, remember this while initializing the msal
 // Initialize the MSAL @see https://github.com/AzureAD/microsoft-authentication-library-for-js#1-instantiate-the-useragentapplication
-const msalInstance = new UserAgentApplication(msalConfig);
+const msalApplication = new UserAgentApplication(msalConfig);
 const options = new MicrosoftGraph.MSALAuthenticationProviderOptions(graphScopes);
-const authProvider = new ImplicitMSALAuthenticationProvider(msalInstance, options);
+const authProvider = new ImplicitMSALAuthenticationProvider(msalApplication, options);
 ```
 
 User can integrate own preferred authentication library by implementing `IAuthenticationProvider` interface. Refer implementing [Custom Authentication Provider](./docs/CustomAuthenticationProvider.md).

docs/CreatingClientInstance.md

@@ -24,10 +24,10 @@ const msalConfig = {
 
 // Important Note: This library implements loginPopup and acquireTokenPopup flow, remember this while initializing the msal
 // Initialize the MSAL @see https://github.com/AzureAD/microsoft-authentication-library-for-js#1-instantiate-the-useragentapplication
-const msalInstance = new UserAgentApplication(msalConfig);
+const msalApplication = new UserAgentApplication(msalConfig);
 const options = new MicrosoftGraph.MSALAuthenticationProviderOptions(<SCOPES>); // An array of graph scopes
 let clientOptions: ClientOptions = {
-    authProvider: new ImplicitMSALAuthenticationProvider(msalInstance, options)
+    authProvider: new ImplicitMSALAuthenticationProvider(msalApplication, options)
 };
 const client = Client.initWithMiddleware(clientOptions);
 ```

samples/browser/src/main.js

@@ -16,9 +16,9 @@ const init = async () => {
 		},
 	};
 
-	var msalInstance = new Msal.UserAgentApplication(msalConfig);
+	var msalApplication = new Msal.UserAgentApplication(msalConfig);
 	const msalOptions = new MicrosoftGraph.MSALAuthenticationProviderOptions(scopes);
-	const msalProvider = new MicrosoftGraph.ImplicitMSALAuthenticationProvider(msalInstance, msalOptions);
+	const msalProvider = new MicrosoftGraph.ImplicitMSALAuthenticationProvider(msalApplication, msalOptions);
 	client = MicrosoftGraph.Client.initWithMiddleware({
 		debugLogging: true,
 		authProvider: msalProvider,

src/ImplicitMSALAuthenticationProvider.ts

@@ -31,19 +31,19 @@ export class ImplicitMSALAuthenticationProvider implements AuthenticationProvide
 	 * @private
 	 * A member holding an instance of MSAL UserAgentApplication
 	 */
-	private msalInstance: UserAgentApplication;
+	private msalApplication: UserAgentApplication;
 
 	/**
 	 * @public
 	 * @constructor
 	 * Creates an instance of ImplicitMSALAuthenticationProvider
-	 * @param {UserAgentApplication} msalInstance - An instance of MSAL UserAgentApplication
+	 * @param {UserAgentApplication} msalApplication - An instance of MSAL UserAgentApplication
 	 * @param {MSALAuthenticationProviderOptions} options - An instance of MSALAuthenticationProviderOptions
 	 * @returns An instance of ImplicitMSALAuthenticationProvider
 	 */
-	public constructor(msalInstance: UserAgentApplication, options: MSALAuthenticationProviderOptions) {
+	public constructor(msalApplication: UserAgentApplication, options: MSALAuthenticationProviderOptions) {
 		this.options = options;
-		this.msalInstance = msalInstance;
+		this.msalApplication = msalApplication;
 	}
 
 	/**
@@ -68,17 +68,17 @@ export class ImplicitMSALAuthenticationProvider implements AuthenticationProvide
 			error.message = "Scopes cannot be empty, Please provide a scopes";
 			throw error;
 		}
-		if (this.msalInstance.getAccount()) {
+		if (this.msalApplication.getAccount()) {
 			const tokenRequest: AuthenticationParameters = {
 				scopes,
 			};
 			try {
-				const authResponse: AuthResponse = await this.msalInstance.acquireTokenSilent(tokenRequest);
+				const authResponse: AuthResponse = await this.msalApplication.acquireTokenSilent(tokenRequest);
 				return authResponse.accessToken;
 			} catch (error) {
 				if (error instanceof InteractionRequiredAuthError) {
 					try {
-						const authResponse: AuthResponse = await this.msalInstance.acquireTokenPopup(tokenRequest);
+						const authResponse: AuthResponse = await this.msalApplication.acquireTokenPopup(tokenRequest);
 						return authResponse.accessToken;
 					} catch (error) {
 						throw error;
@@ -90,8 +90,8 @@ export class ImplicitMSALAuthenticationProvider implements AuthenticationProvide
 				const tokenRequest: AuthenticationParameters = {
 					scopes,
 				};
-				await this.msalInstance.loginPopup(tokenRequest);
-				const authResponse: AuthResponse = await this.msalInstance.acquireTokenSilent(tokenRequest);
+				await this.msalApplication.loginPopup(tokenRequest);
+				const authResponse: AuthResponse = await this.msalApplication.acquireTokenSilent(tokenRequest);
 				return authResponse.accessToken;
 			} catch (error) {
 				throw error;

src/browser/ImplicitMSALAuthenticationProvider.ts

@@ -35,19 +35,19 @@ export class ImplicitMSALAuthenticationProvider implements AuthenticationProvide
 	 * @private
 	 * A member holding an instance of MSAL
 	 */
-	private msalInstance: any;
+	private msalApplication: any;
 
 	/**
 	 * @public
 	 * @constructor
 	 * Creates an instance of ImplicitMSALAuthenticationProvider
-	 * @param {any} msalInstance - An instance of MSAL UserAgentApplication
+	 * @param {any} msalApplication - An instance of MSAL UserAgentApplication
 	 * @param {MSALAuthenticationProviderOptions} options - An instance of MSALAuthenticationProviderOptions
 	 * @returns An instance of ImplicitMSALAuthenticationProvider
 	 */
-	public constructor(msalInstance: any, options: MSALAuthenticationProviderOptions) {
+	public constructor(msalApplication: any, options: MSALAuthenticationProviderOptions) {
 		this.options = options;
-		this.msalInstance = msalInstance;
+		this.msalApplication = msalApplication;
 	}
 
 	/**
@@ -73,17 +73,17 @@ export class ImplicitMSALAuthenticationProvider implements AuthenticationProvide
 			throw error;
 		}
 
-		if (this.msalInstance.getAccount()) {
+		if (this.msalApplication.getAccount()) {
 			const tokenRequest = {
 				scopes,
 			};
 			try {
-				const authResponse = await this.msalInstance.acquireTokenSilent(tokenRequest);
+				const authResponse = await this.msalApplication.acquireTokenSilent(tokenRequest);
 				return authResponse.accessToken;
 			} catch (error) {
 				if (error.name === "InteractionRequiredAuthError") {
 					try {
-						const authResponse = await this.msalInstance.acquireTokenPopup(tokenRequest);
+						const authResponse = await this.msalApplication.acquireTokenPopup(tokenRequest);
 						return authResponse.accessToken;
 					} catch (error) {
 						throw error;
@@ -95,8 +95,8 @@ export class ImplicitMSALAuthenticationProvider implements AuthenticationProvide
 				const tokenRequest = {
 					scopes,
 				};
-				await this.msalInstance.loginPopup(tokenRequest);
-				const authResponse = await this.msalInstance.acquireTokenSilent(tokenRequest);
+				await this.msalApplication.loginPopup(tokenRequest);
+				const authResponse = await this.msalApplication.acquireTokenSilent(tokenRequest);
 				return authResponse.accessToken;
 			} catch (error) {
 				throw error;