diff --git a/changelog b/changelog index 567071b91..aab2ce218 100644 --- a/changelog +++ b/changelog @@ -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) diff --git a/common b/common index 223ac0cbb..b1e33fbd7 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 223ac0cbb7d740876e51a21a9b8856e2349c3a7b +Subproject commit b1e33fbd7420c14e87fdd610a4d14577cc18d80a diff --git a/msal/src/main/java/com/microsoft/identity/client/internal/CommandParametersAdapter.java b/msal/src/main/java/com/microsoft/identity/client/internal/CommandParametersAdapter.java index 7038cd60f..63936ba93 100644 --- a/msal/src/main/java/com/microsoft/identity/client/internal/CommandParametersAdapter.java +++ b/msal/src/main/java/com/microsoft/identity/client/internal/CommandParametersAdapter.java @@ -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; @@ -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; @@ -166,7 +169,7 @@ public static InteractiveTokenCommandParameters createInteractiveTokenCommandPar authority )); - final InteractiveTokenCommandParameters commandParameters = AndroidActivityInteractiveTokenCommandParameters + return AndroidInteractiveTokenCommandParameters .builder() .activity(parameters.getActivity()) .platformComponents(AndroidPlatformComponentsFactory.createFromActivity( @@ -204,8 +207,6 @@ public static InteractiveTokenCommandParameters createInteractiveTokenCommandPar .correlationId(parameters.getCorrelationId()) .preferredAuthMethod(parameters.getPreferredAuthMethod()) .build(); - - return commandParameters; } public static SilentTokenCommandParameters createSilentTokenCommandParameters( diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/NestedAppHelper.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/NestedAppHelper.java index 5250a63da..4cfe20f6b 100644 --- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/NestedAppHelper.java +++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nestedAppAuth/NestedAppHelper.java @@ -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; @@ -60,7 +60,7 @@ public class NestedAppHelper { - private AndroidActivityInteractiveTokenCommandParameters mInteractiveParameters; + private AndroidInteractiveTokenCommandParameters mInteractiveParameters; private final ILabAccount mLabAccount; private final BrokerMsalController mController; @@ -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) @@ -159,7 +159,7 @@ protected void performATForHubApp() { } protected void performATForHubAppInUSGovCloud() { - mInteractiveParameters = AndroidActivityInteractiveTokenCommandParameters + mInteractiveParameters = AndroidInteractiveTokenCommandParameters .builder() .platformComponents(mPlatformComponents) .sdkType(SdkType.MSAL_CPP) @@ -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)