Merge remote-tracking branch 'origin/dev' into melissaahn/GetTokenHelpers

dev

Author: melissaahn

.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:

LabApiUtilities/build.gradle

@@ -15,8 +15,8 @@ plugins {
 
 apply from: '../versioning/version_tasks.gradle'
 
-project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_USERNAME") : project.findProperty("vstsUsername")
-project.ext.vstsPassword = System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
+project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername")
+project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
 
 version = getAppVersionName()
 
@@ -117,15 +117,15 @@ publishing {
             url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
             credentials {
                 username project.ext.vstsUsername
-                password project.ext.vstsPassword
+                password project.ext.vstsMavenAccessToken
             }
         }
         maven {
             name "vsts-maven-android"
             url 'https://identitydivision.pkgs.visualstudio.com/IDDP/_packaging/Android/maven/v1'
             credentials {
                 username project.vstsUsername
-                password project.vstsPassword
+                password project.vstsMavenAccessToken
             }
         }
     }

LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/authentication/LabApiAuthenticationClient.java

@@ -51,7 +51,6 @@ public class LabApiAuthenticationClient implements IAccessTokenSupplier {
     private final static int ATTEMPT_RETRY_WAIT = 3;
     private final String mLabCredential;
     private final String mLabCertPassword;
-    private final String defaultScope = LabConstants.DEFAULT_LAB_SCOPE;
     private final String mClientId;
 
     public LabApiAuthenticationClient(@NonNull final String labSecret) {
@@ -124,7 +123,7 @@ private String getAccessTokenInternal(final String customScope) throws LabApiExc
         if (customScope != null) {
             authScope = customScope;
         } else {
-            authScope = defaultScope;
+            authScope = LabConstants.DEFAULT_LAB_SCOPE;
         }
 
         final IConfidentialAuthClient confidentialAuthClient = new Msal4jAuthClient();

azure-pipelines/continuous-delivery/common-cd.yml

@@ -1,6 +1,5 @@
 # File: azure-pipelines/continuous-delivery/common-cd.yml
 # Description: Assemble & publish latest keyvault, labapi, labapiutilities, testutil release to internal vsts feed
-# Variable: 'ENV_VSTS_MVN_ANDROIDCOMMON_USERNAME' was defined in the Variables tab
 # Variable: 'customVersion' overrides the version number of the published libraries
 
 name: 0.0.$(Date:yyyyMMdd)$(Rev:.r) # $(Build.BuildNumber) = name

azure-pipelines/pull-request-validation/build-consumers.yml

@@ -1,6 +1,5 @@
 # File: azure-pipelines\pull-request-validation\build-consumers.yml
 # Description: Test new common in ADAL / MSAL / Broker (assembleLocal and testLocalDebugUnitTest)
-# Variable: 'ENV_VSTS_MVN_ANDROIDADACCOUNTS_USERNAME' was defined in the Variables tab
 # https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate
 # Variable: 'commonBranchName' common branch to be used when running the pipeline manually
 # Variable: 'skipConsumerValidationLabel' PR label used to skip the checks in this pipeline
@@ -36,11 +35,6 @@ resources:
     name: AzureAD/ad-accounts-for-android
     ref: dev
     endpoint: ANDROID_GITHUB
-  - repository: adal
-    type: github
-    name: AzureAD/azure-activedirectory-library-for-android
-    ref: dev
-    endpoint: ANDROID_GITHUB
 
 stages:
 - stage: getLabel
@@ -121,6 +115,10 @@ stages:
           git status
           git rev-parse HEAD
         workingDirectory: $(Agent.BuildDirectory)/s/common
+    - bash: |
+        echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS"
+        echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_ACCESSTOKEN]$(System.AccessToken)"
+      displayName: 'Set VSTS Fields in Environment'
     - task: Gradle@3
       displayName: Assemble msal
       inputs:
@@ -154,6 +152,10 @@ stages:
       clean: true
       submodules: recursive
       persistCredentials: True
+    - bash: |
+        echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS"
+        echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_ACCESSTOKEN]$(System.AccessToken)"
+      displayName: 'Set VSTS Fields in Environment'
     - template: ../templates/steps/automation-cert.yml
     - task: CmdLine@2
       displayName: Checkout common submodule $(commonBranch)
@@ -195,6 +197,10 @@ stages:
         clean: true
         submodules: recursive
         persistCredentials: True
+      - bash: |
+          echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS"
+          echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_ACCESSTOKEN]$(System.AccessToken)"
+        displayName: 'Set VSTS Fields in Environment'
       - task: AzureKeyVault@2
         displayName: 'Get Key vault LabAuth'
         inputs:
@@ -208,11 +214,6 @@ stages:
         inputs:
           targetType: inline
           script: java -version
-      - task: CmdLine@1
-        displayName: Set MVN Access Token in Environment
-        inputs:
-          filename: echo
-          arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN]$(System.AccessToken)'
       - task: CmdLine@1
         displayName: Set Office MVN Access Token in Environment
         inputs:
@@ -257,40 +258,3 @@ stages:
           testResultsFormat: 'JUnit'
           testResultsFiles: '**/TEST-*.xml'
           searchFolder: 'LinuxBroker'
-  # adal
-  - job: adalValidation
-    displayName: ADAL
-    dependsOn:
-      - setupBranch
-    variables:
-      commonBranch: $[ dependencies.setupBranch.outputs['setvarStep.commonBranch'] ]  # map in the variable
-    condition: and( succeeded(), not(contains(variables['prLabels'], variables['skipConsumerValidationLabel'])) )
-    steps:
-    - checkout: adal
-      displayName: Checkout adal repository
-      clean: true
-      submodules: recursive
-      persistCredentials: True
-    - task: CmdLine@2
-      displayName: Checkout common submodule $(commonBranch)
-      inputs:
-        script: |
-          git fetch
-          git checkout $(commonBranch)
-          git pull
-          git status
-          git rev-parse HEAD
-        workingDirectory: $(Agent.BuildDirectory)/s/common
-    - template: ../templates/steps/automation-cert.yml
-    - task: Gradle@3
-      displayName: Assemble adal
-      inputs:
-        tasks: clean adal:assembleLocal
-        jdkArchitecture: x64
-        jdkVersionOption: "1.17"
-    - task: Gradle@3
-      displayName: Run adal Unit tests
-      inputs:
-        tasks: adal:testLocalDebugUnitTest -Plabtest -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}} -PlabSecret=$(LabVaultAppCert)
-        jdkArchitecture: x64
-        jdkVersionOption: "1.17"

azure-pipelines/pull-request-validation/common.yml

@@ -28,11 +28,10 @@ jobs:
     submodules: recursive
     persistCredentials: True
   - template: ../templates/steps/automation-cert.yml
-  - task: CmdLine@1
-    displayName: Set Office MVN Access Token in Environment
-    inputs:
-      filename: echo
-      arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN]$(System.AccessToken)'
+  - bash: |
+      echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS"
+      echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_ACCESSTOKEN]$(System.AccessToken)"
+    displayName: 'Set VSTS Fields in Environment'
   - task: CodeQL3000Init@0
   - task: Gradle@3
     name: Gradle3   
@@ -78,11 +77,10 @@ jobs:
     clean: true
     submodules: recursive
     persistCredentials: True
-  - task: CmdLine@1
-    displayName: Set Office MVN Access Token in Environment
-    inputs:
-      filename: echo
-      arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN]$(System.AccessToken)'
+  - bash: |
+      echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS"
+      echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_ACCESSTOKEN]$(System.AccessToken)"
+    displayName: 'Set VSTS Fields in Environment'
   - task: Gradle@3
     displayName: Lint
     inputs:

azure-pipelines/templates/steps/automation-cert.yml

@@ -2,14 +2,13 @@
 
 parameters:
 - name: envVstsMvnAt
-  default: ENV_VSTS_MVN_ANDROIDADACCOUNTS_ACCESSTOKEN
+  default: ENV_VSTS_MVN_CRED_ACCESSTOKEN
 
 steps:
-- task: CmdLine@1
-  displayName: Set MVN Access Token in Environment
-  inputs:
-    filename: echo
-    arguments: '##vso[task.setvariable variable=${{ parameters.envVstsMvnAt }}]$(System.AccessToken)'
+- bash: |
+    echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS"
+    echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_ACCESSTOKEN]$(System.AccessToken)"
+  displayName: 'Set VSTS Fields in Environment'
 - task: AzureKeyVault@2
   displayName: 'Azure Key Vault: Download Cert for Automation'
   inputs:

azure-pipelines/templates/steps/continuous-delivery/assemble-publish-projversion.yml

@@ -10,7 +10,7 @@
 parameters:
 - name: project
 - name: envVstsMvnAt
-  default: 'ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN'
+  default: 'ENV_VSTS_MVN_CRED_ACCESSTOKEN'
 - name: variant
   default: ''
 - name: buildArguments
@@ -25,14 +25,13 @@ steps:
   clean: true
   submodules: recursive
   persistCredentials: True
-- task: CmdLine@1
-  displayName: Set MVN Access Token in Environment
-  inputs:
-    filename: echo
-    arguments: '##vso[task.setvariable variable=${{ parameters.envVstsMvnAt }}]$(System.AccessToken)'
+- bash: |
+    echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS"
+    echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_ACCESSTOKEN]$(System.AccessToken)"
+  displayName: 'Set VSTS Fields in Environment'
 - template: ../automation-cert.yml
   parameters:
-    envVstsMvnAt: ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN
+    envVstsMvnAt: ENV_VSTS_MVN_CRED_ACCESSTOKEN
 - task: Gradle@2
   displayName: Assemble ${{ parameters.project }} ${{ parameters.variant }}
   inputs:

azure-pipelines/templates/steps/spotbugs.yml

@@ -13,6 +13,10 @@ parameters:
 - name: javaVersion
   default: "1.17"
 steps:
+- bash: |
+    echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS"
+    echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_ACCESSTOKEN]$(System.AccessToken)"
+  displayName: 'Set VSTS Fields in Environment'
 - task: Gradle@3
   displayName: 'Run Spotbugs'
   inputs: