Merge branch 'dev' into fadi/mavenCentral

Author: fadidurah

.github/workflows/gradle-versions-watcher.yml

@@ -0,0 +1,32 @@
+name: Notify on versions.gradle changes
+
+on:
+  push:
+    paths:
+      - 'gradle/versions.gradle'
+    branches:
+      - dev
+      - 'release/**'
+  pull_request:
+    paths:
+      - 'gradle/versions.gradle'
+    branches:
+      - dev
+      - 'release/**'
+
+permissions:
+  pull-requests: write
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log changes
+        run: |
+          echo "Changes detected in the 'gradle/versions.gradle' file."
+
+      - name: Comment on PR
+        if: github.event_name == 'pull_request'
+        uses: mshick/add-pr-comment@v2
+        with:
+          message: "⚠️ **Warning:** Changes detected in the 'versions.gradle' file! ⚠️\n\nPlease refer to [this document](https://dev.azure.com/IdentityDivision/IdentityWiki/_wiki/wikis/IdentityWiki.wiki/82085/Adding-or-Updating-Gradle-Dependencies) for more details."

.github/workflows/validate-pr-ab-id.yml

@@ -33,9 +33,16 @@ jobs:
   # Extracts the AB ID from the pull_request body using regex and store the result using outputs 
       - name: Get AB ID from comment
         id: get
+        env:
+          PR_BODY: ${{ github.event.pull_request.body }}
         run: |
-          result=$(echo "${{ github.event.pull_request.body }}" | grep -oP '(?<=#)\d+')
-          echo "id=${result}" >> "$GITHUB_OUTPUT"
+          # Sanitize PR body by removing backticks to prevent command substitution
+          clean=$(printf "%s" "$PR_BODY" | tr -d '`')
+      
+          # Extract AB ID (AB#1234567) - takes first match if multiple exist
+          result=$(printf "%s" "$clean" | grep -oP '(?<=AB#)\d+' | head -n 1)
+      
+          echo "id=$result" >> "$GITHUB_OUTPUT"
 
   # Get Pull request ID
   get_pr_id:

changelog.txt

@@ -575,6 +575,7 @@ Version 6.0.0
 - [PATCH] Added Base64 encode for the AuthorizationRequest state parameter (#1750)
 - [PATCH] Fix missing authority_url when creating the authority audience (#1753)
 - [PATCH] Add filter for broker telemetry event fields. (#1793)
+- [MINOR] Bug fix : Selecting text in login page is causing the input field to be hidden (#2826)
 
 Version 5.0.1
 ----------

common/src/main/res/values/styles.xml

@@ -60,6 +60,6 @@
     <!-- Theme for DualScreenActivity.
         Force set to a light theme (to status and navigation bars) since broker/common activities always have white background. -->
     <style name="DualScreenActivityTheme" parent="Theme.AppCompat.Light">
-        <item name="android:background">@color/com_microsoft_identity_common_white</item>
+        <item name="android:windowBackground">@color/com_microsoft_identity_common_white</item>
     </style>
 </resources>

common4j/src/main/com/microsoft/identity/common/java/cache/BrokerOAuth2TokenCache.java

@@ -29,6 +29,7 @@
 import com.microsoft.identity.common.java.interfaces.INameValueStorage;
 import com.microsoft.identity.common.java.interfaces.IPlatformComponents;
 import com.microsoft.identity.common.java.opentelemetry.AttributeName;
+import com.microsoft.identity.common.java.opentelemetry.OTelUtility;
 import com.microsoft.identity.common.java.opentelemetry.SpanExtension;
 import com.microsoft.identity.common.java.providers.oauth2.OAuth2Strategy;
 import com.microsoft.identity.common.java.providers.oauth2.OAuth2TokenCache;
@@ -278,6 +279,7 @@ public ICacheRecord save(@NonNull AccountRecord accountRecord,
                              @Nullable RefreshTokenRecord refreshTokenRecord,
                              @Nullable String familyId) throws ClientException {
         final String methodName = ":save (5 args)";
+        final long saveStartTime = System.currentTimeMillis();
 
         final ICacheRecord result;
 
@@ -319,7 +321,7 @@ public ICacheRecord save(@NonNull AccountRecord accountRecord,
                 familyId,
                 mUid
         );
-
+        OTelUtility.recordElapsedTime(AttributeName.elapsed_time_save_aggregated_account_data.name(), saveStartTime);
         return result;
     }
 
@@ -366,6 +368,7 @@ public synchronized List<ICacheRecord> saveAndLoadAggregatedAccountData(
     private List<ICacheRecord> loadAggregatedAccountData(final @NonNull AbstractAuthenticationScheme authScheme,
                                                          final @NonNull ICacheRecord cacheRecord) {
         final String methodName = ":loadAggregatedAccountData";
+        final long loadStartTime = System.currentTimeMillis();
 
         final String clientId = cacheRecord.getAccessToken().getClientId();
         final String target = cacheRecord.getAccessToken().getTarget();
@@ -386,14 +389,17 @@ private List<ICacheRecord> loadAggregatedAccountData(final @NonNull AbstractAuth
             return null;
         }
 
-        return cache.loadWithAggregatedAccountData(
+        List<ICacheRecord> cacheRecordList =  cache.loadWithAggregatedAccountData(
                 clientId,
                 applicationIdentifier,
                 mamEnrollmentIdentifier,
                 target,
                 cacheRecord.getAccount(),
                 authScheme
         );
+        OTelUtility.recordElapsedTime(AttributeName.elapsed_time_load_aggregated_account_data.name(),
+                loadStartTime);
+        return cacheRecordList;
     }
 
     @Override

common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java

@@ -502,5 +502,15 @@ public enum AttributeName {
     /**
      * Passkey DOM exception name (if any).
      */
-    passkey_dom_exception_name
+    passkey_dom_exception_name,
+
+    /**
+     *  Elapsed time (in milliseconds) spent in executing the save() method in BrokerOAuth2TokenCache.
+     */
+    elapsed_time_save_aggregated_account_data,
+
+    /**
+     *  Elapsed time (in milliseconds) spent in executing the loadAggregatedAccountData() method in BrokerOAuth2TokenCache.
+     */
+    elapsed_time_load_aggregated_account_data
 }

gradle/versions.gradle

@@ -1,4 +1,4 @@
-// Variables for entire project
+// Variables for entire project.
 // Taken from android-complete.
 ext {
     // SDK