-
Notifications
You must be signed in to change notification settings - Fork 48
Remove back button interception from SilentWebViewAuthorizationFragment, Fixes AB#3547597 #3030
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
dccb035
Initial plan
Copilot 081d03a
Remove back button event handling for SilentWebViewAuthorizationFragment
Copilot 22ca1de
Add changelog entry for #3030
Copilot 63af79e
Replace Robolectric test with mockito-kotlin spy test for SilentWebVi…
Copilot ac4d002
Revert mockito-kotlin spy test changes (restoring Robolectric test)
Copilot b6f1f3d
fix test
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
...osoft/identity/common/internal/providers/oauth2/SilentWebViewAuthorizationFragmentTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // All rights reserved. | ||
| // | ||
| // This code is licensed under the MIT License. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files(the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and / or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions : | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
| package com.microsoft.identity.common.internal.providers.oauth2 | ||
|
|
||
| import android.view.View | ||
| import androidx.activity.OnBackPressedDispatcher | ||
| import androidx.fragment.app.FragmentActivity | ||
| import androidx.lifecycle.Lifecycle | ||
| import androidx.lifecycle.LifecycleOwner | ||
| import androidx.lifecycle.LifecycleRegistry | ||
| import org.junit.Assert.assertFalse | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.mockito.kotlin.doReturn | ||
| import org.mockito.kotlin.mock | ||
| import org.mockito.kotlin.spy | ||
| import org.mockito.kotlin.whenever | ||
| import org.robolectric.RobolectricTestRunner | ||
|
|
||
| /** | ||
| * Tests for [SilentWebViewAuthorizationFragment]. | ||
| */ | ||
| @RunWith(RobolectricTestRunner::class) | ||
| class SilentWebViewAuthorizationFragmentTest { | ||
|
|
||
| /** | ||
| * Verifies that [SilentWebViewAuthorizationFragment.onViewCreated] does NOT register an | ||
| * [androidx.activity.OnBackPressedCallback] on the host activity's | ||
| * [androidx.activity.OnBackPressedDispatcher]. Silent flows are invisible to the user and | ||
| * must never intercept the device back button, so the callback registered by | ||
| * [AuthorizationFragment.onViewCreated] must be skipped. | ||
| */ | ||
| @Test | ||
| fun onViewCreated_doesNotRegisterOnBackPressedCallback() { | ||
| // Real dispatcher to track callback registration. | ||
| val dispatcher = OnBackPressedDispatcher() | ||
|
|
||
| // Mock activity that returns our dispatcher. | ||
| val mockActivity = mock<FragmentActivity> { | ||
| on { onBackPressedDispatcher } doReturn dispatcher | ||
| } | ||
|
|
||
| // Mock lifecycle owner in RESUMED state for lifecycleScope.launch. | ||
| val lifecycleOwner = mock<LifecycleOwner>() | ||
| val lifecycleRegistry = LifecycleRegistry.createUnsafe(lifecycleOwner) | ||
mohitc1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| lifecycleRegistry.currentState = Lifecycle.State.RESUMED | ||
| whenever(lifecycleOwner.lifecycle).thenReturn(lifecycleRegistry) | ||
|
|
||
| // Spy the fragment and stub only what onViewCreated needs. | ||
| val fragment = spy(SilentWebViewAuthorizationFragment()) | ||
| doReturn(mockActivity).whenever(fragment).requireActivity() | ||
| doReturn(lifecycleOwner).whenever(fragment).viewLifecycleOwner | ||
mohitc1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // Call onViewCreated directly with a mock view. | ||
| fragment.onViewCreated(mock<View>(), null) | ||
|
|
||
| // No back-pressed callback should have been registered by the silent fragment. | ||
| assertFalse( | ||
| "SilentWebViewAuthorizationFragment must not register an OnBackPressedCallback", | ||
| dispatcher.hasEnabledCallbacks() | ||
| ) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.