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

Jump to bottom

LTW broker test config change - msalautomationapp #1862

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

LTW broker test config change - msalautomationapp #1862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c162b6
add config and gradle change
yixilin09 Jul 25, 2023
2daedb1
raw file uri change
yixilin09 Jul 25, 2023
a1950fd
modify host in manifest
yixilin09 Jul 25, 2023
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
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 88 files
+10 −2 LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/client/LabClient.java
+6 −69 azure-pipelines/pull-request-validation/common.yml
+1 −1 azure-pipelines/templates/steps/vsts-release/vsts-release-template.yml
+2 −29 changelog.txt
+0 −3 common/build.gradle
+0 −1 common/src/main/AndroidManifest.xml
+6 −1 common/src/main/java/com/microsoft/identity/common/crypto/AndroidWrappedKeyLoader.java
+4 −10 ...main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/AccountManagerBrokerDiscoveryUtil.kt
+11 −6 common/src/main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/BrokerDiscoveryClient.kt
+2 −3 .../src/main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/BrokerDiscoveryClientFactory.kt
+55 −2 ...n/src/main/java/com/microsoft/identity/common/internal/activebrokerdiscovery/LegacyBrokerDiscoveryClient.kt
+26 −20 common/src/main/java/com/microsoft/identity/common/internal/broker/AndroidBrokerAccount.java
+46 −51 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerData.kt
+292 −0 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerValidator.java
+0 −100 common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerValidator.kt
+0 −44 common/src/main/java/com/microsoft/identity/common/internal/broker/IBrokerValidator.kt
+15 −30 common/src/main/java/com/microsoft/identity/common/internal/broker/PackageHelper.java
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/broker/ipc/BrokerOperationBundle.java
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/broker/ipc/ContentProviderStrategy.java
+7 −8 common/src/main/java/com/microsoft/identity/common/internal/cache/ActiveBrokerCache.kt
+3 −13 common/src/main/java/com/microsoft/identity/common/internal/cache/ClientActiveBrokerCache.kt
+171 −0 common/src/main/java/com/microsoft/identity/common/internal/cache/HelloCache.java
+0 −241 common/src/main/java/com/microsoft/identity/common/internal/cache/HelloCache.kt
+0 −141 common/src/main/java/com/microsoft/identity/common/internal/cache/HelloCacheResult.kt
+18 −108 common/src/main/java/com/microsoft/identity/common/internal/controllers/BrokerMsalController.java
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/migration/TokenMigrationUtility.java
+2 −32 common/src/main/java/com/microsoft/identity/common/internal/platform/AndroidPlatformUtil.java
+0 −2 common/src/main/java/com/microsoft/identity/common/internal/providers/oauth2/WebViewAuthorizationFragment.java
+12 −28 common/src/main/java/com/microsoft/identity/common/internal/request/MsalBrokerRequestAdapter.java
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/result/AdalBrokerResultAdapter.java
+1 −1 common/src/main/java/com/microsoft/identity/common/internal/telemetry/AndroidTelemetryContext.java
+0 −30 common/src/main/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClient.java
+7 −15 common/src/main/java/com/microsoft/identity/common/internal/ui/webview/certbasedauth/CertBasedAuthFactory.java
+3 −18 common/src/main/java/com/microsoft/identity/common/internal/util/AndroidKeyStoreUtil.java
+9 −7 common/src/main/java/com/microsoft/identity/common/internal/util/PackageUtils.java
+2 −1 common/src/main/java/com/microsoft/identity/common/internal/util/ProcessUtil.java
+7 −7 common/src/test/java/com/microsoft/identity/common/BrokerOAuth2TokenCacheTest.java
+9 −9 common/src/test/java/com/microsoft/identity/common/MicrosoftFamilyOAuth2TokenCacheTest.java
+2 −2 common/src/test/java/com/microsoft/identity/common/MsalCppOAuth2TokenCacheTest.java
+17 −17 common/src/test/java/com/microsoft/identity/common/MsalOAuth2TokenCacheTest.java
+46 −114 common/src/test/java/com/microsoft/identity/common/SharedPreferencesAccountCredentialCacheTest.java
+46 −114 ...src/test/java/com/microsoft/identity/common/SharedPreferencesAccountCredentialCacheWithMemoryCacheTest.java
+0 −102 common/src/test/java/com/microsoft/identity/common/internal/AccountManagerBrokerDiscoveryUtilTests.kt
+0 −103 common/src/test/java/com/microsoft/identity/common/internal/BrokerValidatorTest.kt
+128 −0 common/src/test/java/com/microsoft/identity/common/internal/BrokerValidatorTests.java
+6 −6 ...on/src/test/java/com/microsoft/identity/common/internal/activebrokerdiscovery/BrokerDiscoveryClientTests.kt
+10 −12 common/src/test/java/com/microsoft/identity/common/internal/broker/AndroidBrokerAccountTest.java
+0 −82 common/src/test/java/com/microsoft/identity/common/internal/broker/BrokerDataTest.kt
+0 −20 common/src/test/java/com/microsoft/identity/common/internal/cache/ActiveBrokerCacheTest.kt
+0 −474 common/src/test/java/com/microsoft/identity/common/internal/cache/HelloCacheTests.java
+236 −0 common/src/test/java/com/microsoft/identity/common/internal/ipc/HelloCacheTests.java
+0 −13 .../src/test/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClientTest.java
+0 −15 ...src/test/java/com/microsoft/identity/common/internal/ui/webview/certbasedauth/CertBasedAuthFactoryTest.java
+1 −1 common4j/src/main/com/microsoft/identity/common/java/authorities/AzureActiveDirectoryB2CAuthority.java
+0 −60 common4j/src/main/com/microsoft/identity/common/java/cache/AbstractAccountCredentialCache.java
+1 −0 common4j/src/main/com/microsoft/identity/common/java/cache/IAccountCredentialCache.java
+1 −1 common4j/src/main/com/microsoft/identity/common/java/cache/MsalCppOAuth2TokenCache.java
+8 −4 common4j/src/main/com/microsoft/identity/common/java/cache/SharedPreferencesAccountCredentialCache.java
+11 −13 ...c/main/com/microsoft/identity/common/java/cache/SharedPreferencesAccountCredentialCacheWithMemoryCache.java
+5 −2 common4j/src/main/com/microsoft/identity/common/java/commands/InteractiveTokenCommand.java
+5 −2 common4j/src/main/com/microsoft/identity/common/java/commands/SilentTokenCommand.java
+0 −8 common4j/src/main/com/microsoft/identity/common/java/controllers/CommandDispatcher.java
+0 −5 common4j/src/main/com/microsoft/identity/common/java/exception/ClientException.java
+2 −2 common4j/src/main/com/microsoft/identity/common/java/net/UrlConnectionHttpClient.java
+1 −6 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java
+1 −2 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/CryptoFactoryName.java
+1 −1 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanExtension.java
+1 −3 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java
+1 −1 common4j/src/main/com/microsoft/identity/common/java/providers/oauth2/IDToken.java
+1 −1 common4j/src/main/com/microsoft/identity/common/java/result/LocalAuthenticationResult.java
+9 −3 common4j/src/test/com/microsoft/identity/common/java/net/UrlConnectionHttpClientTest.java
+9 −0 common4j/src/test/com/microsoft/identity/common/java/util/BrokerProtocolVersionUtilTest.java
+1 −1 common4j/versioning/version.properties
+2 −2 gradle/versions.gradle
+3 −6 uiautomationutilities/build.gradle
+0 −37 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/annotations/LTWTests.java
+0 −1 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/app/App.java
+3 −3 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/app/IFirstPartyApp.java
+0 −127 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/app/MsalTestApp.java
+0 −208 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/app/OneAuthTestApp.java
+2 −0 ...tomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/broker/BrokerCompanyPortal.java
+12 −26 ...ain/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/AadLoginComponentHandler.java
+1 −7 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/CopyFileRule.java
+3 −4 ...utilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/RemoveFirstPartyAppsTestRule.java
+1 −2 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/RulesHelper.java
+2 −2 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/utils/CommonUtils.java
+0 −36 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/utils/UiAutomatorUtils.java
+1 −1 versioning/version.properties
2 changes: 1 addition & 1 deletion msalautomationapp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {

defaultConfig {
multiDexEnabled true
applicationId "com.msft.identity.client.sample"
applicationId "com.msft.identity.client.msal.automationapp"
minSdkVersion rootProject.ext.automationAppMinSDKVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<category android:name="android.intent.category.BROWSABLE" />
<data
android:scheme="msauth"
android:host="com.msft.identity.client.sample.local"
android:host="${applicationId}"
android:path="/1wIqXSqBj7w+h11ZifsnqwgyKrY="/>
</intent-filter>
</activity>
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_automation_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
"authorization_user_agent" : "DEFAULT",
"redirect_uri" : "msauth://com.microsoft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"multiple_clouds_supported":true,
"account_mode": "MULTIPLE",
"authorities" : [
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_arlington.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "8efc1284-a3c4-4ffd-b7b9-ff7c75965bc5",
"authorization_user_agent" : "DEFAULT",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "AAD",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_b2c_siso.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"client_id" : "e3b9ad76-9763-4827-b088-80c7a7888f79",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "B2C",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_blackforest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "7f6c2a60-95d5-4525-b99c-103593fb9a57",
"authorization_user_agent" : "DEFAULT",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "AAD",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_browser.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
"authorization_user_agent" : "BROWSER",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "AAD",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
"authorization_user_agent" : "default",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "AAD",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_fairfax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "fd4c40ca-988f-4b4a-a514-9e583fa1bc04",
"authorization_user_agent" : "DEFAULT",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "AAD",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_instance_aware_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
"authorization_user_agent" : "DEFAULT",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"multiple_clouds_supported":true,
"authorities" : [
{
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
"authorization_user_agent" : "BROWSER",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"multiple_clouds_supported":true,
"broker_redirect_uri_registered": false,
"authorities" : [
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_instance_aware_organization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
"authorization_user_agent" : "DEFAULT",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"multiple_clouds_supported":true,
"authorities" : [
{
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_mooncake.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "920cd637-4ca3-496b-8a6a-f7c6ca1b2b82",
"authorization_user_agent" : "DEFAULT",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "AAD",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_msa.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "9668f2bd-6103-4292-9024-84fa2d1b6fb2",
"authorization_user_agent" : "DEFAULT",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "AAD",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_msa_only.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "9668f2bd-6103-4292-9024-84fa2d1b6fb2",
"authorization_user_agent" : "DEFAULT",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "AAD",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_no_admin_consent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "a8c8bb57-55f3-4e95-9cf2-a3aac32f0d7a",
"authorization_user_agent" : "WEBVIEW",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "AAD",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_pkey_auth_silent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
"authorization_user_agent" : "DEFAULT",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"handle_null_taskaffinity": true,
"authorization_in_current_task": false,
"minimum_required_broker_protocol_version": "9.0",
Expand Down
2 changes: 1 addition & 1 deletion msalautomationapp/src/main/res/raw/msal_config_webview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"client_id" : "4b0db8c2-9f26-4417-8bde-3f0e3656f8e0",
"authorization_user_agent" : "WEBVIEW",
"redirect_uri" : "msauth://com.msft.identity.client.sample.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"redirect_uri" : "msauth://com.msft.identity.client.msal.automationapp.local/1wIqXSqBj7w%2Bh11ZifsnqwgyKrY%3D",
"authorities" : [
{
"type": "AAD",
Expand Down
Loading