Edge TB: changes related to GetToken, Fixes AB#3317102

changelog.txt

@@ -10,6 +10,7 @@ vNext
 - [MINOR] WebApps AccountId Registry (#2787)
 - [MINOR] Expose WebApps APIs (#2793)
 - [MINOR] Add domainHint support to authorization request (#2792)
+- [MINOR] Add support for WebApps getToken API (#2803)
 
 Version 23.0.2
 ----------

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

@@ -1396,6 +1396,34 @@ public static String computeMaxHostBrokerProtocol() {
          */
         public static final String BROKER_WEB_APPS_RESPONSE = "response";
 
+        /**
+         * String for broker webapps additional required params.
+         */
+        public static final String BROKER_WEB_APPS_ADDITIONAL_REQUIRED_PARAMS = "additional_required_params";
+
+        /**
+         * String for broker webapps extra args.
+         */
+        public static final String BROKER_WEB_APPS_EXTRA_ARGS = "extra_args";
+
+        /**
+         * String for broker webapps interactive request;
+         * when this field is present, the executeRequest operation will launch an interactive request.
+         */
+        public static final String BROKER_WEB_APPS_INTERACTIVE_REQUEST = "interactive_request";
+
+        /**
+         * String for broker webapps successful result after an interactive request;
+         * when this field is present, the getToken suboperation will repackage the result and return it to the caller.
+         */
+        public static final String BROKER_WEB_APPS_INTERACTIVE_SUCCESS_RESULT = "interactive_success_result";
+
+        /**
+         * String for broker webapps error result either after an interactive request or due to some early validation;
+         * when this field is present, the execute operation will repackage the result and return it to the caller.
+         */
+        public static final String BROKER_WEB_APPS_VALIDATION_OR_INTERACTIVE_ERROR_RESULT = "validation_or_interactive_error_result";
+
         /**
          * String for generate shr result.
          */
@@ -2141,5 +2169,28 @@ public static final class SdkPlatformFields {
         @Deprecated
         public static final String VERSION = com.microsoft.identity.common.java.AuthenticationConstants.SdkPlatformFields.VERSION;
     }
+
+    public static final class PoPConstants {
+        /**
+         * Indicates caller requests a PoP token instead of bearer.
+         */
+        public static final String SIGN_POP_TOKEN = "signPopToken";
+
+        /**
+         * Resource request components used to build the PoP SHR.
+         */
+        public static final String RESOURCE_REQUEST_URI = "resourceRequestUri";
+        public static final String RESOURCE_REQUEST_METHOD = "resourceRequestMethod";
+
+        /**
+         * Optional PoP supplemental values.
+         */
+        public static final String SHR_NONCE = "shrNonce";
+        public static final String SHR_CLAIMS = "shrClaims";
+        /**
+         * Key identifier for the PoP key used to sign the token.
+         */
+        public static final String KEY_ID = "keyId";
+    }
 }
 

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

@@ -84,6 +84,7 @@ 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";
     }
 
     /**
@@ -281,4 +282,8 @@ private static final class SerializedNames {
     @Nullable
     @SerializedName(SerializedNames.TENANT_ID)
     private String mTenantId;
+
+    @Nullable
+    @SerializedName(SerializedNames.REQUEST_TYPE)
+    private String mRequestType;
 }

common/src/main/java/com/microsoft/identity/common/internal/broker/ipc/WebAppsAdditionalRequiredParameters.kt

@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation.
+// All rights reserved.
+//
+// This code is licensed under the MIT License.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files(the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions :
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+package com.microsoft.identity.common.internal.broker.ipc
+
+import com.google.gson.annotations.SerializedName
+import com.microsoft.identity.common.java.request.SdkType
+
+/**
+ * Additional required parameters for WebApps operations.
+ */
+data class WebAppsAdditionalRequiredParameters(
+    // A parameter from Edge which indicates whether the calling application can show UI.
+    @SerializedName(FIELD_CAN_SHOW_UI)
+    val canShowUi: Boolean = false,
+
+    @SerializedName(FIELD_CALLING_PACKAGE_NAME)
+    val callingPackageName: String,
+
+    @SerializedName(FIELD_CALLING_APPLICATION_NAME)
+    val callingApplicationName: String,
+
+    @SerializedName(FIELD_CALLING_APPLICATION_VERSION)
+    val callingApplicationVersion: String,
+
+    @SerializedName(FIELD_SDK_TYPE)
+    val sdkType: SdkType,
+
+    @SerializedName(FIELD_SDK_VERSION)
+    val sdkVersion: String
+) {
+    companion object {
+        const val FIELD_CAN_SHOW_UI = "canShowUi"
+        const val FIELD_CALLING_PACKAGE_NAME = "callingPackageName"
+        const val FIELD_CALLING_APPLICATION_NAME = "callingApplicationName"
+        const val FIELD_CALLING_APPLICATION_VERSION = "callingApplicationVersion"
+        const val FIELD_SDK_TYPE = "sdkType"
+        const val FIELD_SDK_VERSION = "sdkVersion"
+    }
+}