Add prompt parameter (#51)

* Add support for the Prompt parameter available in MS ios and android libraries while preserving the behaviour defaulting to select_account

* Added promptType to acquireTokenInteractively call from acquireTokenSilently on fallback

Author: joeplan4

android/src/main/java/nl/recognize/msauthplugin/MsAuthPlugin.java

@@ -48,9 +48,34 @@ public void login(final PluginCall call) {
                 return;
             }
 
+            Prompt prompt = Prompt.SELECT_ACCOUNT;
+            if (call.hasOption("prompt")) {
+                switch (call.getString("prompt").toLowerCase()) {
+                    case "select_account":
+                        prompt = Prompt.SELECT_ACCOUNT;
+                        break;
+                    case "login":
+                        prompt = Prompt.LOGIN;
+                        break;
+                    case "consent":
+                        prompt = Prompt.CONSENT;
+                        break;
+                    case "none":
+                        prompt = Prompt.WHEN_REQUIRED;
+                        break;
+                    case "create":
+                        prompt = Prompt.CREATE;
+                        break;
+                    default:
+                        Logger.warn("Unrecognized prompt option: " + call.getString("prompt"));
+                        break;
+                }
+            }
+
             this.acquireToken(
                     context,
                     call.getArray("scopes").toList(),
+                    prompt,
                     tokenResult -> {
                         if (tokenResult != null) {
                             JSObject result = new JSObject();
@@ -114,13 +139,14 @@ protected String getAuthorityUrl(ISingleAccountPublicClientApplication context)
         return context.getConfiguration().getDefaultAuthority().getAuthorityURL().toString();
     }
 
-    private void acquireToken(ISingleAccountPublicClientApplication context, List<String> scopes, final TokenResultCallback callback)
+    private void acquireToken(ISingleAccountPublicClientApplication context, List<String> scopes, Prompt prompt, final TokenResultCallback callback)
         throws MsalException, InterruptedException {
         String authority = getAuthorityUrl(context);
 
         ICurrentAccountResult result = context.getCurrentAccount();
         if (result.getCurrentAccount() != null) {
             try {
+
                 Logger.info("Starting silent login flow");
                 AcquireTokenSilentParameters.Builder builder = new AcquireTokenSilentParameters.Builder()
                     .withScopes(scopes)
@@ -148,7 +174,7 @@ private void acquireToken(ISingleAccountPublicClientApplication context, List<St
         AcquireTokenParameters.Builder params = new AcquireTokenParameters.Builder()
             .startAuthorizationFromActivity(this.getActivity())
             .withScopes(scopes)
-            .withPrompt(Prompt.SELECT_ACCOUNT)
+            .withPrompt(prompt)
             .withCallback(
                 new AuthenticationCallback() {
                     @Override

ios/Plugin/Plugin.swift

@@ -16,6 +16,24 @@ public class MsAuthPlugin: CAPPlugin {
 
         let scopes = call.getArray("scopes", String.self) ?? []
 
+        var promptType: MSALPromptType = .selectAccount
+        if let prompt = call.getString("prompt")?.lowercased() {
+            switch prompt {
+            case "select_account":
+                promptType = .selectAccount
+            case "login":
+                promptType = .login
+            case "consent":
+                promptType = .consent
+            case "none":
+                promptType = .promptIfNecessary
+            case "create":
+                promptType = .create
+            default:
+                print("Unrecognized prompt option: \(prompt)")
+            }
+        }
+
         let completion: (MSALResult?) -> Void = { msalResult in
             guard let result = msalResult else {
                 call.reject("Unable to obtain access token")
@@ -31,7 +49,7 @@ public class MsAuthPlugin: CAPPlugin {
 
         loadCurrentAccount(applicationContext: context) { (account) in
             guard let currentAccount = account else {
-                self.acquireTokenInteractively(applicationContext: context, scopes: scopes, completion: completion)
+                self.acquireTokenInteractively(applicationContext: context, scopes: scopes, promptType: promptType, completion: completion)
                 return
             }
 
@@ -224,7 +242,7 @@ public class MsAuthPlugin: CAPPlugin {
 
     }
 
-    func acquireTokenInteractively(applicationContext: MSALPublicClientApplication, scopes: [String], completion: @escaping (MSALResult?) -> Void) {
+    func acquireTokenInteractively(applicationContext: MSALPublicClientApplication, scopes: [String], promptType: MSALPromptType, completion: @escaping (MSALResult?) -> Void) {
         guard let bridgeViewController = bridge?.viewController else {
             print("Unable to get Capacitor bridge.viewController")
 
@@ -235,7 +253,7 @@ public class MsAuthPlugin: CAPPlugin {
         let wvParameters = MSALWebviewParameters(authPresentationViewController: bridgeViewController)
         let parameters = MSALInteractiveTokenParameters(scopes: scopes, webviewParameters: wvParameters)
 
-        parameters.promptType = .selectAccount
+        parameters.promptType = promptType
 
         applicationContext.acquireToken(with: parameters) { (result, error) in
             if let error = error {
@@ -268,7 +286,7 @@ public class MsAuthPlugin: CAPPlugin {
 
                     if nsError.code == MSALError.interactionRequired.rawValue {
                         DispatchQueue.main.async {
-                            self.acquireTokenInteractively(applicationContext: applicationContext, scopes: scopes, completion: completion)
+                            self.acquireTokenInteractively(applicationContext: applicationContext, scopes: scopes, promptType: .selectAccount, completion: completion)
                         }
                         return
                     }

src/definitions.ts

@@ -12,6 +12,7 @@ export interface BaseOptions {
 export interface LoginOptions extends BaseOptions {
   /** MSAL always sends the scopes 'openid profile offline_access'.  Do not include any of these scopes in the scopes parameter. */
   scopes?: string[];
+  prompt?: 'login' | 'none' | 'consent' | 'create' | 'select_account';
 }
 
 export type LogoutOptions = BaseOptions;