Move our Libraries to only use artifact feed for packages, no Maven Central, Fixes AB#3395409 (#2830)

Received an s360 item asking our libraries to always pull packages from
feeds, and not declare mavenCentral as a repository to source
dependencies. The feed itself has maven as an upstream. We cannot use
AndroidADAL feed as that one has some versions deleted (once a version
is deleted from a feed, it cannot be restored, even if an upstream has
it). Created a new feed to support this
https://identitydivision.visualstudio.com/Engineering/_artifacts/feed/NewAndroid.
We pull packages from this new feed, but we still publish our versions
to AndroidADAL. The new feed has AndroidADAL as an upstream still, so
our existing collection of artifacts is still accessible.

I also took this chance to consolidate the Maven VSTS Username and
Access Token fields, which are fields used to authenticate and pull
artifacts from the feed. Previously, each library had their own names
for these fields with an identifier based on the library in question.
These PRs make it so all libraries use the same names,
`ENV_VSTS_MVN_CRED_USERNAME` and `ENV_VSTS_MVN_CRED_ACCESSTOKEN`.

**Validation**
Weekly:
https://identitydivision.visualstudio.com/Engineering/_build/results?buildId=1568877&view=results
(LTW msal automation app failed because ltw branch does not have these
changes, will work once this is in dev and we rebase.
Consumers:
https://identitydivision.visualstudio.com/Engineering/_build/results?buildId=1568839&view=results
Test Library:
https://identitydivision.visualstudio.com/Engineering/_build/results?buildId=1568872&view=results


[AB#3395409](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3395409)

Author: fadidurah

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:

azure-pipelines/templates/steps/vsts-release.yml

@@ -1,6 +1,5 @@
 # File: azure-pipelines\templates\steps\nightly-snapshot-releases\vsts-release.yml
 # Description: Template to assemble and publish Snapshot/Latest versions of ${{ parameters.projectName }}
-# Variable: 'ENV_VSTS_MVN_ANDROIDADACCOUNTS_USERNAME' was defined in the Variables tab
 # Variable: 'gradleTasks' list all the gradle tasks to be used.
 # Variable: 'accessTokenName'  secret used to access the private azure devops maven feed.
 # Variable: 'runUnitTest' boolean: refers to whether the pipeline will run unit tests or not.

azure-pipelines/templates/steps/vsts-release/vsts-release-template.yml

@@ -25,6 +25,11 @@ jobs:
     clean: true
     submodules: recursive
     persistCredentials: True
+  - task: CmdLine@1
+    displayName: Set MVN Username in Environment
+    inputs:
+      filename: echo
+      arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS'
   - task: CmdLine@1
     displayName: Set MVN AccessToken in Environment
     inputs: