dev

Author: melissaahn

.github/workflows/integration/release-fix.yml

@@ -0,0 +1,50 @@
+##
+# Workflow: release-fix auto PR
+# Purpose: When a `release-fix/*` branch is created, automatically
+#          open a pull request targeting the corresponding `release/<version>` branch.
+# Maintainer: Android Team - Release Engineering
+# Docs: See repository CONTRIBUTING.md for release process guidance
+##
+name: Auto PR to merge release-fix branches into release
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  create:
+
+jobs:
+  create-pr:
+    if: >
+      github.event.ref_type == 'branch' &&
+      startsWith(github.event.ref, 'release-fix/') &&
+      vars.ENABLE_RELEASE_AUTOMATION == 'true'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Compute target release version
+        id: compute_version
+        run: |
+          BRANCH_NAME="${{ github.event.ref }}"
+          if [[ "$BRANCH_NAME" =~ ^release-fix/(.+)$ ]]; then
+            VERSION="${BASH_REMATCH[1]}"
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
+            echo "Computed version: $VERSION"
+          else
+            echo "Failed to compute version from branch: $BRANCH_NAME"
+            exit 1
+          fi
+
+      - name: Create Pull Request
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr create \
+            --base "release/${{ steps.compute_version.outputs.version }}" \
+            --head "${{ github.event.ref }}" \
+            --title "Auto PR: ${{ github.event.ref }} → release/${{ steps.compute_version.outputs.version }}" \
+            --body "This is an automated pull request created to integrate release changes into release/${{ steps.compute_version.outputs.version }}. Triggered when the branch ${{ github.event.ref }} was published."

.github/workflows/integration/release-integration.yml

@@ -0,0 +1,38 @@
+##
+# Workflow: release-integration auto PR
+# Purpose: When a `release-integration/*` branch is created, automatically
+#          open a pull request targeting `dev` to integrate release changes.
+##
+name: Auto PR to dev for release-integration branches
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  create:
+
+concurrency:
+  group: auto-pr-release-integration-${{ github.event.ref }}
+  cancel-in-progress: false
+
+jobs:
+  create-pr:
+    if: >
+      github.event.ref_type == 'branch' &&
+      startsWith(github.event.ref, 'release-integration/') &&
+      vars.ENABLE_RELEASE_AUTOMATION == 'true'
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Create Pull Request
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh pr create \
+          --base dev \
+          --head "${{ github.event.ref }}" \
+          --title "Auto PR: ${{ github.event.ref }} → dev" \
+          --body "This is an automated pull request created to integrate release changes into **dev**. Triggered when the branch **${{ github.event.ref }}** was published."

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

@@ -25,6 +25,10 @@ jobs:
     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: Gradle@1
     name: Gradle1

azure-pipelines/pull-request-validation/lab-utilities.yml

@@ -24,6 +24,10 @@ jobs:
         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: Gradle@1
         name: Gradle1

build.gradle

@@ -2,7 +2,6 @@
 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")
 
-
 buildscript {
     apply from: rootProject.file("gradle/versions.gradle")
 

changelog.txt

@@ -9,6 +9,7 @@ vNext
 - [MINOR] Fix for SDL violation in device pop scenarios, Fixes AB#3284510 (#2744)
 - [MINOR] Adds Authentication Constants to be used for broker latency timestamp in response (#2831)
 - [MINOR] ExtraTokenBodyParameters (#2825)
+- [MINOR] Add support for WebApps getToken API (#2803)
 
 Version 23.1.1
 -----------

common-java-root/build.gradle

@@ -7,7 +7,18 @@ buildscript {
 
     repositories {
         google()
-        mavenCentral()
+        // If you don't have access to the package feed uncomment these repositories
+        //  mavenCentral()
+        maven {
+            name "vsts-maven-adal-android"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
+            credentials {
+                credentials {
+                    username System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername")
+                    password System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
+                }
+            }
+        }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.ext.kotlinVersion}"

common-java-root/settings.gradle

@@ -2,8 +2,17 @@ pluginManagement {
     repositories {
         // If you don't have access to the package feed uncomment these repositories
         //  mavenCentral()
+        mavenLocal()
         google()
         gradlePluginPortal()
+        maven {
+            name "vsts-maven-adal-android"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
+            credentials {
+                username System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername")
+                password System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
+            }
+        }
     }
 }
 

common/src/main/java/com/microsoft/identity/common/adal/internal/AuthenticationConstants.java

@@ -1379,22 +1379,37 @@ public static String computeMaxHostBrokerProtocol() {
         /**
          * String for broker webapps get contracts result.
          */
-        public static final String BROKER_WEBAPPS_GET_CONTRACTS_RESULT = "contracts";
+        public static final String BROKER_WEBAPPS_GET_CONTRACTS_RESULT = "web_apps_contracts";
 
         /**
-         * String for broker webapps error result.
+         * String for broker webapps request.
          */
-        public static final String BROKER_WEB_APPS_ERROR = "error";
+        public static final String BROKER_WEB_APPS_EXECUTE_REQUEST = "web_apps_execute_request";
 
         /**
-         * String for broker webapps request.
+         * String for broker webapps additional required params.
          */
-        public static final String BROKER_WEB_APPS_REQUEST = "request";
+        public static final String BROKER_WEB_APPS_ADDITIONAL_REQUIRED_PARAMS = "additional_required_params";
 
         /**
          * String for broker webapps response.
          */
-        public static final String BROKER_WEB_APPS_RESPONSE = "response";
+        public static final String BROKER_WEB_APPS_SUCCESSFUL_RESULT = "web_app_successful_result";
+
+        /**
+         * String for compressed broker webapps response.
+         */
+        public static final String BROKER_WEB_APPS_SUCCESSFUL_RESULT_COMPRESSED = "web_app_successful_result_compressed";
+
+        /**
+         * String for broker webapps interactive intent.
+         */
+        public static final String BROKER_WEB_APPS_INTERACTIVE_INTENT = "web_apps_interactive_intent";
+
+        /**
+         * String for broker webapps error result.
+         */
+        public static final String BROKER_WEB_APPS_ERROR_RESULT = "web_apps_error_result";
 
         /**
          * String for generate shr result.
@@ -2142,4 +2157,3 @@ public static final class SdkPlatformFields {
         public static final String VERSION = com.microsoft.identity.common.java.AuthenticationConstants.SdkPlatformFields.VERSION;
     }
 }
-

common/src/main/java/com/microsoft/identity/common/internal/broker/BrokerRequest.java

@@ -85,6 +85,8 @@ private static final class SerializedNames {
         final static String SIGN_IN_WITH_GOOGLE_CREDENTIAL = "sign_in_with_google_credential";
 
         final static String TENANT_ID = "tenant_id";
+        final static String REQUEST_TYPE = "request_type";
+        final static String WEB_APPS_STATE = "web_apps_state";
     }
 
     /**
@@ -289,4 +291,15 @@ private static final class SerializedNames {
     @Nullable
     @SerializedName(SerializedNames.TENANT_ID)
     private String mTenantId;
+
+    @Nullable
+    @SerializedName(SerializedNames.REQUEST_TYPE)
+    private String mRequestType;
+
+    /**
+     * State for web apps requests. Make sure not to log this.
+     */
+    @Nullable
+    @SerializedName(SerializedNames.WEB_APPS_STATE)
+    private String mWebAppsState;
 }