Skip to content

Adding support for prompt=create #1611

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.

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

Merged
merged 8 commits into from
Apr 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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] Add prompt=create support. (#1611)
- [PATCH] Ensure consistent TAGs in the logger (#1612)
- [MAJOR] Deprecate methods not using TokenParameters (#1595)
- [PATCH] Update gson version to 2.8.9
Expand Down
2 changes: 1 addition & 1 deletion common
Submodule common updated 91 files
+3 −3 azure-pipelines/maven-release/common.yml
+3 −3 azure-pipelines/maven-release/common4j.yml
+19 −1 changelog.txt
+2 −1 common/src/main/AndroidManifest.xml
+8 −9 common/src/main/java/com/microsoft/identity/common/AndroidPlatformComponents.java
+16 −0 common/src/main/java/com/microsoft/identity/common/adal/internal/AuthenticationConstants.java
+2 −1 common/src/main/java/com/microsoft/identity/common/adal/internal/AuthenticationSettings.java
+11 −12 common/src/main/java/com/microsoft/identity/common/adal/internal/cache/ADALOAuth2TokenCache.java
+63 −62 common/src/main/java/com/microsoft/identity/common/adal/internal/cache/StorageHelper.java
+11 −10 common/src/main/java/com/microsoft/identity/common/adal/internal/tokensharing/TokenShareUtility.java
+3 −3 common/src/main/java/com/microsoft/identity/common/adal/internal/util/HashMapExtensions.java
+3 −2 common/src/main/java/com/microsoft/identity/common/adal/internal/util/StringExtensions.java
+2 −2 common/src/main/java/com/microsoft/identity/common/crypto/AndroidAuthSdkStorageEncryptionManager.java
+5 −5 common/src/main/java/com/microsoft/identity/common/crypto/AndroidBrokerStorageEncryptionManager.java
+27 −27 common/src/main/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyLoader.java
+6 −6 .../main/java/com/microsoft/identity/common/internal/authorities/AzureActiveDirectoryAudienceDeserializer.java
+10 −10 common/src/main/java/com/microsoft/identity/common/internal/broker/AndroidBrokerAccount.java
+4 −4 common/src/main/java/com/microsoft/identity/common/internal/broker/BoundServiceClient.java
+4 −2 common/src/main/java/com/microsoft/identity/common/internal/broker/BoundServiceConnection.java
+3 −3 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerActivity.java
+6 −5 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerValidator.java
+4 −2 common/src/main/java/com/microsoft/identity/common/internal/broker/IntuneMAMEnrollmentIdGateway.java
+12 −8 common/src/main/java/com/microsoft/identity/common/internal/broker/PackageHelper.java
+9 −6 common/src/main/java/com/microsoft/identity/common/internal/broker/ipc/AccountManagerAddAccountStrategy.java
+7 −3 common/src/main/java/com/microsoft/identity/common/internal/broker/ipc/BoundServiceStrategy.java
+4 −4 common/src/main/java/com/microsoft/identity/common/internal/broker/ipc/BrokerOperationBundle.java
+11 −8 common/src/main/java/com/microsoft/identity/common/internal/broker/ipc/ContentProviderStrategy.java
+6 −6 common/src/main/java/com/microsoft/identity/common/internal/cache/HelloCache.java
+8 −6 common/src/main/java/com/microsoft/identity/common/internal/cache/SharedPreferencesFileManager.java
+18 −18 common/src/main/java/com/microsoft/identity/common/internal/cache/SharedPreferencesSimpleCacheImpl.java
+4 −4 common/src/main/java/com/microsoft/identity/common/internal/commands/DeviceCodeFlowCommand.java
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/commands/GenerateShrCommand.java
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/commands/GetCurrentAccountCommand.java
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/commands/LoadAccountCommand.java
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/commands/RefreshOnCommand.java
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/commands/RemoveAccountCommand.java
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/commands/RemoveCurrentAccountCommand.java
+45 −43 common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerOperationExecutor.java
+21 −21 common/src/main/java/com/microsoft/identity/common/internal/controllers/LocalMSALController.java
+2 −1 common/src/main/java/com/microsoft/identity/common/internal/logging/DiagnosticContext.java
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/logging/RequestContext.java
+7 −6 common/src/main/java/com/microsoft/identity/common/internal/migration/AdalMigrationAdapter.java
+12 −12 common/src/main/java/com/microsoft/identity/common/internal/migration/TokenCacheItemMigrationAdapter.java
+3 −2 common/src/main/java/com/microsoft/identity/common/internal/migration/TokenMigrationUtility.java
+5 −5 common/src/main/java/com/microsoft/identity/common/internal/net/cache/HttpCache.java
+12 −4 common/src/main/java/com/microsoft/identity/common/internal/platform/AndroidPlatformUtil.java
+16 −11 common/src/main/java/com/microsoft/identity/common/internal/platform/DeviceKeyManager.java
+62 −37 common/src/main/java/com/microsoft/identity/common/internal/platform/DevicePopManager.java
+26 −21 common/src/main/java/com/microsoft/identity/common/internal/platform/KeyStoreAccessor.java
+2 −1 common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AndroidTaskStateGenerator.java
+3 −1 common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationActivity.java
+37 −21 common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/AuthorizationFragment.java
+4 −2 common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/BrowserAuthorizationFragment.java
+3 −1 ...src/main/java/com/microsoft/identity/common/internal/providers/oauth2/CurrentTaskAuthorizationActivity.java
+10 −8 ...src/main/java/com/microsoft/identity/common/internal/providers/oauth2/CurrentTaskAuthorizationFragment.java
+2 −1 ...n/java/com/microsoft/identity/common/internal/providers/oauth2/CurrentTaskBrowserAuthorizationFragment.java
+28 −7 common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/WebViewAuthorizationFragment.java
+4 −2 common/src/main/java/com/microsoft/identity/common/internal/request/AuthenticationSchemeTypeAdapter.java
+8 −5 common/src/main/java/com/microsoft/identity/common/internal/request/MsalBrokerRequestAdapter.java
+15 −9 common/src/main/java/com/microsoft/identity/common/internal/result/AdalBrokerResultAdapter.java
+43 −30 common/src/main/java/com/microsoft/identity/common/internal/result/MsalBrokerResultAdapter.java
+2 −1 common/src/main/java/com/microsoft/identity/common/internal/telemetry/AndroidTelemetryContext.java
+2 −1 common/src/main/java/com/microsoft/identity/common/internal/telemetry/Telemetry.java
+2 −1 common/src/main/java/com/microsoft/identity/common/internal/telemetry/events/ApiStartEvent.java
+7 −5 common/src/main/java/com/microsoft/identity/common/internal/ui/AndroidAuthorizationStrategyFactory.java
+5 −4 common/src/main/java/com/microsoft/identity/common/internal/ui/browser/BrowserAuthorizationStrategy.java
+2 −1 common/src/main/java/com/microsoft/identity/common/internal/ui/browser/BrowserBlocklist.java
+7 −7 common/src/main/java/com/microsoft/identity/common/internal/ui/browser/BrowserSelector.java
+18 −10 common/src/main/java/com/microsoft/identity/common/internal/ui/browser/CustomTabsManager.java
+42 −37 common/src/main/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClient.java
+5 −3 ...n/src/main/java/com/microsoft/identity/common/internal/ui/webview/EmbeddedWebViewAuthorizationStrategy.java
+16 −13 common/src/main/java/com/microsoft/identity/common/internal/ui/webview/OAuth2WebViewClient.java
+2 −2 common/src/main/java/com/microsoft/identity/common/internal/ui/webview/WebViewUtil.java
+6 −5 ...ava/com/microsoft/identity/common/internal/ui/webview/challengehandlers/ClientCertAuthChallengeHandler.java
+5 −2 ...src/main/java/com/microsoft/identity/common/internal/ui/webview/challengehandlers/NtlmChallengeHandler.java
+3 −2 ...main/java/com/microsoft/identity/common/internal/ui/webview/challengehandlers/PKeyAuthChallengeHandler.java
+6 −6 common/src/main/java/com/microsoft/identity/common/internal/util/AccountManagerUtil.java
+18 −18 common/src/main/java/com/microsoft/identity/common/internal/util/AndroidKeyStoreUtil.java
+3 −2 common/src/main/java/com/microsoft/identity/common/internal/util/StringUtil.java
+13 −13 common/src/main/java/com/microsoft/identity/common/migration/DefaultMultiTypeNameValueStorageReencrypter.java
+7 −0 common4j/src/main/com/microsoft/identity/common/components/SettablePlatformComponents.java
+4 −0 common4j/src/main/com/microsoft/identity/common/java/authscheme/PopAuthenticationSchemeInternal.java
+3 −6 common4j/src/main/com/microsoft/identity/common/java/challengehandlers/PKeyAuthChallenge.java
+16 −15 common4j/src/main/com/microsoft/identity/common/java/controllers/CommandDispatcher.java
+8 −0 common4j/src/main/com/microsoft/identity/common/java/controllers/ExceptionAdapter.java
+9 −1 common4j/src/main/com/microsoft/identity/common/java/providers/oauth2/OpenIdConnectPromptParameter.java
+22 −1 common4j/src/main/com/microsoft/identity/common/java/util/IPlatformUtil.java
+4 −0 common4j/src/main/com/microsoft/identity/common/java/util/ported/LocalBroadcaster.java
+2 −1 ...omationutilities/src/main/java/com/microsoft/identity/client/ui/automation/interaction/PromptParameter.java
+1 −1 versioning/version.properties
12 changes: 12 additions & 0 deletions msal/src/main/java/com/microsoft/identity/client/Prompt.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@ public enum Prompt {
*/
CONSENT,

/**
* acquireToken will send prompt=create to the /authorize endpoint. The user will be prompted to create a new account.
* Requires configuring authority as type "AzureADMyOrg" with a tenant_id.
* <p>
* Prerequisite: https://docs.microsoft.com/en-us/azure/active-directory/external-identities/self-service-sign-up-user-flow
*/
CREATE,

/**
* acquireToken will not send the prompt parameter to the authorize endpoint. The user may be prompted to login or to consent as required by the request.
*/
Expand All @@ -65,6 +73,8 @@ public String toString() {
return CONSENT.name().toLowerCase(Locale.ROOT);
case WHEN_REQUIRED:
return WHEN_REQUIRED.name().toLowerCase(Locale.ROOT);
case CREATE:
return CREATE.name().toLowerCase(Locale.ROOT);
default:
throw new IllegalArgumentException();
}
Expand All @@ -78,6 +88,8 @@ public OpenIdConnectPromptParameter toOpenIdConnectPromptParameter() {
return OpenIdConnectPromptParameter.CONSENT;
case WHEN_REQUIRED:
return OpenIdConnectPromptParameter.UNSET;
case CREATE:
return OpenIdConnectPromptParameter.CREATE;
case SELECT_ACCOUNT:
default:
return OpenIdConnectPromptParameter.SELECT_ACCOUNT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,34 @@ public class PromptTest {
public void testOpenIdConnectParameterSelectAccount() {
prompt = Prompt.SELECT_ACCOUNT;
final OpenIdConnectPromptParameter promptValue = prompt.toOpenIdConnectPromptParameter();
Assert.assertEquals(promptValue, OpenIdConnectPromptParameter.SELECT_ACCOUNT);
Assert.assertEquals(OpenIdConnectPromptParameter.SELECT_ACCOUNT, promptValue);
}

@Test
public void testOpenIdConnectParameterLogin() {
prompt = Prompt.LOGIN;
final OpenIdConnectPromptParameter promptValue = prompt.toOpenIdConnectPromptParameter();
Assert.assertEquals(promptValue, OpenIdConnectPromptParameter.LOGIN);
Assert.assertEquals(OpenIdConnectPromptParameter.LOGIN, promptValue);
}

@Test
public void testOpenIdConnectParameterConsent() {
prompt = Prompt.CONSENT;
final OpenIdConnectPromptParameter promptValue = prompt.toOpenIdConnectPromptParameter();
Assert.assertEquals(promptValue, OpenIdConnectPromptParameter.CONSENT);
Assert.assertEquals(OpenIdConnectPromptParameter.CONSENT, promptValue);
}

@Test
public void testOpenIdConnectParameterCreate() {
prompt = Prompt.CREATE;
final OpenIdConnectPromptParameter promptValue = prompt.toOpenIdConnectPromptParameter();
Assert.assertEquals(OpenIdConnectPromptParameter.CREATE, promptValue);
}

@Test
public void testOpenIdConnectParameterWhenRequired() {
prompt = Prompt.WHEN_REQUIRED;
final OpenIdConnectPromptParameter promptValue = prompt.toOpenIdConnectPromptParameter();
Assert.assertEquals(promptValue, OpenIdConnectPromptParameter.UNSET);
Assert.assertEquals(OpenIdConnectPromptParameter.UNSET, promptValue);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public final class UIBehaviorTest {
public final static String LOGIN = "login";
public final static String CONSENT = "consent";
public final static String SELECT_ACCOUNT = "select_account";
public final static String CREATE = "create";


@Test
Expand All @@ -50,4 +51,10 @@ public void testToStringSelectAccount() {
Prompt behavior = Prompt.SELECT_ACCOUNT;
Assert.assertEquals(behavior.toString(), SELECT_ACCOUNT);
}

@Test
public void testToStringCreate() {
Prompt behavior = Prompt.CREATE;
Assert.assertEquals(behavior.toString(), CREATE);
}
}