Merge branch 'dev' into mchand/openid-issuer-validation

Author: Mohit

changelog.txt

@@ -1,6 +1,10 @@
 vNext
 ----------
 - [MINOR] Add Open Id configuration issuer validation reporting in OpenIdProviderConfigurationClient (#2751)
+- [MINOR] Add client scenario to JwtRequestBody (#2755)
+
+Version 22.1.0
+----------
 - [PATCH] Fix Switch browser back stack (#2750)
 - [MINOR] Move ests telemetry behind feature flag (#2742)
 - [MINOR] Update Broker ATS flow for Resource Account (#2704)

common4j/src/main/com/microsoft/identity/common/java/commands/parameters/BrokerResourceAccountCommandParameters.java

@@ -28,6 +28,7 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.NonNull;
 import lombok.experimental.SuperBuilder;
 
 /**
@@ -37,15 +38,54 @@
 @Getter
 @SuperBuilder(toBuilder = true)
 @EqualsAndHashCode(callSuper = true)
-public class BrokerResourceAccountCommandParameters extends ResourceAccountCommandParameters {
+public class BrokerResourceAccountCommandParameters extends ResourceAccountCommandParameters
+        implements IBrokerTokenCommandParameters {
+    /**
+     * UID of the calling application process as seen by the Broker.
+     */
     @Expose
     private final int callerUid;
 
+    /**
+     * Version name/code of the calling application that initiated the request.
+     */
     @Expose
     private final String callerAppVersion;
 
+    /**
+     * Version of the Broker executing this request.
+     */
     @Expose
     private final String brokerVersion;
 
+    /**
+     * The AAD tenant id (home tenant) for the user account this request is for. It
+     * is derived from the {@link #getHomeAccountId()} value and is used
+     */
+    @Expose
+    @NonNull
+    private final String homeTenantId;
+
+    /**
+     * The user id in home tenant retrieved from {@link #getHomeAccountId()}.
+     */
+    @NonNull
+    private final String localAccountId;
+
+    /**
+     * {@link IBrokerAccount} if already present, otherwise null.
+     */
     private final IBrokerAccount brokerAccount;
+
+    /**
+     * The protocol version that was negotiated between the calling app / library
+     * and the Broker.
+     */
+    @Expose
+    private final String negotiatedBrokerProtocolVersion;
+
+    /**
+     * For this parameter class it is always {@link BrokerRequestType#REGULAR} as this request is not started in broker.
+     */
+    private final BrokerRequestType requestType = BrokerRequestType.REGULAR;
 }

common4j/src/main/com/microsoft/identity/common/java/jwt/AbstractJwtRequest.java

@@ -62,6 +62,7 @@ public static class ClaimNames {
         public static final String JWE_CRYPTO = "jwe_crypto";
         public static final String SESSION_KEY_CRYPTO = "session_key_crypto";
         public static final String PURPOSE = "purpose";
+        public static final String CLIENT_SCENARIO = "client_scenario";
     }
 
     @SerializedName(ClaimNames.REFRESH_TOKEN)

common4j/src/main/com/microsoft/identity/common/java/jwt/JwtRequestBody.java

@@ -88,6 +88,9 @@ public final class JwtRequestBody extends AbstractJwtRequest {
     @SerializedName(ClaimNames.PURPOSE)
     private String mPurpose;
 
+    @SerializedName(ClaimNames.CLIENT_SCENARIO)
+    private String mClientScenario;
+
     public void setIat(final long iat) {
         mIat = String.valueOf(iat);
     }

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

@@ -65,5 +65,7 @@ public enum SpanName {
     SwitchBrowserResume,
     SwitchBrowserProcess,
     WrappedKeyAlgorithmIdentifier,
-    ProcessWebCpRedirects
+    ProcessWebCpRedirects,
+
+    ProvisionResourceAccount
 }

common4j/versioning/version.properties

@@ -1,4 +1,4 @@
 #Wed May 12 20:08:39 UTC 2021
-versionName=22.0.3
+versionName=22.1.0
 versionCode=1
 latestPatchVersion=227

versioning/version.properties

@@ -1,4 +1,4 @@
 #Tue Apr 06 22:55:08 UTC 2021
-versionName=22.0.3
+versionName=22.1.0
 versionCode=1
 latestPatchVersion=234