Skip to content

Commit

Permalink
fix issue with opening auth fragment when AcquireTokenParameters.Buil…
Browse files Browse the repository at this point in the history
…der.withFragment method is used
  • Loading branch information
VolodaUa committed Nov 28, 2024
1 parent 204747c commit 49bc78a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ vNext
- [PATCH] Translate MFA token error to UIRequiredException instead of ServiceException (#2538)
- [MINOR] Add Child Spans for Interactive Span (#2516)
- [MINOR] For MSAL CPP flows, match exact claims when deleting AT with intersecting scopes (#2548)
- [MINOR] Fix issue with fragment displaying when 'AcquireTokenParameters.Builder().withFragment()' is used (#2274)

Version 18.2.2
----------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ protected void launchIntent(@NonNull Intent intent) throws ClientException {
final Fragment fragment = mReferencedFragment.get();

if (fragment != null) {
final Fragment authFragment = AuthorizationActivityFactory.getAuthorizationFragmentFromStartIntent(intent);
final Fragment authFragment = getAuthorizationFragment(intent);

final FragmentManager fragmentManager = fragment.getFragmentManager();
if (fragmentManager == null) {
Expand All @@ -98,4 +98,15 @@ protected void launchIntent(@NonNull Intent intent) throws ClientException {
}
activity.startActivity(intent);
}

private static Fragment getAuthorizationFragment(@NonNull Intent intent) {
if (intent.getExtras() != null) {
return AuthorizationActivityFactory.getAuthorizationFragmentFromStartIntentWithState(
intent,
intent.getExtras()
);
}

return AuthorizationActivityFactory.getAuthorizationFragmentFromStartIntent(intent);
}
}

0 comments on commit 49bc78a

Please sign in to comment.