From f046aaec80a844441d74a114b8a4612933cbbb9a Mon Sep 17 00:00:00 2001
From: "fabio.conceicao" <fabio.conceicao@unilever.com>
Date: Fri, 23 Oct 2020 10:13:08 -0300
Subject: [PATCH 1/9] log android

---
 example/.flutter-plugins-dependencies | 1 +
 example/android/app/build.gradle      | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 example/.flutter-plugins-dependencies

diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
new file mode 100644
index 0000000..766e329
--- /dev/null
+++ b/example/.flutter-plugins-dependencies
@@ -0,0 +1 @@
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2020-10-23 10:04:04.250779","version":"1.20.2"}
\ No newline at end of file
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index b06baf9..a8a8570 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -50,6 +50,8 @@ android {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
+            buildConfigField "boolean", 'IS_PRINT_LOG', "false"
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.debug
         }
     }

From bef0ed725e6519e02eb5b8ca89b268569199e3d2 Mon Sep 17 00:00:00 2001
From: "fabio.conceicao" <fabio.conceicao@unilever.com>
Date: Mon, 26 Oct 2020 07:21:11 -0300
Subject: [PATCH 2/9] add buildTypes

---
 android/build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/android/build.gradle b/android/build.gradle
index a844df8..ab01a23 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -39,6 +39,13 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
+
+    buildTypes {
+        release {
+            buildConfigField "boolean", 'IS_PRINT_LOG', "false"
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
 }
 
 dependencies {

From 0e30134f68b78d039bb10436dddd282f6f3a69d8 Mon Sep 17 00:00:00 2001
From: "fabio.conceicao" <fabio.conceicao@unilever.com>
Date: Mon, 26 Oct 2020 07:52:35 -0300
Subject: [PATCH 3/9] lod.d

---
 .../moodio/msal_flutter/MsalFlutterPlugin.kt  | 52 +++++++++----------
 example/.flutter-plugins-dependencies         |  2 +-
 .../ios/Flutter/flutter_export_environment.sh | 11 ++--
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt b/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt
index c52dd26..389c394 100644
--- a/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt
+++ b/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt
@@ -27,7 +27,7 @@ class MsalFlutterPlugin: MethodCallHandler {
 
         @JvmStatic
         fun registerWith(registrar: Registrar) {
-            Log.d("MsalFlutter","Registering plugin")
+           // Log.d("MsalFlutter","Registering plugin")
             val channel = MethodChannel(registrar.messenger(), "msal_flutter")
             channel.setMethodCallHandler(MsalFlutterPlugin())
             mainActivity = registrar.activity()
@@ -35,11 +35,11 @@ class MsalFlutterPlugin: MethodCallHandler {
 
         fun getAuthCallback(result: Result) : AuthenticationCallback
         {
-            Log.d("MsalFlutter", "Getting the auth callback object")
+           // Log.d("MsalFlutter", "Getting the auth callback object")
             return object : AuthenticationCallback
             {
                 override fun onSuccess(authenticationResult : IAuthenticationResult){
-                    Log.d("MsalFlutter", "Authentication successful")
+                //    Log.d("MsalFlutter", "Authentication successful")
                     Handler(Looper.getMainLooper()).post {
                         result.success(authenticationResult.accessToken)
                     }
@@ -47,15 +47,15 @@ class MsalFlutterPlugin: MethodCallHandler {
 
                 override fun onError(exception : MsalException)
                 {
-                    Log.d("MsalFlutter","Error logging in!")
-                    Log.d("MsalFlutter", exception.message)
+                   // Log.d("MsalFlutter","Error logging in!")
+                   // Log.d("MsalFlutter", exception.message)
                     Handler(Looper.getMainLooper()).post {
                         result.error("AUTH_ERROR", "Authentication failed", exception.localizedMessage)
                     }
                 }
 
                 override fun onCancel(){
-                    Log.d("MsalFlutter", "Cancelled")
+                  //  Log.d("MsalFlutter", "Cancelled")
                     Handler(Looper.getMainLooper()).post {
                         result.error("CANCELLED", "User cancelled", null)
                     }
@@ -64,18 +64,18 @@ class MsalFlutterPlugin: MethodCallHandler {
         }
 
         private fun getApplicationCreatedListener(result: Result) : IPublicClientApplication.ApplicationCreatedListener {
-            Log.d("MsalFlutter", "Getting the created listener")
+           // Log.d("MsalFlutter", "Getting the created listener")
 
             return object : IPublicClientApplication.ApplicationCreatedListener
             {
                 override fun onCreated(application: IPublicClientApplication) {
-                    Log.d("MsalFlutter", "Created successfully")
+                   // Log.d("MsalFlutter", "Created successfully")
                     msalApp = application as MultipleAccountPublicClientApplication
                     result.success(true)
                 }
 
                 override fun onError(exception: MsalException?) {
-                    Log.d("MsalFlutter", "Initialize error")
+                   // Log.d("MsalFlutter", "Initialize error")
                     result.error("INIT_ERROR", "Error initializting client", exception?.localizedMessage)
                 }
             }
@@ -88,10 +88,10 @@ class MsalFlutterPlugin: MethodCallHandler {
         val scopes: Array<String>? = scopesArg?.toTypedArray()
         val clientId : String? = call.argument("clientId")
         val authority : String? = call.argument("authority")
-
-        Log.d("MsalFlutter","Got scopes: $scopes")
-        Log.d("MsalFlutter","Got cleintId: $clientId")
-        Log.d("MsalFlutter","Got authority: $authority")
+//
+//        Log.d("MsalFlutter","Got scopes: $scopes")
+//        Log.d("MsalFlutter","Got cleintId: $clientId")
+//        Log.d("MsalFlutter","Got authority: $authority")
 
         when(call.method){
             "logout" -> Thread(Runnable{logout(result)}).start()
@@ -105,11 +105,11 @@ class MsalFlutterPlugin: MethodCallHandler {
 
     private fun acquireToken(scopes : Array<String>?, result: Result)
     {
-        Log.d("MsalFlutter", "acquire token called")
+        //Log.d("MsalFlutter", "acquire token called")
 
         // check if client has been initialized
         if(!isClientInitialized()){
-            Log.d("MsalFlutter","Client has not been initialized")
+          //  Log.d("MsalFlutter","Client has not been initialized")
             Handler(Looper.getMainLooper()).post {
                 result.error("NO_CLIENT", "Client must be initialized before attempting to acquire a token.", null)
             }
@@ -117,14 +117,14 @@ class MsalFlutterPlugin: MethodCallHandler {
 
         //check scopes
         if(scopes == null){
-            Log.d("MsalFlutter", "no scope")
+          //  Log.d("MsalFlutter", "no scope")
             result.error("NO_SCOPE", "Call must include a scope", null)
             return
         }
 
         //remove old accounts
         while(msalApp.accounts.any()){
-            Log.d("MsalFlutter","Removing old account")
+           // Log.d("MsalFlutter","Removing old account")
             msalApp.removeAccount(msalApp.accounts.first())
         }
 
@@ -134,11 +134,11 @@ class MsalFlutterPlugin: MethodCallHandler {
 
     private fun acquireTokenSilent(scopes : Array<String>?, result: Result)
     {
-        Log.d("MsalFlutter", "Called acquire token silent")
+       // Log.d("MsalFlutter", "Called acquire token silent")
 
         // check if client has been initialized
         if(!isClientInitialized()){
-            Log.d("MsalFlutter","Client has not been initialized")
+           // Log.d("MsalFlutter","Client has not been initialized")
             Handler(Looper.getMainLooper()).post {
                 result.error("NO_CLIENT", "Client must be initialized before attempting to acquire a token.", null)
             }
@@ -146,7 +146,7 @@ class MsalFlutterPlugin: MethodCallHandler {
 
         //check the scopes
         if(scopes == null){
-            Log.d("MsalFlutter", "no scope")
+           // Log.d("MsalFlutter", "no scope")
             Handler(Looper.getMainLooper()).post {
                 result.error("NO_SCOPE", "Call must include a scope", null)
             }
@@ -172,14 +172,14 @@ class MsalFlutterPlugin: MethodCallHandler {
     {
         //ensure clientid provided
         if(clientId == null){
-            Log.d("MsalFlutter","error no clientId")
+           // Log.d("MsalFlutter","error no clientId")
             result.error("NO_CLIENTID", "Call must include a clientId", null)
             return
         }
 
         //if already initialized, ensure clientid hasn't changed
         if(isClientInitialized()){
-            Log.d("MsalFlutter","Client already initialized.")
+           // Log.d("MsalFlutter","Client already initialized.")
             if(msalApp.configuration.clientId == clientId)
             {
                 result.success(true)
@@ -190,11 +190,11 @@ class MsalFlutterPlugin: MethodCallHandler {
 
         // if authority is set, create client using it, otherwise use default
         if(authority != null){
-            Log.d("MsalFlutter", "Authority not null")
-            Log.d("MsalFlutter", "Creating with: $clientId - $authority")
+          //  Log.d("MsalFlutter", "Authority not null")
+         //   Log.d("MsalFlutter", "Creating with: $clientId - $authority")
             PublicClientApplication.create(mainActivity.applicationContext, clientId, authority, getApplicationCreatedListener(result))
         }else{
-            Log.d("MsalFlutter", "Authority null")
+          //  Log.d("MsalFlutter", "Authority null")
             PublicClientApplication.create(mainActivity.applicationContext, clientId, getApplicationCreatedListener(result))
         }
     }
@@ -202,7 +202,7 @@ class MsalFlutterPlugin: MethodCallHandler {
 
     private fun logout(result: Result){
         while(msalApp.accounts.any()){
-            Log.d("MsalFlutter","Removing old account")
+         //   Log.d("MsalFlutter","Removing old account")
             msalApp.removeAccount(msalApp.accounts.first())
         }
         Handler(Looper.getMainLooper()).post {
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
index 766e329..021bbbd 100644
--- a/example/.flutter-plugins-dependencies
+++ b/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2020-10-23 10:04:04.250779","version":"1.20.2"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2020-10-26 07:24:31.426833","version":"1.22.2"}
\ No newline at end of file
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
index 216902d..8eac4ab 100755
--- a/example/ios/Flutter/flutter_export_environment.sh
+++ b/example/ios/Flutter/flutter_export_environment.sh
@@ -1,10 +1,15 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/mahmoud/development/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/mahmoud/projects/46-msalflutter/example"
+export "FLUTTER_ROOT=/Users/fabioconceicao/Documents/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/fabioconceicao/Documents/Projetos/msal-flutter/example"
 export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build/ios"
-export "FLUTTER_FRAMEWORK_DIR=/Users/mahmoud/development/flutter/bin/cache/artifacts/engine/ios"
+export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
+export "FLUTTER_FRAMEWORK_DIR=/Users/fabioconceicao/Documents/flutter/bin/cache/artifacts/engine/ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1.0.0"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.packages"

From 370224148d9d6ab43bc3be63c8a09f4ceeb2fe98 Mon Sep 17 00:00:00 2001
From: "fabio.conceicao" <fabio.conceicao@unilever.com>
Date: Tue, 27 Oct 2020 08:55:13 -0300
Subject: [PATCH 4/9] teste v2 msal

---
 CHANGELOG.md                                  |   2 +-
 README.md                                     |  14 +-
 android/build.gradle                          |  18 +-
 .../moodio/msal_flutter/MsalFlutterPlugin.kt  | 132 +++------
 example/.flutter-plugins-dependencies         |   2 +-
 example/android/app/Keystore/debug.keystore   | Bin 0 -> 2106 bytes
 .../android/app/Keystore/julia_keystore.jks   | Bin 0 -> 2102 bytes
 example/android/app/build.gradle              |  24 +-
 .../android/app/src/main/AndroidManifest.xml  |   7 +-
 .../src/main/res/raw/msal_default_config.json | 262 +++++++++---------
 example/lib/main.dart                         |   4 +-
 lib/src/public_client_application.dart        |   3 +
 12 files changed, 229 insertions(+), 239 deletions(-)
 create mode 100644 example/android/app/Keystore/debug.keystore
 create mode 100644 example/android/app/Keystore/julia_keystore.jks

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcbf65a..6baa952 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.0.0+2
+# 1.0.0+2
 * Updates to readme in regards to kotlin static field issues.
 ## 1.0.0+1
 * Added some more information to readme for clarity
diff --git a/README.md b/README.md
index deb6bc3..8abfee0 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ e.g. `https://msalfluttertest.b2clogin.com/tfp/msalfluttertest.onmicrosoft.com/B
 
 For troubleshooting known bugs in the new build, please scroll down to the bottom of the page where all bugs and fixes we find will be noted.
 
-# MSAL Wrapper Library for Flutter
+## MSAL Wrapper Library for Flutter
 Please note this product is in very early alpha release and subject to change and bugs.
 
 The Microsoft Authentication Library Flutter Wrapper is a wrapper that uses that MSAL libraries for Android and IOS. Currently only the public client application functionality is supported, using the implicit workflow. 
@@ -37,6 +37,7 @@ This section is mostly copied and modified from [the official android MSAL libra
 ```
 <uses-permission android:name="android.permission.INTERNET"/>
 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
 ```
 
 2. In your AndroidManifest.xml file add the following intent filter, replacing the placeholder \<YOUR-CLIENT-ID\> for your azure b2c application's client id where indicated below. 
@@ -53,6 +54,7 @@ The default redirect url is msal\<YOUR-CLIENT-ID\>://auth however this can now b
             android:host="auth" />
     </intent-filter>
 </activity>
+
 ```
 
 3. Copy the [msal_default_config](https://raw.githubusercontent.com/moodio/msal-flutter/master/doc/templates/msal_default_config.json) from this repository (or make your own if you know what you're doing) and place it into your flutter apps android/src/main/res/raw folder.
@@ -80,6 +82,7 @@ This section is mostly copied and modified from Step 1 from [the official iOS MS
         </array>
     </dict>
 </array>
+
 ```
 
 2. Add LSApplicationQueriesSchemes to allow making call to Microsoft Authenticator if installed (For Authentication broker)
@@ -90,6 +93,7 @@ This section is mostly copied and modified from Step 1 from [the official iOS MS
 	<string>msauthv2</string>
 	<string>msauthv3</string>
 </array>
+
 ```
 
 3. Open the app's iOS project in xcode, click on the Runner app to open up the configuration, and under capabilities, expand Keychain Sharing and add the keychain group `com.microsoft.adalcache`
@@ -143,6 +147,7 @@ try{
 } on MsalException {
     //error handling logic here
 }
+
 ```
 
 4. Once a user has logged in atleast once, to retrieve a token silently call the acquireTokenSilent function, passing the scopes you wish to acquire the token for. Note that this function will throw an error on failure and should be surrounded by a try catch block as per the example below
@@ -184,6 +189,9 @@ try{
 
 # Trouble Shooting
 
-Please note there is currently an issue that seems to occur with Android which uses slightly older versions of kotlin.
-If you get the error when attemtping to acquire a token, along the lines of "static member msalApp not found", goto your app's android folder, open the build.gradle file, and on the second line change the version of kotlin from 1.3.10 to 1.3.50. For more information take a look at issue #4.
+Please note there is currently an issue that seems to occur with Android which uses slightly older
+ versions of kotlin.
+If you get the error when attemtping to acquire a token, along the lines of "static member msalApp 
+not found", goto your app's android folder, open the build.gradle file, and on the second line 
+change the version of kotlin from 1.3.10 to 1.3.50. For more information take a look at issue #4.
 A fix will be implemented shortly.
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index ab01a23..99099ce 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -18,6 +18,11 @@ rootProject.allprojects {
     repositories {
         google()
         jcenter()
+        mavenCentral()
+        mavenLocal()
+        maven {
+            url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1'
+        }
     }
 }
 
@@ -26,13 +31,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
+
     defaultConfig {
-        minSdkVersion 21
+        targetSdkVersion 30
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders = [msal_clientid: "5913dfb1-7576-451c-a7ea-a7c5a3f8682a"]
     }
@@ -40,15 +46,9 @@ android {
         disable 'InvalidPackage'
     }
 
-    buildTypes {
-        release {
-            buildConfigField "boolean", 'IS_PRINT_LOG', "false"
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.microsoft.identity.client:msal:1.0.+'
+    implementation 'com.microsoft.identity.client:msal:2.+'
 }
diff --git a/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt b/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt
index 389c394..ee409f4 100644
--- a/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt
+++ b/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt
@@ -4,58 +4,48 @@ import android.app.Activity
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import androidx.annotation.WorkerThread
+import com.microsoft.identity.client.*
+import com.microsoft.identity.client.IPublicClientApplication.IMultipleAccountApplicationCreatedListener
+import com.microsoft.identity.client.exception.MsalException
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
 import io.flutter.plugin.common.PluginRegistry.Registrar
-import com.microsoft.identity.client.*
-import com.microsoft.identity.client.exception.MsalException
-import com.microsoft.identity.client.IPublicClientApplication
-import com.microsoft.identity.client.PublicClientApplicationConfigurationFactory.initializeConfiguration
 
 
 @Suppress("SpellCheckingInspection")
-class MsalFlutterPlugin: MethodCallHandler {
-    companion object
-    {
-        lateinit var mainActivity : Activity
+class MsalFlutterPlugin : MethodCallHandler {
+    companion object {
+        lateinit var mainActivity: Activity
         lateinit var msalApp: IMultipleAccountPublicClientApplication
 
         fun isClientInitialized() = ::msalApp.isInitialized
 
         @JvmStatic
         fun registerWith(registrar: Registrar) {
-           // Log.d("MsalFlutter","Registering plugin")
+            // Log.d("MsalFlutter","Registering plugin")
             val channel = MethodChannel(registrar.messenger(), "msal_flutter")
             channel.setMethodCallHandler(MsalFlutterPlugin())
             mainActivity = registrar.activity()
         }
 
-        fun getAuthCallback(result: Result) : AuthenticationCallback
-        {
-           // Log.d("MsalFlutter", "Getting the auth callback object")
-            return object : AuthenticationCallback
-            {
-                override fun onSuccess(authenticationResult : IAuthenticationResult){
-                //    Log.d("MsalFlutter", "Authentication successful")
+        fun getAuthCallback(result: Result): AuthenticationCallback {
+
+            return object : AuthenticationCallback {
+                override fun onSuccess(authenticationResult: IAuthenticationResult) {
                     Handler(Looper.getMainLooper()).post {
                         result.success(authenticationResult.accessToken)
                     }
                 }
 
-                override fun onError(exception : MsalException)
-                {
-                   // Log.d("MsalFlutter","Error logging in!")
-                   // Log.d("MsalFlutter", exception.message)
+                override fun onError(exception: MsalException) {
                     Handler(Looper.getMainLooper()).post {
                         result.error("AUTH_ERROR", "Authentication failed", exception.localizedMessage)
                     }
                 }
 
-                override fun onCancel(){
-                  //  Log.d("MsalFlutter", "Cancelled")
+                override fun onCancel() {
                     Handler(Looper.getMainLooper()).post {
                         result.error("CANCELLED", "User cancelled", null)
                     }
@@ -63,90 +53,70 @@ class MsalFlutterPlugin: MethodCallHandler {
             }
         }
 
-        private fun getApplicationCreatedListener(result: Result) : IPublicClientApplication.ApplicationCreatedListener {
-           // Log.d("MsalFlutter", "Getting the created listener")
+        private fun getApplicationCreatedListener(result: Result): IMultipleAccountApplicationCreatedListener {
+
+            return object : IMultipleAccountApplicationCreatedListener {
 
-            return object : IPublicClientApplication.ApplicationCreatedListener
-            {
-                override fun onCreated(application: IPublicClientApplication) {
-                   // Log.d("MsalFlutter", "Created successfully")
-                    msalApp = application as MultipleAccountPublicClientApplication
+                override fun onCreated(application: IMultipleAccountPublicClientApplication) {
+                    msalApp = application
                     result.success(true)
                 }
 
                 override fun onError(exception: MsalException?) {
-                   // Log.d("MsalFlutter", "Initialize error")
+                    Log.d("MsalFlutter", "Initialize error")
                     result.error("INIT_ERROR", "Error initializting client", exception?.localizedMessage)
                 }
             }
         }
     }
 
-    override fun onMethodCall(call: MethodCall, result: Result)
-    {
-        val scopesArg : ArrayList<String>? = call.argument("scopes")
+    override fun onMethodCall(call: MethodCall, result: Result) {
+        val scopesArg: ArrayList<String>? = call.argument("scopes")
         val scopes: Array<String>? = scopesArg?.toTypedArray()
-        val clientId : String? = call.argument("clientId")
-        val authority : String? = call.argument("authority")
-//
-//        Log.d("MsalFlutter","Got scopes: $scopes")
-//        Log.d("MsalFlutter","Got cleintId: $clientId")
-//        Log.d("MsalFlutter","Got authority: $authority")
-
-        when(call.method){
-            "logout" -> Thread(Runnable{logout(result)}).start()
+        val clientId: String? = call.argument("clientId")
+        val authority: String? = call.argument("authority")
+
+        when (call.method) {
+            "logout" -> Thread(Runnable { logout(result) }).start()
             "initialize" -> initialize(clientId, authority, result)
-            "acquireToken" -> Thread(Runnable {acquireToken(scopes, result)}).start()
-            "acquireTokenSilent" -> Thread(Runnable {acquireTokenSilent(scopes, result)}).start()
+            "acquireToken" -> Thread(Runnable { acquireToken(scopes, result) }).start()
+            "acquireTokenSilent" -> Thread(Runnable { acquireTokenSilent(scopes, result) }).start()
             else -> result.notImplemented()
         }
 
     }
 
-    private fun acquireToken(scopes : Array<String>?, result: Result)
-    {
-        //Log.d("MsalFlutter", "acquire token called")
-
+    private fun acquireToken(scopes: Array<String>?, result: Result) {
         // check if client has been initialized
-        if(!isClientInitialized()){
-          //  Log.d("MsalFlutter","Client has not been initialized")
+        if (!isClientInitialized()) {
             Handler(Looper.getMainLooper()).post {
                 result.error("NO_CLIENT", "Client must be initialized before attempting to acquire a token.", null)
             }
         }
 
         //check scopes
-        if(scopes == null){
-          //  Log.d("MsalFlutter", "no scope")
+        if (scopes == null) {
             result.error("NO_SCOPE", "Call must include a scope", null)
             return
         }
 
         //remove old accounts
-        while(msalApp.accounts.any()){
-           // Log.d("MsalFlutter","Removing old account")
-            msalApp.removeAccount(msalApp.accounts.first())
-        }
+        while (msalApp.accounts.any()) { msalApp.removeAccount(msalApp.accounts.first()) }
 
         //acquire the token
         msalApp.acquireToken(mainActivity, scopes, getAuthCallback(result))
     }
 
-    private fun acquireTokenSilent(scopes : Array<String>?, result: Result)
-    {
-       // Log.d("MsalFlutter", "Called acquire token silent")
-
+    private fun acquireTokenSilent(scopes: Array<String>?, result: Result) {
         // check if client has been initialized
-        if(!isClientInitialized()){
-           // Log.d("MsalFlutter","Client has not been initialized")
+        if (!isClientInitialized()) {
             Handler(Looper.getMainLooper()).post {
                 result.error("NO_CLIENT", "Client must be initialized before attempting to acquire a token.", null)
             }
         }
 
         //check the scopes
-        if(scopes == null){
-           // Log.d("MsalFlutter", "no scope")
+        if (scopes == null) {
             Handler(Looper.getMainLooper()).post {
                 result.error("NO_SCOPE", "Call must include a scope", null)
             }
@@ -154,7 +124,7 @@ class MsalFlutterPlugin: MethodCallHandler {
         }
 
         //ensure accounts exist
-        if(msalApp.accounts.isEmpty()){
+        if (msalApp.accounts.isEmpty()) {
             Handler(Looper.getMainLooper()).post {
                 result.error("NO_ACCOUNT", "No account is available to acquire token silently for", null)
             }
@@ -168,41 +138,31 @@ class MsalFlutterPlugin: MethodCallHandler {
         }
     }
 
-    private fun initialize(clientId: String?, authority: String?, result: Result)
-    {
+    private fun initialize(clientId: String?, authority: String?, result: Result) {
         //ensure clientid provided
-        if(clientId == null){
-           // Log.d("MsalFlutter","error no clientId")
+        if (clientId == null) {
             result.error("NO_CLIENTID", "Call must include a clientId", null)
             return
         }
 
         //if already initialized, ensure clientid hasn't changed
-        if(isClientInitialized()){
-           // Log.d("MsalFlutter","Client already initialized.")
-            if(msalApp.configuration.clientId == clientId)
-            {
+        if (isClientInitialized()) {
+            if (msalApp.configuration.clientId == clientId) {
                 result.success(true)
             } else {
                 result.error("CHANGED_CLIENTID", "Attempting to initialize with multiple clientIds.", null)
             }
         }
-
         // if authority is set, create client using it, otherwise use default
-        if(authority != null){
-          //  Log.d("MsalFlutter", "Authority not null")
-         //   Log.d("MsalFlutter", "Creating with: $clientId - $authority")
-            PublicClientApplication.create(mainActivity.applicationContext, clientId, authority, getApplicationCreatedListener(result))
-        }else{
-          //  Log.d("MsalFlutter", "Authority null")
-            PublicClientApplication.create(mainActivity.applicationContext, clientId, getApplicationCreatedListener(result))
-        }
+        PublicClientApplication.createMultipleAccountPublicClientApplication(mainActivity.applicationContext,
+                R.raw.msal_default_config, getApplicationCreatedListener(result))
+
+
     }
 
 
-    private fun logout(result: Result){
-        while(msalApp.accounts.any()){
-         //   Log.d("MsalFlutter","Removing old account")
+    private fun logout(result: Result) {
+        while (msalApp.accounts.any()) {
             msalApp.removeAccount(msalApp.accounts.first())
         }
         Handler(Looper.getMainLooper()).post {
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
index 021bbbd..92004d5 100644
--- a/example/.flutter-plugins-dependencies
+++ b/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2020-10-26 07:24:31.426833","version":"1.22.2"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2020-10-27 08:16:10.889681","version":"1.22.2"}
\ No newline at end of file
diff --git a/example/android/app/Keystore/debug.keystore b/example/android/app/Keystore/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..cbcc215c4dc273dc5395e41e51bada3b8a2f0218
GIT binary patch
literal 2106
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

literal 0
HcmV?d00001

diff --git a/example/android/app/Keystore/julia_keystore.jks b/example/android/app/Keystore/julia_keystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..380d226cee6b75c36c9da73aae6be42b8fb8b6f3
GIT binary patch
literal 2102
zcma)6X*3iH8=e_66Jy`Sm`2K4%*Zz4$~w|j!brA46N51^!x(YX$i9_Z2r<^|lZ5D6
z#&&H9VJuB4WyuoB65`Ie=lgMgem|Zc&vV}MzVCUSbDo2hgB1V(0OA7pFZg_e{Rtk|
z{O~lc;^Qfm&<_AWfG9fn7fJ{UQ-=b<KsAsk5C{Q)>EK0E?fT?*xUP?l*)_6p;+htL
zMU&!U5<51uqF0$R@?uql3h^BT>7{qcc(wXnt-Sjt=6y3(o{>W8LkccFPsXYP5GC{T
z>eA<Fmg$7po6mhu2JJo~&h3Jv7X)e?n0zTIfKMFEa1%nEp>U0K3R6cMjg^%cS01*i
z#jaS~L1$_}|2727K4xIb9b*<KZ<S|f#C{_+cUH#{@XHex**+KgevWHcMCe)VTLesi
z>kb4W(^OKL7^|6ZaJ0P~D`TpiF-(U(7B!eJ45>;a1bK<LnS9g@|IA@K|0r7u9T>>H
zdq*MaVo<EIV$^nBUWxnXH&>@daCCuuvMcy))%V*5y&w$7HtRfoAnM)2)4O6X3mAWC
z)OSBBI*j;oS@Ctt-QcS8Bf8e!wXp8jdrYN{otO4=y}>VOU(SgL<i%ay+qIMiS{K?i
z;{RAuo3a_XB0l>nQ`=aVrjK;%?1GQb+>?Y8=;)9R-?i}1&<6lEvnX}znRCyIi7=1g
z<Z_0{ixOH%p#-*u7f;WbcvWFC+i{e4Ce>a`?YehR+Ss$6aB9S8-Pn&`Sl?2!R3h%1
zL5pSz>M@p&a)0b=>f$S7QmzAptp;$!3j4HY3)L59wc<TqsNTOUwSjcTJ|J8|?raZg
zh}QkR!W(X+*?Yk>DfUXfbzi@cS?RN+?~Ne~Uy6;XACn3^^s($=L&mZ4Y@GtfI?!^j
z4%Iy-$+H%761>TN%HFN3+yWaZCPR<O-iT(NDp#p>@pNApimF;uQ`<GWUa-ayAZ!<Q
zV?#D97R*?rQiy#gO?_H$D#RyLk=-{VmG$wgLNTcDo7{&`i8f$pg<7t-by9Pj_-G~)
z0YmEB@(!tt5Z&4qN{}ctiD_LSZT$92k8auTCWBtlp-W4@F<x8Nh>p@ad#g9}Y~F#d
zr^^l(9-6%ud3ssJnQ8fx-|1WHRk0fUgpH-w-Gp0L*c-<rFKqF@O&~ipSn(%k#PX9O
zTN#tE>Xq+ppH3h;DjbD*2tti>9gB*0%0d-%8_o0Jo%!hQl%67t(*7L$#&L|CtlyrW
z#z&cJN}={N*A3f|o!bxRs%n=xLOws3?-||x!=n!DerK$@8+G=2e8;upO<hVZ)u$B|
z7hC+6kL#zT1^TD0-|Fb!dkW4TZru%D!?`>Io#x+1NG*vlMpNg4I+^aS$r#P8z37PI
z*LL(vM?JJ#I8h;&;Ka*@a^N=-VI$j*3k(AyjV?qQmi4MIrKW_Z$zit!RHNgWGbIyL
z)*Qu<Bi7Y0krHzxJ~Y}!C0Xg7d#;kC4~7D;`|y)$lxj}%>3o%WTPUMw#6iZ39~%}3
zVZ)WT3m%C7%FZB1h^Y4BUYid4R>*V!{EcHOt?}n2jhN}H<BM>KrJ8f#Gv^M1;`_q{
zsg=(2u(Uyq`HT%>>G23j@CZ{ss^rbSpZ>)Z10U;KUTJ-~<ox&1(w%bBH|n&&qP7YG
z>#XEvyf>f_7#Kn_^vp9snX7)P*b^z?Z2n{p-hL7<W^mxF<-N&5Ba?Sj4vRz5Z5w~L
z+ImN#YU%@mB8T`CRN4Z^B$c&q<Vlu#HZ_0}Z*sB*e|WdW$lwet+53?a)@~k%`JYW2
zT}`Q!*v=<|$gmeJ{YMz%vc+p~+1|<n2b6UWS#m014V9Q9MIDF;`?nh*P8vEW47V+p
zP;}5diVl3k-~j<aAh3B<RXR!#%BL1%6|*e}1oA@ws1s;WlrWSB2j&;&#RU-j@gevi
zv@myyEAfa!Ex43GMj@mH(HImOt&i5zL8DR5(t_IBT&ndy`hRYr1CRgrJhz;A=s;lr
z_d^(n4g>-k{)*(ufJ_UfE$EF-ns-_AO;eq+dnBCh#jilJe$5|k_x*JbRxV1*n$qRO
zMH6cECK77qQD!%pzCaoO6IE*q<E13kl0RB>I27K>meAR#!}#V0+JE9!iKo`u^z@J3
z+8;*G^whK`cbU9!u`0c4!fLO>z^g^)rKfX)^1Z_C*B_20Sww91Ff{z1l<Y0v-!IDD
zN5qkl#KG<(y4sIMS+|=A*D5o;n}ot}UVxKl+T@8F-VLH2=62ELwOv+ru`MF()kfFO
zTKdwrGkFXfHRsm595to+_a4e)S0tK)Mel4*ICOj;Im_==?s>@r+k?=eej;6%L^R|X
z+>B8M@c;q9LIu<@lswmdc_FYASmJqAV{pI$wDnQNSqF8w)*%e*&(r@kk((jcL?Gbk
zE(<QnJ6)+nHW1X{X%x|d=P!N>K0~COh4i}l#V^CYHVpTzv?uOIkX6FqNMUWAgiOSn
z!;!I~_qKare8NQwp+Kz#W{8%NV9X&Yt?c4DZj)I}+;vH$imj%f_VYAGyW~8dlZHi;
zDfNU8>omp6JXfD{V?_!M=QIo&C*^Gho~f+At(@>QLjKSqKX`fXI+L|1z<DZLmM=4@
zhaG>CrhK*aWIc{O%^uX{@IcGI#_eY0P@7e|O^cORjUjHkeP<omtlt#mvSH!%!ge|C
zI?Y4!nFCvDQy?J;V8oJx+^GaRCyJwFj-yo}oZ?ztPjS0KSu!0k)l6jad8R+MhdDkE
R%rHLkV#i@;l<cVc^&edNyVw8#

literal 0
HcmV?d00001

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index a8a8570..2add2be 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -38,9 +38,8 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "uk.co.moodio.msal_flutter_example"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -54,6 +53,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.debug
         }
+
+        debug {
+            signingConfig signingConfigs.debug
+        }
+    }
+
+    signingConfigs {
+        debug {
+            storeFile file("Keystore/debug.keystore")
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
     }
 }
 
@@ -63,7 +75,7 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index af28b19..cd515f2 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="uk.co.moodio.msal_flutter_example">
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
@@ -36,8 +37,10 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="msal5913dfb1-7576-451c-a7ea-a7c5a3f8682a"
-                    android:host="auth" />
+                <data
+                    android:host="uk.co.moodio.msal_flutter_example"
+                    android:path="/U5rbvBLdFUbEazWhQfDgt6oRa24="
+                    android:scheme="msauth" />
             </intent-filter>
         </activity>
     </application>
diff --git a/example/android/app/src/main/res/raw/msal_default_config.json b/example/android/app/src/main/res/raw/msal_default_config.json
index 1961fad..3039dce 100644
--- a/example/android/app/src/main/res/raw/msal_default_config.json
+++ b/example/android/app/src/main/res/raw/msal_default_config.json
@@ -1,134 +1,138 @@
 {
-    "authorities": [
-      {
-        "type": "B2C",
-        "default":true
+  "authorities": [
+    {
+      "type": "AAD",
+      "audience": {
+        "type": "AzureADMyOrg",
+        "tenant_id": "fagsfgagag"
       }
-    ],
-    "redirect_uri":"msal5913dfb1-7576-451c-a7ea-a7c5a3f8682a://auth",
-    "authorization_user_agent": "DEFAULT",
-    "minimum_required_broker_protocol_version": "3.0",
-    "multiple_clouds_supported": false,
-    "broker_redirect_uri_registered": false,
-    "environment": "Production",
-    "http": {
-      "connect_timeout": 10000,
-      "read_timeout": 30000
+    }
+  ],
+  "client_id" : "fdsfsdfsfsfsf",
+  "redirect_uri" : "msauth://uk.co.moodio.msal_flutter_example/U5rbvBLdFUbEazWhQfDgt6oRa24%3D",
+  "authorization_user_agent": "DEFAULT",
+  "minimum_required_broker_protocol_version": "3.0",
+  "multiple_clouds_supported": false,
+  "broker_redirect_uri_registered": true,
+  "environment": "Production",
+  "http": {
+    "connect_timeout": 10000,
+    "read_timeout": 30000
+  },
+  "logging": {
+    "pii_enabled": false,
+    "log_level": "WARNING",
+    "logcat_enabled": true
+  },
+  "account_mode": "MULTIPLE",
+  "browser_safelist": [
+    {
+      "browser_package_name": "com.android.chrome",
+      "browser_signature_hashes": [
+        "7fmduHKTdHHrlMvldlEqAIlSfii1tl35bxj1OXN5Ve8c4lU6URVu4xtSHc3BVZxS6WWJnxMDhIfQN0N0K2NDJg=="
+      ],
+      "browser_use_customTab": true,
+      "browser_version_lower_bound": "45"
     },
-    "logging": {
-      "pii_enabled": false,
-      "log_level": "WARNING",
-      "logcat_enabled": true
+    {
+      "browser_package_name": "com.android.chrome",
+      "browser_signature_hashes": [
+        "7fmduHKTdHHrlMvldlEqAIlSfii1tl35bxj1OXN5Ve8c4lU6URVu4xtSHc3BVZxS6WWJnxMDhIfQN0N0K2NDJg=="
+      ],
+      "browser_use_customTab": false
     },
-    "account_mode": "MULTIPLE",
-    "browser_safelist": [
-      {
-        "browser_package_name": "com.android.chrome",
-        "browser_signature_hashes": [
-          "7fmduHKTdHHrlMvldlEqAIlSfii1tl35bxj1OXN5Ve8c4lU6URVu4xtSHc3BVZxS6WWJnxMDhIfQN0N0K2NDJg=="
-        ],
-        "browser_use_customTab": true,
-        "browser_version_lower_bound": "45"
-      },
-      {
-        "browser_package_name": "com.android.chrome",
-        "browser_signature_hashes": [
-          "7fmduHKTdHHrlMvldlEqAIlSfii1tl35bxj1OXN5Ve8c4lU6URVu4xtSHc3BVZxS6WWJnxMDhIfQN0N0K2NDJg=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "org.mozilla.firefox",
-        "browser_signature_hashes": [
-          "2gCe6pR_AO_Q2Vu8Iep-4AsiKNnUHQxu0FaDHO_qa178GByKybdT_BuE8_dYk99G5Uvx_gdONXAOO2EaXidpVQ=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "org.mozilla.firefox",
-        "browser_signature_hashes": [
-          "2gCe6pR_AO_Q2Vu8Iep-4AsiKNnUHQxu0FaDHO_qa178GByKybdT_BuE8_dYk99G5Uvx_gdONXAOO2EaXidpVQ=="
-        ],
-        "browser_use_customTab": true,
-        "browser_version_lower_bound": "57"
-      },
-      {
-        "browser_package_name": "com.sec.android.app.sbrowser",
-        "browser_signature_hashes": [
-          "ABi2fbt8vkzj7SJ8aD5jc4xJFTDFntdkMrYXL3itsvqY1QIw-dZozdop5rgKNxjbrQAd5nntAGpgh9w84O1Xgg=="
-        ],
-        "browser_use_customTab": true,
-        "browser_version_lower_bound": "4.0"
-      },
-      {
-        "browser_package_name": "com.sec.android.app.sbrowser",
-        "browser_signature_hashes": [
-          "ABi2fbt8vkzj7SJ8aD5jc4xJFTDFntdkMrYXL3itsvqY1QIw-dZozdop5rgKNxjbrQAd5nntAGpgh9w84O1Xgg=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "com.cloudmosa.puffinFree",
-        "browser_signature_hashes": [
-          "1WqG8SoK2WvE4NTYgr2550TRhjhxT-7DWxu6C_o6GrOLK6xzG67Hq7GCGDjkAFRCOChlo2XUUglLRAYu3Mn8Ag=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "com.duckduckgo.mobile.android",
-        "browser_signature_hashes": [
-          "S5Av4cfEycCvIvKPpKGjyCuAE5gZ8y60-knFfGkAEIZWPr9lU5kA7iOAlSZxaJei08s0ruDvuEzFYlmH-jAi4Q=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "com.explore.web.browser",
-        "browser_signature_hashes": [
-          "BzDzBVSAwah8f_A0MYJCPOkt0eb7WcIEw6Udn7VLcizjoU3wxAzVisCm6bW7uTs4WpMfBEJYf0nDgzTYvYHCag=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "com.ksmobile.cb",
-        "browser_signature_hashes": [
-          "lFDYx1Rwc7_XUn4KlfQk2klXLufRyuGHLa3a7rNjqQMkMaxZueQfxukVTvA7yKKp3Md3XUeeDSWGIZcRy7nouw=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "com.microsoft.emmx",
-        "browser_signature_hashes": [
-          "Ivy-Rk6ztai_IudfbyUrSHugzRqAtHWslFvHT0PTvLMsEKLUIgv7ZZbVxygWy_M5mOPpfjZrd3vOx3t-cA6fVQ=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "com.opera.browser",
-        "browser_signature_hashes": [
-          "FIJ3IIeqB7V0qHpRNEpYNkhEGA_eJaf7ntca-Oa_6Feev3UkgnpguTNV31JdAmpEFPGNPo0RHqdlU0k-3jWJWw=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "com.opera.mini.native",
-        "browser_signature_hashes": [
-          "TOTyHs086iGIEdxrX_24aAewTZxV7Wbi6niS2ZrpPhLkjuZPAh1c3NQ_U4Lx1KdgyhQE4BiS36MIfP6LbmmUYQ=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "mobi.mgeek.TunnyBrowser",
-        "browser_signature_hashes": [
-          "RMVoXuK1sfJZuGZ8onG1yhMc-sKiAV2NiB_GZfdNlN8XJ78XEE2wPM6LnQiyltF25GkHiPN2iKQiGwaO2bkyyQ=="
-        ],
-        "browser_use_customTab": false
-      },
-      {
-        "browser_package_name": "org.mozilla.focus",
-        "browser_signature_hashes": [
-          "L72dT-stFqomSY7sYySrgBJ3VYKbipMZapmUXfTZNqOzN_dekT5wdBACJkpz0C6P0yx5EmZ5IciI93Q0hq0oYA=="
-        ],
-        "browser_use_customTab": false
-      }
-    ]
+    {
+      "browser_package_name": "org.mozilla.firefox",
+      "browser_signature_hashes": [
+        "2gCe6pR_AO_Q2Vu8Iep-4AsiKNnUHQxu0FaDHO_qa178GByKybdT_BuE8_dYk99G5Uvx_gdONXAOO2EaXidpVQ=="
+      ],
+      "browser_use_customTab": false
+    },
+    {
+      "browser_package_name": "org.mozilla.firefox",
+      "browser_signature_hashes": [
+        "2gCe6pR_AO_Q2Vu8Iep-4AsiKNnUHQxu0FaDHO_qa178GByKybdT_BuE8_dYk99G5Uvx_gdONXAOO2EaXidpVQ=="
+      ],
+      "browser_use_customTab": true,
+      "browser_version_lower_bound": "57"
+    },
+    {
+      "browser_package_name": "com.sec.android.app.sbrowser",
+      "browser_signature_hashes": [
+        "ABi2fbt8vkzj7SJ8aD5jc4xJFTDFntdkMrYXL3itsvqY1QIw-dZozdop5rgKNxjbrQAd5nntAGpgh9w84O1Xgg=="
+      ],
+      "browser_use_customTab": true,
+      "browser_version_lower_bound": "4.0"
+    },
+    {
+      "browser_package_name": "com.sec.android.app.sbrowser",
+      "browser_signature_hashes": [
+        "ABi2fbt8vkzj7SJ8aD5jc4xJFTDFntdkMrYXL3itsvqY1QIw-dZozdop5rgKNxjbrQAd5nntAGpgh9w84O1Xgg=="
+      ],
+      "browser_use_customTab": false
+    },
+    {
+      "browser_package_name": "com.cloudmosa.puffinFree",
+      "browser_signature_hashes": [
+        "1WqG8SoK2WvE4NTYgr2550TRhjhxT-7DWxu6C_o6GrOLK6xzG67Hq7GCGDjkAFRCOChlo2XUUglLRAYu3Mn8Ag=="
+      ],
+      "browser_use_customTab": false
+    },
+    {
+      "browser_package_name": "com.duckduckgo.mobile.android",
+      "browser_signature_hashes": [
+        "S5Av4cfEycCvIvKPpKGjyCuAE5gZ8y60-knFfGkAEIZWPr9lU5kA7iOAlSZxaJei08s0ruDvuEzFYlmH-jAi4Q=="
+      ],
+      "browser_use_customTab": false
+    },
+    {
+      "browser_package_name": "com.explore.web.browser",
+      "browser_signature_hashes": [
+        "BzDzBVSAwah8f_A0MYJCPOkt0eb7WcIEw6Udn7VLcizjoU3wxAzVisCm6bW7uTs4WpMfBEJYf0nDgzTYvYHCag=="
+      ],
+      "browser_use_customTab": false
+    },
+    {
+      "browser_package_name": "com.ksmobile.cb",
+      "browser_signature_hashes": [
+        "lFDYx1Rwc7_XUn4KlfQk2klXLufRyuGHLa3a7rNjqQMkMaxZueQfxukVTvA7yKKp3Md3XUeeDSWGIZcRy7nouw=="
+      ],
+      "browser_use_customTab": false
+    },
+    {
+      "browser_package_name": "com.microsoft.emmx",
+      "browser_signature_hashes": [
+        "Ivy-Rk6ztai_IudfbyUrSHugzRqAtHWslFvHT0PTvLMsEKLUIgv7ZZbVxygWy_M5mOPpfjZrd3vOx3t-cA6fVQ=="
+      ],
+      "browser_use_customTab": false
+    },
+    {
+      "browser_package_name": "com.opera.browser",
+      "browser_signature_hashes": [
+        "FIJ3IIeqB7V0qHpRNEpYNkhEGA_eJaf7ntca-Oa_6Feev3UkgnpguTNV31JdAmpEFPGNPo0RHqdlU0k-3jWJWw=="
+      ],
+      "browser_use_customTab": false
+    },
+    {
+      "browser_package_name": "com.opera.mini.native",
+      "browser_signature_hashes": [
+        "TOTyHs086iGIEdxrX_24aAewTZxV7Wbi6niS2ZrpPhLkjuZPAh1c3NQ_U4Lx1KdgyhQE4BiS36MIfP6LbmmUYQ=="
+      ],
+      "browser_use_customTab": false
+    },
+    {
+      "browser_package_name": "mobi.mgeek.TunnyBrowser",
+      "browser_signature_hashes": [
+        "RMVoXuK1sfJZuGZ8onG1yhMc-sKiAV2NiB_GZfdNlN8XJ78XEE2wPM6LnQiyltF25GkHiPN2iKQiGwaO2bkyyQ=="
+      ],
+      "browser_use_customTab": false
+    },
+    {
+      "browser_package_name": "org.mozilla.focus",
+      "browser_signature_hashes": [
+        "L72dT-stFqomSY7sYySrgBJ3VYKbipMZapmUXfTZNqOzN_dekT5wdBACJkpz0C6P0yx5EmZ5IciI93Q0hq0oYA=="
+      ],
+      "browser_use_customTab": false
+    }
+  ]
 }
\ No newline at end of file
diff --git a/example/lib/main.dart b/example/lib/main.dart
index db92756..bbe583f 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -13,8 +13,8 @@ class MyApp extends StatefulWidget {
 
 class _MyAppState extends State<MyApp> {
   
-  static const String _authority = "https://msalfluttertest.b2clogin.com/tfp/msalfluttertest.onmicrosoft.com/B2C_1_sisu";
-  static const String _clientId = "5913dfb1-7576-451c-a7ea-a7c5a3f8682a";
+  static const String _authority = "https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize";
+  static const String _clientId = "1516f813-e189-4587-8158-ffb338650aa7";
   
   String _output = 'NONE';
 
diff --git a/lib/src/public_client_application.dart b/lib/src/public_client_application.dart
index 6e235af..7049748 100644
--- a/lib/src/public_client_application.dart
+++ b/lib/src/public_client_application.dart
@@ -1,4 +1,6 @@
 import 'dart:async';
+import 'dart:math';
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'msal_exception.dart';
 
@@ -103,6 +105,7 @@ class PublicClientApplication {
     try {
       await _channel.invokeMethod('initialize', res);
     } on PlatformException catch (e) {
+      debugPrint("MSAL--> ${e.message} --> ${e.code}");
       throw _convertException(e);
     }
   }

From 1a553cffc64033fd18864fea6adb37d5a70e2a3d Mon Sep 17 00:00:00 2001
From: "fabio.conceicao" <fsconceicao@hotmail.com>
Date: Thu, 29 Oct 2020 16:58:31 -0300
Subject: [PATCH 5/9] version msal update 2.+

---
 .../moodio/msal_flutter/MsalFlutterPlugin.kt  | 112 +++++++++++++++---
 example/.flutter-plugins-dependencies         |   2 +-
 .../android/app/Keystore/julia_keystore.jks   | Bin 2102 -> 0 bytes
 example/android/app/build.gradle              |   1 +
 .../src/main/res/raw/msal_default_config.json |  18 +--
 example/lib/main.dart                         |  14 ++-
 lib/src/public_client_application.dart        |   6 +-
 7 files changed, 119 insertions(+), 34 deletions(-)
 delete mode 100644 example/android/app/Keystore/julia_keystore.jks

diff --git a/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt b/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt
index ee409f4..b5fb084 100644
--- a/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt
+++ b/android/src/main/kotlin/uk/co/moodio/msal_flutter/MsalFlutterPlugin.kt
@@ -6,7 +6,11 @@ import android.os.Looper
 import android.util.Log
 import com.microsoft.identity.client.*
 import com.microsoft.identity.client.IPublicClientApplication.IMultipleAccountApplicationCreatedListener
+import com.microsoft.identity.client.IPublicClientApplication.LoadAccountsCallback
+import com.microsoft.identity.client.exception.MsalClientException
 import com.microsoft.identity.client.exception.MsalException
+import com.microsoft.identity.client.exception.MsalServiceException
+import com.microsoft.identity.client.exception.MsalUiRequiredException
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
@@ -19,6 +23,7 @@ class MsalFlutterPlugin : MethodCallHandler {
     companion object {
         lateinit var mainActivity: Activity
         lateinit var msalApp: IMultipleAccountPublicClientApplication
+        lateinit var accountList: List<IAccount>
 
         fun isClientInitialized() = ::msalApp.isInitialized
 
@@ -53,13 +58,40 @@ class MsalFlutterPlugin : MethodCallHandler {
             }
         }
 
+        /**
+         * Callback used in for silent acquireToken calls.
+         */
+        fun getAuthSilentCallback(result: Result): SilentAuthenticationCallback {
+            return object : SilentAuthenticationCallback {
+                override fun onSuccess(authenticationResult: IAuthenticationResult) {
+                    Log.d("MSAL_FLUTTER", "Successfully authenticated")
+                    Handler(Looper.getMainLooper()).post {
+                        result.success(authenticationResult.accessToken)
+                    }
+                }
+
+                override fun onError(exception: MsalException) {
+                    /* Failed to acquireToken */
+                    Log.d("MSAL_FLUTTER", "Authentication failed: $exception")
+                    if (exception is MsalClientException) {
+                        result.error("NO_SCOPE", "Call must include a scope", exception.localizedMessage)
+                    } else if (exception is MsalServiceException) {
+                        result.error("NO_SCOPE", exception.localizedMessage, exception.localizedMessage)
+                    } else if (exception is MsalUiRequiredException) {
+                        result.error("NO_SCOPE", "Call must include a scope", exception.localizedMessage)
+                    }
+                }
+            }
+        }
+
         private fun getApplicationCreatedListener(result: Result): IMultipleAccountApplicationCreatedListener {
 
             return object : IMultipleAccountApplicationCreatedListener {
-
                 override fun onCreated(application: IMultipleAccountPublicClientApplication) {
-                    msalApp = application
-                    result.success(true)
+
+                        msalApp = application
+                        result.success(true)
+
                 }
 
                 override fun onError(exception: MsalException?) {
@@ -68,6 +100,8 @@ class MsalFlutterPlugin : MethodCallHandler {
                 }
             }
         }
+
+
     }
 
     override fun onMethodCall(call: MethodCall, result: Result) {
@@ -79,6 +113,7 @@ class MsalFlutterPlugin : MethodCallHandler {
         when (call.method) {
             "logout" -> Thread(Runnable { logout(result) }).start()
             "initialize" -> initialize(clientId, authority, result)
+            "loadAccounts" -> Thread(Runnable { loadAccounts(result) }).start()
             "acquireToken" -> Thread(Runnable { acquireToken(scopes, result) }).start()
             "acquireTokenSilent" -> Thread(Runnable { acquireTokenSilent(scopes, result) }).start()
             else -> result.notImplemented()
@@ -101,7 +136,9 @@ class MsalFlutterPlugin : MethodCallHandler {
         }
 
         //remove old accounts
-        while (msalApp.accounts.any()) { msalApp.removeAccount(msalApp.accounts.first()) }
+        while (msalApp.accounts.any()) {
+            msalApp.removeAccount(msalApp.accounts.first())
+        }
 
         //acquire the token
         msalApp.acquireToken(mainActivity, scopes, getAuthCallback(result))
@@ -109,6 +146,7 @@ class MsalFlutterPlugin : MethodCallHandler {
 
     private fun acquireTokenSilent(scopes: Array<String>?, result: Result) {
         // check if client has been initialized
+
         if (!isClientInitialized()) {
             Handler(Looper.getMainLooper()).post {
                 result.error("NO_CLIENT", "Client must be initialized before attempting to acquire a token.", null)
@@ -124,20 +162,21 @@ class MsalFlutterPlugin : MethodCallHandler {
         }
 
         //ensure accounts exist
-        if (msalApp.accounts.isEmpty()) {
+        if (accountList?.isEmpty()) {
             Handler(Looper.getMainLooper()).post {
                 result.error("NO_ACCOUNT", "No account is available to acquire token silently for", null)
             }
             return
         }
-
+        val selectedAccount: IAccount = accountList.first();
         //acquire the token and return the result
-        val res = msalApp.acquireTokenSilent(scopes, msalApp.accounts[0], msalApp.configuration.defaultAuthority.authorityURL.toString())
-        Handler(Looper.getMainLooper()).post {
-            result.success(res.accessToken)
-        }
+        val sc = scopes.map { s -> s.toLowerCase() }.toTypedArray()
+
+        msalApp.acquireTokenSilentAsync(sc, selectedAccount, selectedAccount.authority, getAuthSilentCallback(result))
+
     }
 
+
     private fun initialize(clientId: String?, authority: String?, result: Result) {
         //ensure clientid provided
         if (clientId == null) {
@@ -153,20 +192,59 @@ class MsalFlutterPlugin : MethodCallHandler {
                 result.error("CHANGED_CLIENTID", "Attempting to initialize with multiple clientIds.", null)
             }
         }
-        // if authority is set, create client using it, otherwise use default
-        PublicClientApplication.createMultipleAccountPublicClientApplication(mainActivity.applicationContext,
-                R.raw.msal_default_config, getApplicationCreatedListener(result))
+        if(!isClientInitialized()) {
+            // if authority is set, create client using it, otherwise use default
+            PublicClientApplication.createMultipleAccountPublicClientApplication(mainActivity.applicationContext,
+                    R.raw.msal_default_config, getApplicationCreatedListener(result))
+        }
+
+    }
+
+    /**
+     * Load currently signed-in accounts, if there's any.
+     */
+    private fun loadAccounts(result: Result) {
 
+        msalApp.getAccounts(object : LoadAccountsCallback {
+
+            override fun onTaskCompleted(resultList: List<IAccount>) {
+                accountList = resultList
+                result.success(true)
+            }
 
+            override fun onError(exception: MsalException) {
+                result.error("NO_ACCOUNT", "No account is available to acquire token silently for", exception)
+            }
+        })
     }
 
 
     private fun logout(result: Result) {
-        while (msalApp.accounts.any()) {
-            msalApp.removeAccount(msalApp.accounts.first())
+        if(!isClientInitialized()){
+            Handler(Looper.getMainLooper()).post {
+                result.error("NO_ACCOUNT", "No account is available to acquire token silently for", null)
+            }
+            return
         }
-        Handler(Looper.getMainLooper()).post {
-            result.success(true)
+
+        if (accountList?.isEmpty()) {
+            Handler(Looper.getMainLooper()).post {
+                result.error("NO_ACCOUNT", "No account is available to acquire token silently for", null)
+            }
+            return
         }
+
+        msalApp.removeAccount(accountList.first(), object : IMultipleAccountPublicClientApplication.RemoveAccountCallback{
+            override fun onRemoved() {
+                Thread(Runnable { loadAccounts(result) }).start()
+            }
+
+            override fun onError(exception: MsalException) {
+                result.error("NO_ACCOUNT", "No account is available to acquire token silently for", exception)
+            }
+        })
+
     }
 }
+
+
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
index 92004d5..cf2bc25 100644
--- a/example/.flutter-plugins-dependencies
+++ b/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2020-10-27 08:16:10.889681","version":"1.22.2"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2020-10-28 18:02:31.172962","version":"1.22.2"}
\ No newline at end of file
diff --git a/example/android/app/Keystore/julia_keystore.jks b/example/android/app/Keystore/julia_keystore.jks
deleted file mode 100644
index 380d226cee6b75c36c9da73aae6be42b8fb8b6f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2102
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
R%rHLkV#i@;l<cVc^&edNyVw8#

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 2add2be..d15ee1e 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -38,6 +38,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId "uk.co.moodio.msal_flutter_example"
         minSdkVersion 21
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
diff --git a/example/android/app/src/main/res/raw/msal_default_config.json b/example/android/app/src/main/res/raw/msal_default_config.json
index 3039dce..1076521 100644
--- a/example/android/app/src/main/res/raw/msal_default_config.json
+++ b/example/android/app/src/main/res/raw/msal_default_config.json
@@ -1,20 +1,21 @@
 {
+  "client_id": "xxxx-xxxxx-xxxx-xxxx--xxxxx",
+  "redirect_uri": "msauth://com.my/U5rbvBLdFUbEazWhQfDgt6oRa24%3D",
+  "authorization_user_agent": "DEFAULT",
+  "minimum_required_broker_protocol_version": "3.0",
+  "multiple_clouds_supported": false,
+  "broker_redirect_uri_registered": true,
+  "environment": "Production",
+  "account_mode": "MULTIPLE",
   "authorities": [
     {
       "type": "AAD",
       "audience": {
         "type": "AzureADMyOrg",
-        "tenant_id": "fagsfgagag"
+        "tenant_id": "123432-1234-12343-bfre-78a6ff9loskf"
       }
     }
   ],
-  "client_id" : "fdsfsdfsfsfsf",
-  "redirect_uri" : "msauth://uk.co.moodio.msal_flutter_example/U5rbvBLdFUbEazWhQfDgt6oRa24%3D",
-  "authorization_user_agent": "DEFAULT",
-  "minimum_required_broker_protocol_version": "3.0",
-  "multiple_clouds_supported": false,
-  "broker_redirect_uri_registered": true,
-  "environment": "Production",
   "http": {
     "connect_timeout": 10000,
     "read_timeout": 30000
@@ -24,7 +25,6 @@
     "log_level": "WARNING",
     "logcat_enabled": true
   },
-  "account_mode": "MULTIPLE",
   "browser_safelist": [
     {
       "browser_package_name": "com.android.chrome",
diff --git a/example/lib/main.dart b/example/lib/main.dart
index bbe583f..ba8d923 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -14,9 +14,13 @@ class MyApp extends StatefulWidget {
 class _MyAppState extends State<MyApp> {
   
   static const String _authority = "https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize";
-  static const String _clientId = "1516f813-e189-4587-8158-ffb338650aa7";
+  static const String _clientId = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
   
   String _output = 'NONE';
+  static const List<String> kScopes = [
+    "https://graph.microsoft.com/user.read",
+    "https://graph.microsoft.com/Calendars.ReadWrite",
+  ];
 
   PublicClientApplication pca;
 
@@ -27,7 +31,7 @@ class _MyAppState extends State<MyApp> {
 
     String res;
     try{
-      res = await pca.acquireToken(["https://msalfluttertest.onmicrosoft.com/msalbackend/user_impersonation"]);
+      res = await pca.acquireToken(kScopes);
     } on MsalUserCancelledException {
       res = "User cancelled";
     } on MsalNoAccountException {
@@ -53,15 +57,15 @@ class _MyAppState extends State<MyApp> {
     String res;
     try
     {
-      res = await pca.acquireTokenSilent(["https://msalfluttertest.onmicrosoft.com/msalbackend/user_impersonation"]);
+      res = await pca.acquireTokenSilent(kScopes);
     } on MsalUserCancelledException {
       res = "User cancelled";
     } on MsalNoAccountException {
       res = "no account";
     } on MsalInvalidConfigurationException {
       res = "invalid config";
-    } on MsalInvalidScopeException {
-      res = "Invalid scope";
+    } on MsalInvalidScopeException catch (e) {
+      res = "Invalid scope: ${e.errorMessage}";
     }on MsalException {
       res = "Error getting token silently!";
     }
diff --git a/lib/src/public_client_application.dart b/lib/src/public_client_application.dart
index 7049748..ae95fa1 100644
--- a/lib/src/public_client_application.dart
+++ b/lib/src/public_client_application.dart
@@ -27,6 +27,7 @@ class PublicClientApplication {
       {String authority}) async {
     var res = PublicClientApplication._create(clientId, authority: authority);
     await res._initialize();
+
     return res;
   }
 
@@ -51,8 +52,8 @@ class PublicClientApplication {
 
     //call platform
     try {
-      final String token =
-          await _channel.invokeMethod('acquireTokenSilent', res);
+      await _channel.invokeMethod('loadAccounts');
+      final String token = await _channel.invokeMethod('acquireTokenSilent', res);
       return token;
     } on PlatformException catch (e) {
       throw _convertException(e);
@@ -61,6 +62,7 @@ class PublicClientApplication {
 
   Future logout() async {
     try {
+      await _channel.invokeMethod('loadAccounts');
       await _channel.invokeMethod('logout', <String, dynamic>{});
     } on PlatformException catch (e) {
       throw _convertException(e);

From 048b1204900430f1738a966592072f52ee0b712d Mon Sep 17 00:00:00 2001
From: "fabio.conceicao" <fsconceicao@hotmail.com>
Date: Thu, 29 Oct 2020 17:02:36 -0300
Subject: [PATCH 6/9] version msal update 2.+ fix loadAccounts request

---
 lib/src/public_client_application.dart | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/src/public_client_application.dart b/lib/src/public_client_application.dart
index ae95fa1..3d64789 100644
--- a/lib/src/public_client_application.dart
+++ b/lib/src/public_client_application.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -52,7 +53,9 @@ class PublicClientApplication {
 
     //call platform
     try {
-      await _channel.invokeMethod('loadAccounts');
+      if (Platform.isAndroid) {
+        await _channel.invokeMethod('loadAccounts');
+      }
       final String token = await _channel.invokeMethod('acquireTokenSilent', res);
       return token;
     } on PlatformException catch (e) {
@@ -62,7 +65,9 @@ class PublicClientApplication {
 
   Future logout() async {
     try {
-      await _channel.invokeMethod('loadAccounts');
+      if (Platform.isAndroid) {
+        await _channel.invokeMethod('loadAccounts');
+      }
       await _channel.invokeMethod('logout', <String, dynamic>{});
     } on PlatformException catch (e) {
       throw _convertException(e);

From e688d1cfa2b4299b3495fb72386fb54728ebb9c6 Mon Sep 17 00:00:00 2001
From: "fabio.conceicao" <fsconceicao@hotmail.com>
Date: Thu, 29 Oct 2020 17:44:51 -0300
Subject: [PATCH 7/9] teste

---
 example/android/app/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index d15ee1e..26dc2a3 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -38,6 +38,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+
         applicationId "uk.co.moodio.msal_flutter_example"
         minSdkVersion 21
         targetSdkVersion 30

From 71cacc9c74b91519d48a7e26d40ad218c34839e8 Mon Sep 17 00:00:00 2001
From: "fabio.conceicao" <fsconceicao@hotmail.com>
Date: Thu, 29 Oct 2020 17:46:14 -0300
Subject: [PATCH 8/9] teste2

---
 pubspec.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 2a3903c..e6f62b0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,8 +1,8 @@
 name: msal_flutter
 description: A Microsoft Authentication Library wrapper for Android and iOS
-version: 1.0.0+2
-homepage: https://github.com/moodio/msal-flutter
-repository: https://github.com/moodio/msal-flutter
+version: 1.0.0+4
+#homepage: https://github.com/moodio/msal-flutter
+#repository: https://github.com/moodio/msal-flutter
 environment:
   sdk: ">=2.1.0 <3.0.0"
 

From 285cb350ea5a151ec398a13681f5402c8204fcd5 Mon Sep 17 00:00:00 2001
From: "fabio.conceicao" <fsconceicao@hotmail.com>
Date: Wed, 11 Nov 2020 08:50:28 -0300
Subject: [PATCH 9/9] fix msal versio stable 2.0.2

---
 android/build.gradle                              | 2 +-
 example/.flutter-plugins-dependencies             | 2 +-
 example/ios/Flutter/flutter_export_environment.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 99099ce..1488f2c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -50,5 +50,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.microsoft.identity.client:msal:2.+'
+    implementation 'com.microsoft.identity.client:msal:2.0.2'
 }
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
index cf2bc25..13f0a16 100644
--- a/example/.flutter-plugins-dependencies
+++ b/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Projetos/msal-flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2020-10-28 18:02:31.172962","version":"1.22.2"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Folder Projects/msal-flutter/","dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/fabioconceicao/Documents/Folder Projects/msal-flutter/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2020-11-11 08:48:46.235613","version":"1.22.3"}
\ No newline at end of file
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
index 8eac4ab..7145aa1 100755
--- a/example/ios/Flutter/flutter_export_environment.sh
+++ b/example/ios/Flutter/flutter_export_environment.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
 export "FLUTTER_ROOT=/Users/fabioconceicao/Documents/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/fabioconceicao/Documents/Projetos/msal-flutter/example"
+export "FLUTTER_APPLICATION_PATH=/Users/fabioconceicao/Documents/Folder Projects/msal-flutter/example"
 export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build/ios"