Skip to content

Commit 49bc78a

Browse files
committed
fix issue with opening auth fragment when AcquireTokenParameters.Builder.withFragment method is used
1 parent 204747c commit 49bc78a

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ vNext
33
- [PATCH] Translate MFA token error to UIRequiredException instead of ServiceException (#2538)
44
- [MINOR] Add Child Spans for Interactive Span (#2516)
55
- [MINOR] For MSAL CPP flows, match exact claims when deleting AT with intersecting scopes (#2548)
6+
- [MINOR] Fix issue with fragment displaying when 'AcquireTokenParameters.Builder().withFragment()' is used (#2274)
67

78
Version 18.2.2
89
----------

common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AndroidAuthorizationStrategy.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected void launchIntent(@NonNull Intent intent) throws ClientException {
7878
final Fragment fragment = mReferencedFragment.get();
7979

8080
if (fragment != null) {
81-
final Fragment authFragment = AuthorizationActivityFactory.getAuthorizationFragmentFromStartIntent(intent);
81+
final Fragment authFragment = getAuthorizationFragment(intent);
8282

8383
final FragmentManager fragmentManager = fragment.getFragmentManager();
8484
if (fragmentManager == null) {
@@ -98,4 +98,15 @@ protected void launchIntent(@NonNull Intent intent) throws ClientException {
9898
}
9999
activity.startActivity(intent);
100100
}
101+
102+
private static Fragment getAuthorizationFragment(@NonNull Intent intent) {
103+
if (intent.getExtras() != null) {
104+
return AuthorizationActivityFactory.getAuthorizationFragmentFromStartIntentWithState(
105+
intent,
106+
intent.getExtras()
107+
);
108+
}
109+
110+
return AuthorizationActivityFactory.getAuthorizationFragmentFromStartIntent(intent);
111+
}
101112
}

0 commit comments

Comments
 (0)