Merge pull request #4 from BritehouseMobile/fix/Android-invalid-auth

Fix/android invalid auth

Author: JohiesC

CHANGELOG.md

@@ -1,7 +1,13 @@
+## 0.1.0
+
+* Fixed issue on error where plugin would not initialise properly on first method call
+
+
 ## 0.0.4
 
 * Fixed dismiss error message on Android
 
+
 ## 0.0.3
 
 * Added error response messages to iOS

README.md

@@ -29,7 +29,7 @@ Import the [Flutter Microsoft Authentication package](https://pub.dev/packages/f
 
 ```
 dependencies:
-  flutter_microsoft_authentication: ^0.0.4
+  flutter_microsoft_authentication: ^0.1.0
 ```
 
 ### Configuring MSAL for Android

android/src/main/kotlin/za/co/britehouse/flutter_microsoft_authentication/FlutterMicrosoftAuthenticationPlugin.kt

@@ -38,11 +38,6 @@ class FlutterMicrosoftAuthenticationPlugin: MethodCallHandler {
 
   override fun onMethodCall(call: MethodCall, result: Result) {
 
-    if (call.method == "signOut") {
-      signOut(result)
-      return
-    }
-
     val scopesArg : ArrayList<String>? = call.argument("kScopes")
     val scopes: Array<String>? = scopesArg?.toTypedArray()
     val authority: String? = call.argument("kAuthority")
@@ -67,12 +62,12 @@ class FlutterMicrosoftAuthenticationPlugin: MethodCallHandler {
       return
     }
 
-    createSingleAccountPublicClientApplication(configPath)
-
     when(call.method){
       "acquireTokenInteractively" -> acquireTokenInteractively(scopes, authority, result)
       "acquireTokenSilently" -> acquireTokenSilently(scopes, authority, result)
       "loadAccount" -> loadAccount(result)
+      "signOut" -> signOut(result)
+      "init" -> initPlugin(configPath)
       else -> result.notImplemented()
     }
 
@@ -108,6 +103,10 @@ class FlutterMicrosoftAuthenticationPlugin: MethodCallHandler {
     }
   }
 
+  private fun initPlugin(assetPath: String) {
+    createSingleAccountPublicClientApplication(assetPath)
+  }
+
   private fun createSingleAccountPublicClientApplication(assetPath: String) {
     val configFile = getConfigFile(assetPath)
     val context: Context = mainActivity.applicationContext
@@ -122,6 +121,7 @@ class FlutterMicrosoftAuthenticationPlugin: MethodCallHandler {
                  * This requires "account_mode" : "SINGLE" in the config json file.
                  *
                  */
+                Log.d(TAG, "INITIALIZED")
                 mSingleAccountApp = application
               }
 
@@ -132,20 +132,33 @@ class FlutterMicrosoftAuthenticationPlugin: MethodCallHandler {
   }
 
   private fun acquireTokenInteractively(scopes: Array<String>, authority: String, result: Result) {
+    if (mSingleAccountApp == null) {
+      result.error("MsalClientException", "Account not initialized", null)
+    }
+
     return mSingleAccountApp!!.signIn(mainActivity, "", scopes, getAuthInteractiveCallback(result))
   }
 
   private fun acquireTokenSilently(scopes: Array<String>, authority: String, result: Result) {
+    if (mSingleAccountApp == null) {
+      result.error("MsalClientException", "Account not initialized", null)
+    }
+
     return mSingleAccountApp!!.acquireTokenSilentAsync(scopes, authority, getAuthSilentCallback(result))
   }
 
   private fun signOut(result: Result){
+    if (mSingleAccountApp == null) {
+      result.error("MsalClientException", "Account not initialized", null)
+    }
+
     return mSingleAccountApp!!.signOut(object : ISingleAccountPublicClientApplication.SignOutCallback {
       override fun onSignOut() {
         result.success("SUCCESS")
       }
 
       override fun onError(exception: MsalException) {
+        Log.e(TAG, exception.message)
         result.error("ERROR", exception.errorCode, null)
       }
     })
@@ -227,6 +240,10 @@ class FlutterMicrosoftAuthenticationPlugin: MethodCallHandler {
   }
 
   private fun loadAccount(result: Result) {
+    if (mSingleAccountApp == null) {
+      result.error("MsalClientException", "Account not initialized", null)
+    }
+
     return mSingleAccountApp!!.getCurrentAccountAsync(object :
             ISingleAccountPublicClientApplication.CurrentAccountCallback {
       override fun onAccountLoaded(activeAccount: IAccount?) {
@@ -239,6 +256,7 @@ class FlutterMicrosoftAuthenticationPlugin: MethodCallHandler {
         if (currentAccount == null) {
           // Perform a cleanup task as the signed-in account changed.
           Log.d(TAG, "No Account")
+          result.success(null)
         }
       }
 

example/.flutter-plugins-dependencies

@@ -0,0 +1 @@
+{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"flutter_microsoft_authentication","dependencies":[]}]}

example/android/gradle.properties

@@ -1,2 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 
+android.enableR8=true

example/lib/main.dart

@@ -33,6 +33,7 @@ class _MyAppState extends State<MyApp> {
       kScopes: ["User.Read", "User.ReadBasic.All"],
       androidConfigAssetPath: "assets/android_auth_config.json"
     );
+    print('INITIALIZED FMA');
   }
 
   Future<void> _acquireTokenInteractively() async {

example/pubspec.lock

@@ -1,13 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -29,6 +43,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.14.11"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.3"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -47,7 +75,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.0.3"
+    version: "0.0.4"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -67,20 +95,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.3"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.5"
+    version: "0.12.6"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.7"
+    version: "1.1.8"
   path:
     dependency: transitive
     description:
@@ -95,6 +130,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0+1"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0"
   quiver:
     dependency: transitive
     description:
@@ -148,7 +190,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.5"
+    version: "0.2.11"
   typed_data:
     dependency: transitive
     description:
@@ -163,5 +205,12 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
 sdks:
-  dart: ">=2.2.2 <3.0.0"
+  dart: ">=2.4.0 <3.0.0"

lib/flutter_microsoft_authentication.dart

@@ -19,6 +19,9 @@ class FlutterMicrosoftAuthentication {
     _kAuthority = kAuthority;
     _kScopes = kScopes;
     _androidConfigAssetPath = androidConfigAssetPath;
+
+    if (Platform.isAndroid)
+      _channel.invokeMethod("init", _createMethodcallArguments());
   }
 
   Map<String, dynamic> _createMethodcallArguments() {
@@ -34,24 +37,28 @@ class FlutterMicrosoftAuthentication {
     return res;
   }
 
+  /// Acquire auth token with interactive flow.
   Future<String> get acquireTokenInteractively async {
     final String token = await _channel.invokeMethod(
         'acquireTokenInteractively', _createMethodcallArguments());
     return token;
   }
 
+  /// Acquire auth token silently.
   Future<String> get acquireTokenSilently async {
     final String token = await _channel.invokeMethod(
         'acquireTokenSilently', _createMethodcallArguments());
     return token;
   }
 
+  /// Android only. Get username of current active account.
   Future<String> get loadAccount async {
     final result = await _channel.invokeMethod(
         'loadAccount', _createMethodcallArguments());
     return result;
   }
 
+  /// Sign out of current active account.
   Future<String> get signOut async {
     final String token =
         await _channel.invokeMethod('signOut', _createMethodcallArguments());