Merge pull request #120 from auth0/fix-npe-on-webauth-cancel

Fix bug when canceling WebAuth flow
auth0 · Oct 5, 2017 · ed6b146 · ed6b146
2 parents bff4601 + 38ca0e4
commit ed6b146
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 76 deletions.
diff --git a/auth0/src/main/java/com/auth0/android/provider/AuthenticationActivity.java b/auth0/src/main/java/com/auth0/android/provider/AuthenticationActivity.java
@@ -14,22 +14,23 @@ public class AuthenticationActivity extends Activity {
     static final String EXTRA_USE_BROWSER = "com.auth0.android.EXTRA_USE_BROWSER";
     static final String EXTRA_USE_FULL_SCREEN = "com.auth0.android.EXTRA_USE_FULL_SCREEN";
     static final String EXTRA_CONNECTION_NAME = "com.auth0.android.EXTRA_CONNECTION_NAME";
+    static final String EXTRA_AUTHORIZE_URI = "com.auth0.android.EXTRA_AUTHORIZE_URI";
     private static final String EXTRA_INTENT_LAUNCHED = "com.auth0.android.EXTRA_INTENT_LAUNCHED";
 
     private boolean intentLaunched;
     private CustomTabsController customTabsController;
 
     static void authenticateUsingBrowser(Context context, Uri authorizeUri) {
         Intent intent = new Intent(context, AuthenticationActivity.class);
-        intent.setData(authorizeUri);
+        intent.putExtra(AuthenticationActivity.EXTRA_AUTHORIZE_URI, authorizeUri);
         intent.putExtra(AuthenticationActivity.EXTRA_USE_BROWSER, true);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         context.startActivity(intent);
     }
 
     static void authenticateUsingWebView(Activity activity, Uri authorizeUri, int requestCode, String connection, boolean useFullScreen) {
         Intent intent = new Intent(activity, AuthenticationActivity.class);
-        intent.setData(authorizeUri);
+        intent.putExtra(AuthenticationActivity.EXTRA_AUTHORIZE_URI, authorizeUri);
         intent.putExtra(AuthenticationActivity.EXTRA_USE_BROWSER, false);
         intent.putExtra(AuthenticationActivity.EXTRA_USE_FULL_SCREEN, useFullScreen);
         intent.putExtra(AuthenticationActivity.EXTRA_CONNECTION_NAME, connection);
@@ -77,6 +78,7 @@ protected void onResume() {
         if (getIntent().getData() != null) {
             deliverSuccessfulAuthenticationResult(getIntent());
         }
+        setResult(RESULT_CANCELED);
         finish();
     }
 
@@ -91,7 +93,7 @@ protected void onDestroy() {
 
     private void launchAuthenticationIntent() {
         Bundle extras = getIntent().getExtras();
-        final Uri authorizeUri = getIntent().getData();
+        Uri authorizeUri = extras.getParcelable(EXTRA_AUTHORIZE_URI);
         if (!extras.getBoolean(EXTRA_USE_BROWSER, true)) {
             Intent intent = new Intent(this, WebAuthActivity.class);
             intent.setData(authorizeUri);

diff --git a/auth0/src/test/java/com/auth0/android/provider/AuthenticationActivityTest.java b/auth0/src/test/java/com/auth0/android/provider/AuthenticationActivityTest.java
@@ -23,6 +23,7 @@
 import static android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent;
 import static android.support.test.espresso.intent.matcher.IntentMatchers.hasData;
 import static android.support.test.espresso.intent.matcher.IntentMatchers.hasFlag;
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.notNullValue;
@@ -144,9 +145,6 @@ public void shouldCancelAuthenticationUsingBrowser() throws Exception {
         activityController.pause().stop();
         //Browser is shown
 
-        Intent authenticationResultIntent = new Intent();
-        authenticationResultIntent.setData(null);
-        activityController.newIntent(authenticationResultIntent);
         activityController.start().resume();
 
         assertThat(activity.getDeliveredIntent(), is(nullValue()));
@@ -254,9 +252,7 @@ public void shouldCancelAuthenticationUsingWebView() throws Exception {
         activityController.pause().stop();
         //WebViewActivity is shown
 
-        Intent authenticationResultIntent = new Intent();
-        authenticationResultIntent.setData(resultUri);
-        activityShadow.receiveResult(webViewIntent.intent, Activity.RESULT_CANCELED, authenticationResultIntent);
+        activityShadow.receiveResult(webViewIntent.intent, Activity.RESULT_CANCELED, null);
 
         assertThat(activity.getDeliveredIntent(), is(nullValue()));
         assertThat(activity.isFinishing(), is(true));
@@ -274,9 +270,10 @@ public void shouldLaunchForBrowserAuthentication() throws Exception {
         Assert.assertThat(intent, is(notNullValue()));
         Assert.assertThat(intent, hasComponent(AuthenticationActivity.class.getName()));
         Assert.assertThat(intent, hasFlag(Intent.FLAG_ACTIVITY_CLEAR_TOP));
-        Assert.assertThat(intent, hasData(uri));
+        Assert.assertThat(intent, not(hasData(uri)));
 
         Bundle extras = intent.getExtras();
+        Assert.assertThat((Uri) extras.getParcelable(AuthenticationActivity.EXTRA_AUTHORIZE_URI), is(uri));
         Assert.assertThat(extras.containsKey(AuthenticationActivity.EXTRA_CONNECTION_NAME), is(false));
         Assert.assertThat(extras.containsKey(AuthenticationActivity.EXTRA_USE_FULL_SCREEN), is(false));
         Assert.assertThat(extras.containsKey(AuthenticationActivity.EXTRA_USE_BROWSER), is(true));
@@ -293,9 +290,10 @@ public void shouldLaunchForWebViewAuthentication() throws Exception {
         Assert.assertThat(intent, is(notNullValue()));
         Assert.assertThat(intent, hasComponent(AuthenticationActivity.class.getName()));
         Assert.assertThat(intent, hasFlag(Intent.FLAG_ACTIVITY_CLEAR_TOP));
-        Assert.assertThat(intent, hasData(uri));
+        Assert.assertThat(intent, not(hasData(uri)));
 
         Bundle extras = intentCaptor.getValue().getExtras();
+        Assert.assertThat((Uri) extras.getParcelable(AuthenticationActivity.EXTRA_AUTHORIZE_URI), is(uri));
         Assert.assertThat(extras.containsKey(AuthenticationActivity.EXTRA_CONNECTION_NAME), is(true));
         Assert.assertThat(extras.getString(AuthenticationActivity.EXTRA_CONNECTION_NAME), is("facebook"));
         Assert.assertThat(extras.containsKey(AuthenticationActivity.EXTRA_USE_FULL_SCREEN), is(true));