Changes for v1.6.0

Author: manish2788

README.md

@@ -1,4 +1,4 @@
-# cordova-plugin-oracle-idm-auth 1.5.1
+# cordova-plugin-oracle-idm-auth 1.6.0
 
 ## About the cordova-plugin-oracle-idm-auth
 The plugin provides authentication and authorization functionality for cordova based mobile applications,

RELEASENOTES.md

@@ -1,5 +1,8 @@
 # Release Notes
 
+## 1.6.0 (23 Oct, 2020)
+* Support for two legged flow - FedAuth followed by a Basic Auth with native prompt.
+
 ## 1.5.1 (25 May, 2020)
 * Support for parsing password as character array.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-oracle-idm-auth",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Provides authentication and authorization functionality using the Oracle IDM SDK, supporting standard protocols like Basic Auth, OAUTH, OpenID Connect and WebSSO.",
   "cordova": {
     "id": "cordova-plugin-oracle-idm-auth",

plugin.xml

@@ -6,7 +6,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-oracle-idm-auth"
-        version="1.5.1">
+        version="1.6.0">
   <name>cordova-plugin-oracle-idm-auth</name>
   <description>Provides authentication and authorization functionality using the Oracle IDM SDK, supporting standard protocols like Basic Auth, OAUTH, OpenID Connect and WebSSO</description>
   <keywords>cordova,idm,authentication,auth</keywords>
@@ -59,6 +59,7 @@
     <resource-file src="src/android/res/layout/activity_web_view.xml" target="res/layout/activity_web_view.xml"/>
     <resource-file src="src/android/res/layout/fingerprint_dialog_content.xml" target="res/layout/fingerprint_dialog_content.xml"/>
     <resource-file src="src/android/res/layout/fingerprint_dialog_container.xml" target="res/layout/fingerprint_dialog_container.xml"/>
+    <resource-file src="src/android/res/layout/login_dialog.xml" target="res/layout/login_dialog.xml"/>
     <resource-file src="src/android/res/values/colors.xml" target="res/values/colors.xml"/>
     <resource-file src="src/android/res/values/cordova-plugin-oracle-idm-auth_strings.xml" target="res/values/cordova-plugin-oracle-idm-auth_strings.xml"/>
     <resource-file src="src/android/res/drawable/ic_fingerprint_error.xml" target="res/drawable/ic_fingerprint_error.xml"/>

src/android/res/layout/login_dialog.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="20dp"
+    android:paddingStart="20dp"
+    android:paddingLeft="20dp"
+    android:paddingTop="20dp"
+    android:paddingEnd="20dp"
+    android:paddingRight="20dp"
+    android:paddingBottom="20dp">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Username" />
+
+    <EditText
+        android:id="@+id/httpAuthUsername"
+        android:layout_width="341dp"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:inputType="textPersonName" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:text="Password" />
+
+    <EditText
+        android:id="@+id/httpAuthPassword"
+        android:layout_width="341dp"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:inputType="textPassword" />
+
+</LinearLayout>

src/android/src/oracle/idm/auth/plugin/IdmAuthentication.java

@@ -415,7 +415,15 @@ public CHALLENGE_TYPE getChallengeType()
           fields.put(_CHALLENGE_ERROR, IdmAuthenticationPlugin.errorToMap(errorCode));
         }
 
-        _loginCallback.success(new JSONObject(fieldsMap));
+        if(fields.containsKey("http_auth_host_key")) {
+          _mainActivity.runOnUiThread(() -> {
+            _localBroadcastManager.sendBroadcast(new Intent(WebViewActivity.DISPLAY_LOGIN_DIALOG));
+          });
+        }
+        else {
+          _loginCallback.success(new JSONObject(fieldsMap));
+        }
+
         break;
       case EMBEDDED_WEBVIEW_REQUIRED:
         Log.d(TAG, "Handling embedded webview challenge.");

src/android/src/oracle/idm/auth/plugin/WebViewActivity.java

@@ -10,10 +10,13 @@
 import java.util.List;
 import java.util.Map;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.LinearLayout;
 import oracle.idm.auth.plugin.util.ResourceHelper;
 import oracle.idm.mobile.OMSecurityConstants;
@@ -35,6 +38,7 @@ public class WebViewActivity extends Activity
   public static final String FINISH_WEB_VIEW_INTENT = "finishWebView";
   public static final String CANCEL_WEB_VIEW_INTENT = "cancelFromWebView";
   public static final String BUTTONS_WEB_VIEW_PROP = "buttonsAvailable";
+  public static final String DISPLAY_LOGIN_DIALOG = "displayLoginDialog";
 
   @Override
   protected void onCreate(Bundle savedInstanceState)
@@ -60,6 +64,7 @@ protected void onCreate(Bundle savedInstanceState)
     _broadcastReceiver = _createBroadcastReceiver();
     _localBroadcastManager = LocalBroadcastManager.getInstance(this);
     _localBroadcastManager.registerReceiver(_broadcastReceiver, new IntentFilter(FINISH_WEB_VIEW_INTENT));
+    _localBroadcastManager.registerReceiver(_broadcastReceiver, new IntentFilter(DISPLAY_LOGIN_DIALOG));
 
     _proceed(completionHandler);
     Log.d(TAG, "Created webview activity and passed on to IDM SDK.");
@@ -81,6 +86,42 @@ private void _proceed(IdmAuthentication.CompletionHandler completionHandler)
     completionHandler.proceed(responseFields);
   }
 
+  private void _showLoginDialog()
+  {
+    Log.d(TAG, "Displaying Login Dialog.");
+    IdmAuthentication.CompletionHandler completionHandler = IdmAuthentication.getCompletionHandler();
+    final AlertDialog.Builder builder = new AlertDialog.Builder(WebViewActivity.this);
+
+    builder.setTitle("Please provide credentials").setCancelable(false)
+      .setPositiveButton("Submit", new DialogInterface.OnClickListener() {
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+          EditText usernameField = (EditText) _authView.findViewById(_R.getIdentifier(_HTTP_AUTH_USERNAME));
+          EditText passwordField = (EditText) _authView.findViewById(_R.getIdentifier(_HTTP_AUTH_PASSWORD));
+          String username = usernameField.getText().toString();
+          char[] password = new char[passwordField.getText().length()];
+          passwordField.getText().getChars(0, password.length, password, 0);
+
+          Map<String, Object> outParams = new HashMap<>();
+          outParams.put(OMSecurityConstants.Challenge.USERNAME_KEY, username);
+          outParams.put(OMSecurityConstants.Challenge.PASSWORD_KEY_2, password);
+          completionHandler.proceed(outParams);
+
+        }
+      })
+      .setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+          completionHandler.cancel();
+        }
+    });
+
+    AlertDialog alertDialog = builder.create();
+    _authView = alertDialog.getLayoutInflater().inflate(_R.getLayout("login_dialog"), null);
+    alertDialog.setView(_authView);
+    alertDialog.show();
+  }
+
   private BroadcastReceiver _createBroadcastReceiver()
   {
     return new BroadcastReceiver()
@@ -95,6 +136,10 @@ public void onReceive(Context context, Intent intent)
             _webView.destroy();
             finish();
           }
+          else if (DISPLAY_LOGIN_DIALOG.equals(action))
+          {
+            _showLoginDialog();
+          }
         }
     };
   }
@@ -221,9 +266,11 @@ public void onClick(View v)
   private WebViewClient _webViewClient;
   private BroadcastReceiver _broadcastReceiver;
   private LocalBroadcastManager _localBroadcastManager;
+  private View _authView;
 
   private static final String TAG = WebViewActivity.class.getSimpleName();
   private static final ResourceHelper _R = ResourceHelper.INSTANCE;
+  private static final String _LOGIN_DIALOG_LAYOUT = "login_dialog";
   private static final String _ACTIVITY_WEB_VIEW = "activity_web_view";
   private static final String _IDM_WEB_VIEW = "idmWebView";
   private static final String _BTN_LAYOUT = "button_layout";
@@ -237,4 +284,6 @@ public void onClick(View v)
   private static final String _BACK_BTN_FLAG = "BACK";
   private static final String _ALL_BTN_FLAG = "ALL";
   private static final String _NO_BTN_FLAG = "NONE";
+  private static final String _HTTP_AUTH_USERNAME = "httpAuthUsername";
+  private static final String _HTTP_AUTH_PASSWORD = "httpAuthPassword";
 }

src/ios/src/IdmAuthentication.m

@@ -24,6 +24,9 @@
 #define AUTH_WEB_VIEW @"AuthWebView"
 #define CHALLENGE_ERROR @"error"
 #define PROP_ENABLE_WEB_VIEW_BUTTONS @"EnableWebViewButtons"
+#define LOGIN_DIALOG_TITLE @"Please provide credentials"
+#define USERNAME_PLACEHOLDER @"Enter Username"
+#define PASSWORD_PLACEHOLDER @"Enter Password"
 
 
 #ifdef DEBUG
@@ -385,6 +388,50 @@ -(void) mobileSecurityService:(OMMobileSecurityService *)mss
   self.setupCompletionCallback(self, error);
   IdmLog(@"completedSetupWithConfiguration done with Error %@", error);
 }
+
+/**
+ * Method to show login dialog.
+ */
+- (void) showLoginDialog: (NSDictionary*) fields{
+  UIAlertController* loginAlert = [UIAlertController alertControllerWithTitle:LOGIN_DIALOG_TITLE message:nil preferredStyle:UIAlertControllerStyleAlert];
+  
+  [loginAlert addTextFieldWithConfigurationHandler:^(UITextField* usernameField) {
+    usernameField.placeholder = USERNAME_PLACEHOLDER;
+    usernameField.clearButtonMode = UITextFieldViewModeWhileEditing;
+    usernameField.borderStyle = UITextBorderStyleRoundedRect;
+  }];
+
+  [loginAlert addTextFieldWithConfigurationHandler:^(UITextField* passwordField) {
+    passwordField.placeholder = PASSWORD_PLACEHOLDER;
+    passwordField.clearButtonMode = UITextFieldViewModeWhileEditing;
+    passwordField.borderStyle = UITextBorderStyleRoundedRect;
+    passwordField.secureTextEntry = YES;
+  }];
+  
+  
+  UIAlertAction* submitAction = [UIAlertAction actionWithTitle: @ "Submit"
+                            style: UIAlertActionStyleDefault handler: ^ (UIAlertAction * _Nonnull action) {
+
+    [fields setValue:loginAlert.textFields[0].text forKey:OM_USERNAME];
+    [fields setValue:loginAlert.textFields[1].text forKey:OM_PASSWORD];
+    
+    self.challenge.authChallengeHandler(fields, OMProceed);
+    NSLog(@ "Submit Tapped");
+  }];
+  
+  UIAlertAction* cancelAction = [UIAlertAction actionWithTitle: @ "Cancel"
+                            style: UIAlertActionStyleDefault handler: ^ (UIAlertAction * _Nonnull action) {
+    [self dismissAuthView];
+    self.challenge.authChallengeHandler(nil, OMCancel);
+    NSLog(@ "Cancel Tapped");
+  }];
+  
+  [loginAlert addAction: submitAction];
+  [loginAlert addAction: cancelAction];
+
+  [self.authViewController presentViewController:loginAlert animated: true completion: nil];
+}
+
 /**
  * OMMobileSecurityServiceDelegate protocol implementation
  */
@@ -401,10 +448,16 @@ -(void) mobileSecurityService:(OMMobileSecurityService *)mss
   }
 
   if (challenge.challengeType == OMChallengeUsernamePassword) {
-    CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:@{@"challengeFields": fields}];
-    [self.loginLogoutCommandDelegate sendPluginResult:result callbackId:self.loginLogoutCallbackId];
-    IdmLog(@"Sending challenge back to user to fill up.");
-    return;
+    if([fields objectForKey:@"webview_key"]) {
+      [self showLoginDialog:fields];
+    }
+    else {
+      CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:@{@"challengeFields": fields}];
+      [self.loginLogoutCommandDelegate sendPluginResult:result callbackId:self.loginLogoutCallbackId];
+      IdmLog(@"Sending challenge back to user to fill up.");
+        
+      return;
+    }
   } else if (challenge.challengeType == OMChallengeEmbeddedBrowser) {
     self.challenge = challenge;
     IdmLog(@"Launching webview and redirecting user to login web page.");