Skip to content
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.

Sign up for GitHub

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

Rename AndroidActivityInteractiveTokenCommandParameters #2247

Merged
merged 9 commits into from
Jan 29, 2025
Merged

Rename AndroidActivityInteractiveTokenCommandParameters #2247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ca9423
siwg
mohitc1 Jan 17, 2025
09e78ac
common submodule'
mohitc1 Jan 21, 2025
fb7b039
revert siwg UX
mohitc1 Jan 21, 2025
e585921
merge dev
mohitc1 Jan 24, 2025
ab2e35f
changelog
mohitc1 Jan 27, 2025
a1f413e
sync common
mohitc1 Jan 28, 2025
a567032
sync common
mohitc1 Jan 29, 2025
2df4771
Merge branch 'dev' into mchand/siwg-broker-support
mohitc1 Jan 29, 2025
3519592
sync common
mohitc1 Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr

vNext
----------
- [MINOR] Change AndroidActivityInteractiveTokenCommandParameters to AndroidInteractiveTokenCommandParameters (#2247)
- [MINOR] Move native auth public methods to parameter class (#2245)
- [MINOR] Add support for claims requests for native auth sign in (#2246)

Expand Down
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 47 files
+2 −0 changelog.txt
+1 −1 common/src/main/java/com/microsoft/identity/common/adal/internal/AuthenticationConstants.java
+4 −1 common/src/main/java/com/microsoft/identity/common/components/AndroidPlatformComponentsFactory.java
+6 −0 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerRequest.java
+4 −1 ...va/com/microsoft/identity/common/internal/commands/parameters/AndroidInteractiveTokenCommandParameters.java
+3 −3 common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java
+9 −1 common/src/main/java/com/microsoft/identity/common/internal/controllers/LocalMSALController.java
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/msafederation/IMsaFederatedCredentialCallback.kt
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/msafederation/IMsaFederatedSignInProvider.kt
+4 −1 common/src/main/java/com/microsoft/identity/common/internal/msafederation/MsaFederatedCredential.kt
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/msafederation/MsaFederatedSignInParameters.kt
+3 −3 common/src/main/java/com/microsoft/identity/common/internal/msafederation/MsaFederatedSignInProviderFactory.kt
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/msafederation/MsaFederatedSignInProviderName.kt
+41 −0 common/src/main/java/com/microsoft/identity/common/internal/msafederation/MsaFederationExtensions.kt
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/msafederation/google/GoogleSignInProvider.kt
+2 −2 ...ain/java/com/microsoft/identity/common/internal/msafederation/google/ISignInWithGoogleCredentialCallback.kt
+8 −3 common/src/main/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleApi.kt
+7 −12 common/src/main/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleCredential.kt
+5 −5 common/src/main/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleParameters.kt
+0 −24 common/src/main/java/com/microsoft/identity/common/internal/platform/AndroidPlatformUtil.java
+7 −4 common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationActivityFactory.java
+9 −29 common/src/main/java/com/microsoft/identity/common/internal/request/MsalBrokerRequestAdapter.java
+51 −44 common/src/main/java/com/microsoft/identity/common/internal/ui/AndroidAuthorizationStrategyFactory.java
+6 −4 common/src/main/java/com/microsoft/identity/common/internal/ui/CurrentTaskBrowserAuthorizationStrategy.java
+69 −37 common/src/main/java/com/microsoft/identity/common/internal/ui/browser/AndroidBrowserSelector.java
+6 −6 common/src/main/java/com/microsoft/identity/common/internal/ui/browser/BrowserAuthorizationStrategy.java
+0 −61 common/src/main/java/com/microsoft/identity/common/internal/ui/browser/BrowserBlocklist.java
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/ui/browser/CustomTabsManager.java
+4 −2 ...on/src/main/java/com/microsoft/identity/common/internal/ui/browser/DefaultBrowserAuthorizationStrategy.java
+2 −2 common/src/test/java/com/microsoft/identity/common/internal/msafederation/google/MockGoogleSignInProvider.kt
+2 −2 common/src/test/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleApiTest.kt
+16 −3 ...src/test/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleCredentialTest.kt
+3 −3 ...src/test/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleParametersTest.kt
+64 −0 ...src/test/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationActivityFactoryTest.java
+55 −3 common/src/test/java/com/microsoft/identity/common/internal/request/MsalBrokerRequestAdapterTests.java
+33 −62 common/src/test/java/com/microsoft/identity/common/internal/ui/browser/AndroidBrowserSelectorTest.java
+102 −0 common/src/test/java/com/microsoft/identity/common/internal/util/AndroidAuthorizationStrategyFactoryTest.kt
+4 −53 common4j/src/main/com/microsoft/identity/common/java/browser/Browser.java
+49 −0 common4j/src/main/com/microsoft/identity/common/java/browser/IBrowserSelector.java
+50 −0 common4j/src/main/com/microsoft/identity/common/java/browser/NoopBrowserSelector.java
+0 −101 common4j/src/main/com/microsoft/identity/common/java/exception/ErrorStrings.java
+7 −0 common4j/src/main/com/microsoft/identity/common/java/interfaces/IPlatformComponents.java
+4 −0 common4j/src/main/com/microsoft/identity/common/java/interfaces/PlatformComponents.java
+12 −4 common4j/src/main/com/microsoft/identity/common/java/strategies/IAuthorizationStrategyFactory.java
+51 −4 common4j/src/main/com/microsoft/identity/common/java/ui/BrowserDescriptor.java
+0 −7 common4j/src/main/com/microsoft/identity/common/java/util/IPlatformUtil.java
+6 −7 common4j/src/testFixtures/java/com/microsoft/identity/common/components/MockPlatformComponentsFactory.java
9 changes: 5 additions & 4 deletions msal/src/main/java/com/microsoft/identity/client/internal/CommandParametersAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
import com.microsoft.identity.client.IAccount;
import com.microsoft.identity.client.ITenantProfile;
import com.microsoft.identity.client.MultiTenantAccount;
import com.microsoft.identity.common.internal.msafederation.google.SignInWithGoogleApi;
import com.microsoft.identity.common.internal.msafederation.google.SignInWithGoogleCredential;
import com.microsoft.identity.common.internal.msafederation.google.SignInWithGoogleParameters;
import com.microsoft.identity.common.internal.platform.AndroidPlatformUtil;
import com.microsoft.identity.common.java.logging.DiagnosticContext;
import com.microsoft.identity.nativeauth.AuthMethod;
Expand All @@ -42,7 +45,7 @@
import com.microsoft.identity.client.claims.ClaimsRequest;
import com.microsoft.identity.client.claims.RequestedClaimAdditionalInformation;
import com.microsoft.identity.common.components.AndroidPlatformComponentsFactory;
import com.microsoft.identity.common.internal.commands.parameters.AndroidActivityInteractiveTokenCommandParameters;
import com.microsoft.identity.common.internal.commands.parameters.AndroidInteractiveTokenCommandParameters;
import com.microsoft.identity.common.internal.util.StringUtil;
import com.microsoft.identity.common.java.authorities.Authority;
import com.microsoft.identity.common.java.authorities.AzureActiveDirectoryAuthority;
Expand Down Expand Up @@ -166,7 +169,7 @@ public static InteractiveTokenCommandParameters createInteractiveTokenCommandPar
authority
));

final InteractiveTokenCommandParameters commandParameters = AndroidActivityInteractiveTokenCommandParameters
return AndroidInteractiveTokenCommandParameters
.builder()
.activity(parameters.getActivity())
.platformComponents(AndroidPlatformComponentsFactory.createFromActivity(
Expand Down Expand Up @@ -204,8 +207,6 @@ public static InteractiveTokenCommandParameters createInteractiveTokenCommandPar
.correlationId(parameters.getCorrelationId())
.preferredAuthMethod(parameters.getPreferredAuthMethod())
.build();

return commandParameters;
}

public static SilentTokenCommandParameters createSilentTokenCommandParameters(
Expand Down
10 changes: 5 additions & 5 deletions ...oft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/NestedAppHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import com.microsoft.identity.client.ui.automation.utils.UiAutomatorUtils;
import com.microsoft.identity.common.components.AndroidPlatformComponentsFactory;
import com.microsoft.identity.common.internal.broker.BrokerData;
import com.microsoft.identity.common.internal.commands.parameters.AndroidActivityInteractiveTokenCommandParameters;
import com.microsoft.identity.common.internal.commands.parameters.AndroidInteractiveTokenCommandParameters;
import com.microsoft.identity.common.internal.controllers.BrokerMsalController;
import com.microsoft.identity.common.java.authorities.Authority;
import com.microsoft.identity.common.java.authscheme.BearerAuthenticationSchemeInternal;
Expand Down Expand Up @@ -60,7 +60,7 @@

public class NestedAppHelper {

private AndroidActivityInteractiveTokenCommandParameters mInteractiveParameters;
private AndroidInteractiveTokenCommandParameters mInteractiveParameters;

private final ILabAccount mLabAccount;
private final BrokerMsalController mController;
Expand Down Expand Up @@ -116,7 +116,7 @@ public NestedAppHelper(Activity activity, ILabAccount labAccount) {
mAuthorityUrl = "https://login.microsoftonline.com/common";
hubAppClientId = HUB_APP_CLIENT_ID_AAD;
}
mInteractiveParameters = AndroidActivityInteractiveTokenCommandParameters
mInteractiveParameters = AndroidInteractiveTokenCommandParameters
.builder()
.platformComponents(mPlatformComponents)
.sdkType(SdkType.MSAL_CPP)
Expand Down Expand Up @@ -159,7 +159,7 @@ protected void performATForHubApp() {
}

protected void performATForHubAppInUSGovCloud() {
mInteractiveParameters = AndroidActivityInteractiveTokenCommandParameters
mInteractiveParameters = AndroidInteractiveTokenCommandParameters
.builder()
.platformComponents(mPlatformComponents)
.sdkType(SdkType.MSAL_CPP)
Expand Down Expand Up @@ -270,7 +270,7 @@ protected void performInteractiveATForNestedApp(boolean shouldAddDeviceIdClaim)
}
final String hubAppClientId = mLabAccount.getUserType() == UserType.MSA ? HUB_APP_CLIENT_ID_MSA : HUB_APP_CLIENT_ID_AAD;

mInteractiveParameters = AndroidActivityInteractiveTokenCommandParameters
mInteractiveParameters = AndroidInteractiveTokenCommandParameters
.builder()
.platformComponents(mPlatformComponents)
.sdkType(SdkType.MSAL_CPP)
Expand Down
Loading