From 6c162b6de74bb59f239a3c40add329680909dbaf Mon Sep 17 00:00:00 2001 From: yixilin Date: Tue, 25 Jul 2023 12:50:41 +0800 Subject: [PATCH 1/3] add config and gradle change --- common | 2 +- msalautomationapp/build.gradle | 2 +- msalautomationapp/src/main/AndroidManifest.xml | 2 +- msalautomationapp/src/main/res/raw/msal_config_default.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common b/common index d6fcb32c3..9ce908df2 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit d6fcb32c3049b8d6c2c140fb1712c179c44c70eb +Subproject commit 9ce908df2fd0f272b2da5ccd957869652636f4fd diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle index 07d3bcb3d..f4307c9d9 100644 --- a/msalautomationapp/build.gradle +++ b/msalautomationapp/build.gradle @@ -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 diff --git a/msalautomationapp/src/main/AndroidManifest.xml b/msalautomationapp/src/main/AndroidManifest.xml index 52afc4f27..c2960ee27 100644 --- a/msalautomationapp/src/main/AndroidManifest.xml +++ b/msalautomationapp/src/main/AndroidManifest.xml @@ -32,7 +32,7 @@ diff --git a/msalautomationapp/src/main/res/raw/msal_config_default.json b/msalautomationapp/src/main/res/raw/msal_config_default.json index e010c6d7a..184e289cb 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_default.json +++ b/msalautomationapp/src/main/res/raw/msal_config_default.json @@ -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", From 2daedb149388bf11f462ea97210870e385c03b0e Mon Sep 17 00:00:00 2001 From: yixilin Date: Tue, 25 Jul 2023 15:41:28 +0800 Subject: [PATCH 2/3] raw file uri change --- msalautomationapp/src/main/res/raw/msal_automation_config.json | 2 +- msalautomationapp/src/main/res/raw/msal_config_arlington.json | 2 +- msalautomationapp/src/main/res/raw/msal_config_b2c_siso.json | 2 +- msalautomationapp/src/main/res/raw/msal_config_blackforest.json | 2 +- msalautomationapp/src/main/res/raw/msal_config_browser.json | 2 +- msalautomationapp/src/main/res/raw/msal_config_fairfax.json | 2 +- .../src/main/res/raw/msal_config_instance_aware_common.json | 2 +- .../res/raw/msal_config_instance_aware_common_skip_broker.json | 2 +- .../main/res/raw/msal_config_instance_aware_organization.json | 2 +- msalautomationapp/src/main/res/raw/msal_config_mooncake.json | 2 +- msalautomationapp/src/main/res/raw/msal_config_msa.json | 2 +- msalautomationapp/src/main/res/raw/msal_config_msa_only.json | 2 +- .../src/main/res/raw/msal_config_no_admin_consent.json | 2 +- .../src/main/res/raw/msal_config_pkey_auth_silent.json | 2 +- msalautomationapp/src/main/res/raw/msal_config_webview.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/msalautomationapp/src/main/res/raw/msal_automation_config.json b/msalautomationapp/src/main/res/raw/msal_automation_config.json index 8ecf04ec9..470adb22c 100644 --- a/msalautomationapp/src/main/res/raw/msal_automation_config.json +++ b/msalautomationapp/src/main/res/raw/msal_automation_config.json @@ -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" : [ diff --git a/msalautomationapp/src/main/res/raw/msal_config_arlington.json b/msalautomationapp/src/main/res/raw/msal_config_arlington.json index 6e738958c..ab6724f03 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_arlington.json +++ b/msalautomationapp/src/main/res/raw/msal_config_arlington.json @@ -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", diff --git a/msalautomationapp/src/main/res/raw/msal_config_b2c_siso.json b/msalautomationapp/src/main/res/raw/msal_config_b2c_siso.json index c5cab7020..f7fe6a191 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_b2c_siso.json +++ b/msalautomationapp/src/main/res/raw/msal_config_b2c_siso.json @@ -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", diff --git a/msalautomationapp/src/main/res/raw/msal_config_blackforest.json b/msalautomationapp/src/main/res/raw/msal_config_blackforest.json index a80271b90..b1be889c8 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_blackforest.json +++ b/msalautomationapp/src/main/res/raw/msal_config_blackforest.json @@ -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", diff --git a/msalautomationapp/src/main/res/raw/msal_config_browser.json b/msalautomationapp/src/main/res/raw/msal_config_browser.json index 826ed8ce5..0c517a274 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_browser.json +++ b/msalautomationapp/src/main/res/raw/msal_config_browser.json @@ -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", diff --git a/msalautomationapp/src/main/res/raw/msal_config_fairfax.json b/msalautomationapp/src/main/res/raw/msal_config_fairfax.json index 409cafb2e..8e634e8d1 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_fairfax.json +++ b/msalautomationapp/src/main/res/raw/msal_config_fairfax.json @@ -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", diff --git a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common.json b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common.json index b1cdaa582..c18c62dad 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common.json +++ b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common.json @@ -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" : [ { diff --git a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json index 28439de99..e98b2055f 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json +++ b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_common_skip_broker.json @@ -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" : [ diff --git a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_organization.json b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_organization.json index 18b568840..009f1f841 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_instance_aware_organization.json +++ b/msalautomationapp/src/main/res/raw/msal_config_instance_aware_organization.json @@ -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" : [ { diff --git a/msalautomationapp/src/main/res/raw/msal_config_mooncake.json b/msalautomationapp/src/main/res/raw/msal_config_mooncake.json index 280df0420..3133517ae 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_mooncake.json +++ b/msalautomationapp/src/main/res/raw/msal_config_mooncake.json @@ -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", diff --git a/msalautomationapp/src/main/res/raw/msal_config_msa.json b/msalautomationapp/src/main/res/raw/msal_config_msa.json index f46c16931..54de88c1e 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_msa.json +++ b/msalautomationapp/src/main/res/raw/msal_config_msa.json @@ -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", diff --git a/msalautomationapp/src/main/res/raw/msal_config_msa_only.json b/msalautomationapp/src/main/res/raw/msal_config_msa_only.json index ac3d82f15..a830e9dd4 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_msa_only.json +++ b/msalautomationapp/src/main/res/raw/msal_config_msa_only.json @@ -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", diff --git a/msalautomationapp/src/main/res/raw/msal_config_no_admin_consent.json b/msalautomationapp/src/main/res/raw/msal_config_no_admin_consent.json index aa6575be7..ab6287179 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_no_admin_consent.json +++ b/msalautomationapp/src/main/res/raw/msal_config_no_admin_consent.json @@ -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", diff --git a/msalautomationapp/src/main/res/raw/msal_config_pkey_auth_silent.json b/msalautomationapp/src/main/res/raw/msal_config_pkey_auth_silent.json index 542621cba..4d500ddf4 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_pkey_auth_silent.json +++ b/msalautomationapp/src/main/res/raw/msal_config_pkey_auth_silent.json @@ -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", diff --git a/msalautomationapp/src/main/res/raw/msal_config_webview.json b/msalautomationapp/src/main/res/raw/msal_config_webview.json index 6b4be1a6c..8fb0429c5 100644 --- a/msalautomationapp/src/main/res/raw/msal_config_webview.json +++ b/msalautomationapp/src/main/res/raw/msal_config_webview.json @@ -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", From a1950fd920da893fc007c83567b7f00fcbc30d9a Mon Sep 17 00:00:00 2001 From: yixilin Date: Tue, 25 Jul 2023 15:58:45 +0800 Subject: [PATCH 3/3] modify host in manifest --- msalautomationapp/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msalautomationapp/src/main/AndroidManifest.xml b/msalautomationapp/src/main/AndroidManifest.xml index c2960ee27..d686180c8 100644 --- a/msalautomationapp/src/main/AndroidManifest.xml +++ b/msalautomationapp/src/main/AndroidManifest.xml @@ -32,7 +32,7 @@