From e006a1c4f80320d0de47f875224de4ce8ce9ec42 Mon Sep 17 00:00:00 2001 From: Rohit Luthra Date: Thu, 9 Oct 2025 16:57:38 -0400 Subject: [PATCH 1/4] Manual merging working/release/23.0.0 to release/23.0.0, Fixes AB#3397730 (#2782) Manual merging working/release/23.0.0 to release/23.0.0 for octoebr release process. PBI Item - [AB#3397730](https://dev.azure.com/IdentityDivision/Engineering/_workitems/edit/3397730) --------- Co-authored-by: Azure DevOps Pipeline Co-authored-by: Shahzaib <37125644+shahzaibj@users.noreply.github.com> Co-authored-by: p3dr0rv --- changelog.txt | 4 ++++ common/build.gradle | 6 +++--- .../internal/ui/browser/BrowserAuthorizationStrategy.java | 3 ++- common4j/versioning/version.properties | 2 +- versioning/version.properties | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changelog.txt b/changelog.txt index 9f711cf04c..7988b403f5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ vNext ---------- + +Version 23.0.2 +---------- - [MAJOR] Add KeyStoreBackedSecretKeyProvider (#2674) - [MINOR] Add Open Id configuration issuer validation reporting in OpenIdProviderConfigurationClient (#2751) - [MINOR] Add helper method to record elapsed time (#2768) @@ -11,6 +14,7 @@ vNext - [MINOR] SDK now handles SMS as strong authentication method #2766 - [MINOR] Added error handling when webcp redirects have browser protocol #2767 - [PATCH] Fix for app link redirect from CCT due to forced browser preference (#2775) +- [PATCH] Don't set browser pkg name in CustomTabIntent (#2778) Version 22.1.0 ---------- diff --git a/common/build.gradle b/common/build.gradle index 3c6e2e7104..fca9c50bb4 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -25,7 +25,7 @@ codeCoverageReport { // In dev, we want to keep the dependencies(common4j, broker4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline. // In release/*, we change these to specific versions being consumed. -def common4jVersion = "1.0.+" +def common4jVersion = "23.0.2" if (project.hasProperty("distCommon4jVersion") && project.distCommon4jVersion != '') { common4jVersion = project.distCommon4jVersion } @@ -376,10 +376,10 @@ tasks.configureEach { task -> task.dependsOn 'bundleDistReleaseAar' } if (task.name == "generateMetadataFileForDistDebugPublication") { - task.mustRunAfter 'bundleDistReleaseAar' + task.mustRunAfter 'bundleDistDebugAar' } if (task.name == "generateMetadataFileForDistReleasePublication") { - task.dependsOn 'bundleDistDebugAar' + task.dependsOn 'bundleDistReleaseAar' } } diff --git a/common/src/main/java/com/microsoft/identity/common/internal/ui/browser/BrowserAuthorizationStrategy.java b/common/src/main/java/com/microsoft/identity/common/internal/ui/browser/BrowserAuthorizationStrategy.java index 028e67fa4d..f98790be1a 100644 --- a/common/src/main/java/com/microsoft/identity/common/internal/ui/browser/BrowserAuthorizationStrategy.java +++ b/common/src/main/java/com/microsoft/identity/common/internal/ui/browser/BrowserAuthorizationStrategy.java @@ -99,6 +99,7 @@ public Future requestAuthorization( if (!mCustomTabManager.bind(context, mBrowser.getPackageName())) { //create browser auth intent authIntent = new Intent(Intent.ACTION_VIEW); + authIntent.setPackage(mBrowser.getPackageName()); } else { authIntent = mCustomTabManager.getCustomTabsIntent().intent; } @@ -109,9 +110,9 @@ public Future requestAuthorization( ); //create browser auth intent authIntent = new Intent(Intent.ACTION_VIEW); + authIntent.setPackage(mBrowser.getPackageName()); } - authIntent.setPackage(mBrowser.getPackageName()); final URI requestUrl = authorizationRequest.getAuthorizationRequestAsHttpRequest(); authIntent.setData(Uri.parse(requestUrl.toString())); diff --git a/common4j/versioning/version.properties b/common4j/versioning/version.properties index a5688f683c..bb5b1c93f6 100644 --- a/common4j/versioning/version.properties +++ b/common4j/versioning/version.properties @@ -1,4 +1,4 @@ #Wed May 12 20:08:39 UTC 2021 -versionName=22.1.0 +versionName=23.0.2 versionCode=1 latestPatchVersion=227 diff --git a/versioning/version.properties b/versioning/version.properties index 6956afe71e..de21aafe25 100644 --- a/versioning/version.properties +++ b/versioning/version.properties @@ -1,4 +1,4 @@ #Tue Apr 06 22:55:08 UTC 2021 -versionName=22.1.0 +versionName=23.0.2 versionCode=1 latestPatchVersion=234 From 67b8991aeeda6bbc4f9d455fd8f4d3c03cb05c6d Mon Sep 17 00:00:00 2001 From: rohitluthra Date: Wed, 15 Oct 2025 14:24:59 -0400 Subject: [PATCH 2/4] Adding + sign for Minor version --- common/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 0f55cde892..b4cb7e4278 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -40,7 +40,7 @@ tasks.withType(Test) { // In dev, we want to keep the dependencies(common4j, broker4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline. // In release/*, we change these to specific versions being consumed. -def common4jVersion = "23.0.2" +def common4jVersion = "23.0.+" if (project.hasProperty("distCommon4jVersion") && project.distCommon4jVersion != '') { common4jVersion = project.distCommon4jVersion } @@ -429,5 +429,4 @@ tasks.register("dependenciesSizeCheck") { "It should be less than ${dependenciesSizeInMb} Mb") } } -} - +} \ No newline at end of file From 654230541cd8d3beef313df5de5d14c5a61a6484 Mon Sep 17 00:00:00 2001 From: rohitluthra Date: Wed, 15 Oct 2025 14:38:29 -0400 Subject: [PATCH 3/4] Adding + sign for Minor version --- common/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build.gradle b/common/build.gradle index b4cb7e4278..c1dcc45070 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -40,7 +40,7 @@ tasks.withType(Test) { // In dev, we want to keep the dependencies(common4j, broker4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline. // In release/*, we change these to specific versions being consumed. -def common4jVersion = "23.0.+" +def common4jVersion = "1.0.+" if (project.hasProperty("distCommon4jVersion") && project.distCommon4jVersion != '') { common4jVersion = project.distCommon4jVersion } From cf67dcaa23be5568a53136002d904c5b0d2684cb Mon Sep 17 00:00:00 2001 From: rohitluthra Date: Thu, 16 Oct 2025 13:52:38 -0400 Subject: [PATCH 4/4] Add back accidental trailing line removed from few files --- common/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build.gradle b/common/build.gradle index c1dcc45070..81497209c3 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -429,4 +429,4 @@ tasks.register("dependenciesSizeCheck") { "It should be less than ${dependenciesSizeInMb} Mb") } } -} \ No newline at end of file +}