From 6ca9423f8d195e7f92154520ff3a3f1f104c57b1 Mon Sep 17 00:00:00 2001 From: Mohit Chandwani Date: Thu, 16 Jan 2025 22:32:19 -0800 Subject: [PATCH 1/7] siwg --- common | 2 +- .../client/internal/CommandParametersAdapter.java | 10 ++++++++-- .../testpass/broker/nestedAppAuth/NestedAppHelper.java | 10 +++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/common b/common index 3d7fe9e660..87024b3e9b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 3d7fe9e660aed4cb8cafdb5f3041ed0618bf95d8 +Subproject commit 87024b3e9b4219a65b72155a0d688f501661f728 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 0afebbb0f5..6f671b28bd 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,9 @@ public static InteractiveTokenCommandParameters createInteractiveTokenCommandPar authority )); - final InteractiveTokenCommandParameters commandParameters = AndroidActivityInteractiveTokenCommandParameters + final SignInWithGoogleParameters siwgParams = new SignInWithGoogleParameters(parameters.getActivity()); + final SignInWithGoogleCredential credential = SignInWithGoogleApi.getInstance().signInSync(siwgParams); + final InteractiveTokenCommandParameters commandParameters = AndroidInteractiveTokenCommandParameters .builder() .activity(parameters.getActivity()) .platformComponents(AndroidPlatformComponentsFactory.createFromActivity( @@ -203,6 +208,7 @@ public static InteractiveTokenCommandParameters createInteractiveTokenCommandPar .powerOptCheckEnabled(configuration.isPowerOptCheckForEnabled()) .correlationId(parameters.getCorrelationId()) .preferredAuthMethod(parameters.getPreferredAuthMethod()) + .signInWithGoogleCredential(credential) .build(); return commandParameters; 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 5250a63dad..4cfe20f6b2 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) From 09e78ac74c4cdfab026449f8551c09455abb741f Mon Sep 17 00:00:00 2001 From: Mohit Date: Mon, 20 Jan 2025 17:46:28 -0800 Subject: [PATCH 2/7] common submodule' --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 87024b3e9b..e3dd883fbb 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 87024b3e9b4219a65b72155a0d688f501661f728 +Subproject commit e3dd883fbb991343af4f5878de9d5c9bb6441523 From fb7b0395fb30f826e98fd89f421cf1d57c7f8346 Mon Sep 17 00:00:00 2001 From: Mohit Date: Mon, 20 Jan 2025 17:53:14 -0800 Subject: [PATCH 3/7] revert siwg UX --- .../identity/client/internal/CommandParametersAdapter.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 6f671b28bd..e3c1f39c5d 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 @@ -169,9 +169,7 @@ public static InteractiveTokenCommandParameters createInteractiveTokenCommandPar authority )); - final SignInWithGoogleParameters siwgParams = new SignInWithGoogleParameters(parameters.getActivity()); - final SignInWithGoogleCredential credential = SignInWithGoogleApi.getInstance().signInSync(siwgParams); - final InteractiveTokenCommandParameters commandParameters = AndroidInteractiveTokenCommandParameters + return AndroidInteractiveTokenCommandParameters .builder() .activity(parameters.getActivity()) .platformComponents(AndroidPlatformComponentsFactory.createFromActivity( @@ -208,10 +206,7 @@ public static InteractiveTokenCommandParameters createInteractiveTokenCommandPar .powerOptCheckEnabled(configuration.isPowerOptCheckForEnabled()) .correlationId(parameters.getCorrelationId()) .preferredAuthMethod(parameters.getPreferredAuthMethod()) - .signInWithGoogleCredential(credential) .build(); - - return commandParameters; } public static SilentTokenCommandParameters createSilentTokenCommandParameters( From ab2e35ff64c4389dfefaa981c305bca86bc7e6cc Mon Sep 17 00:00:00 2001 From: Mohit Date: Mon, 27 Jan 2025 09:13:05 -0800 Subject: [PATCH 4/7] changelog --- changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog b/changelog index 567071b919..aab2ce2180 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) From a1f413ef49d97bf69c2b258eb9527b0f01cc6ad2 Mon Sep 17 00:00:00 2001 From: Mohit Date: Tue, 28 Jan 2025 11:53:30 -0800 Subject: [PATCH 5/7] sync common --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 9f3cbf6acd..dcb2d19a2d 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 9f3cbf6acd9c9768f72f113c40ad5b75e522d613 +Subproject commit dcb2d19a2dc73de2a6edefc7c258322c90e885f9 From a56703204ace499920217aab2a5b773f502c8b4d Mon Sep 17 00:00:00 2001 From: Mohit Date: Wed, 29 Jan 2025 10:23:34 -0800 Subject: [PATCH 6/7] sync common --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index dcb2d19a2d..9f4d7d783f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit dcb2d19a2dc73de2a6edefc7c258322c90e885f9 +Subproject commit 9f4d7d783f102b0aa4d92b05111a94b817f66444 From 3519592b687ed8938feab5b5012ad49b93a25abc Mon Sep 17 00:00:00 2001 From: Mohit Date: Wed, 29 Jan 2025 12:58:17 -0800 Subject: [PATCH 7/7] sync common --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 9f4d7d783f..b1e33fbd74 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 9f4d7d783f102b0aa4d92b05111a94b817f66444 +Subproject commit b1e33fbd7420c14e87fdd610a4d14577cc18d80a