Merge release/5.7.0 to dev (#2200)

Update and enable tests to run in pipeline (#2199)

Enabling 2 FLW test cases, which have been disabled to run in pipeline.

TestCase833513 - Updated account type and error verification
TestCase833515 - Replaced Edge steps with Outlook
TestCase1592468 - Removed as this is not valid

Ran locally with latest RC builds to verify these are passing.

Quick fix to ignore those flaky tests. Will be resolved later. (#2205)

Take new common, some ui fixes, Fixes AB#3058394 (#2198)

changes:
- Combined
https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2516613
into
https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2516571,
test will attempt sign in with just outlook, then AuthApp + outlook,
finally install cp then able to sign in. Also covers
https://identitydivision.visualstudio.com/Engineering/_workitems/edit/831545
because just tests auth with outlook and CP.
- Adjustments to TestCase2516967 for consistency
- Take common changes

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

Add Account Manager Tests, enable reading local flights param in automation apps, Fixes AB#3026183 (#2207)

Add Account Manager Tests, enable reading local flights param in
automation apps

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

Migrate URIBuilder to httpcore5, Fixes AB#2909378 (#2203)

Part 1 of the work to get rid msebera.httpclient.

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

Migrate the usage of uribuilder to httpcore5

Update Native Auth E2E tests to use more reliable inbox code retrieval method, Fixes AB#3037823 (#2211)

The original PR:
#2189

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

---------

Co-authored-by: Robert McCahill <[email protected]>

Adding more MSA test configs to MsalTestApp (#2209)

This PR adds two more config options for MsalTestApp:
- WEBVIEW_MSA: Webview selected as auth agent; Allows for MSA and AAD
accounts; passkeys enabled
- WEBVIEW_PPE_MSA: Webview selected as auth agent; INT MSA and PPE AAD
accounts; passkeys enabled

Migrate Base64 away from Msebera (in Android), Fixes AB#3077784 (#2210)

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

merge release/5.8.0 to dev (#2217)

Remove email attribute, Fixes AB#3080769 (#2224)

Remove "email" from the UserAttribute class. The email address is passed
as "username" in the signUp process.

Bug item description:
https://dev.azure.com/IdentityDivision/Engineering/_workitems/edit/3080769

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

Merging Somalaya/release/5.8.2 to dev (#2223)

Co-authored-by: iamgusain <[email protected]>

Android E2E Sign Up, Fixes AB#3073857 (#2213)

Create a draft version instead of an official one:
#2212
because the PR is still in the draft version.

[AB#3073857](https://dev.azure.com/IdentityDivision/Engineering/_workitems/edit/3073857)

Android Test plan:
https://identitydivision.visualstudio.com/Engineering/_testPlans/define?planId=3054662&suiteId=3054727
2.1.5
2.1.6
2.1.7 (out of scopes for the Lab environment, include them once the
environment is ready)
2.1.8
2.1.9
2.1.10
2.1.11

1.1.2
1.1.5
1.1.10
1.1.11
1.1.12
1.1.13
1.1.14

Add suberror for network errors, Fixes AB#3064171 (#2218)

Related:
AzureAD/microsoft-authentication-library-common-for-android#2537

Also make sure that MsalClientException returns the sub error code. 

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

automation app name changes

automation app name changes

automation app name changes

automation app name changes

tests with oneAuthTestApp updated

use lab query instead of temp user

removed temp user

rebased and removed unnecessary code

updated common

ignore unnecessary test

retry on failure

ignored unnecessary test

retry added

removed retry

removed duplicate retry

bringing back erroneously deleted file

Author: mohitc1

changelog

@@ -2,6 +2,24 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr
 
 vNext
 ----------
+-[MINOR] Add suberror for network errors (#2218)
+
+Version 5.8.2
+----------
+-[PATCH] Update common @18.2.2
+
+Version 5.8.1
+----------
+-[PATCH] Update common @18.2.1
+
+Version 5.8.0
+----------
+-[PATCH] Update common @18.2.0
+-[MINOR] Migrate Base64 away from Msebera (#2210)
+
+Version 5.7.0
+----------
+-[PATCH] Update common @18.1.0
 -[MINOR] Support for email OTP MFA in native authentication (#2167)
 -[MINOR] Add legacy FIDO2 API version (#2188)
 

common

@@ -48,7 +48,6 @@ ext {
     daggerVersion = "2.31.2"
     daggerCompilerVersion = "2.31.2"
     msal4jVersion = "1.10.0"
-    mseberaApacheHttpClientVersion = "4.5.8"
     moshiVersion = "1.14.0"
     moshiAdaptersVersion = "1.14.0"
     openpojoVersion = "0.9.1"

gradle/versions.gradle

@@ -213,7 +213,7 @@ dependencies {
     implementation ("com.nimbusds:nimbus-jose-jwt:$rootProject.ext.nimbusVersion") {
         exclude module: 'asm'
     }
-    implementation "cz.msebera.android:httpclient:$rootProject.ext.mseberaApacheHttpClientVersion"
+    implementation 'org.apache.httpcomponents.core5:httpcore5:5.3'
     implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.ext.kotlinXCoroutinesVersion"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinXCoroutinesVersion"

msal/build.gradle

@@ -1647,7 +1647,7 @@ private MsalException baseExceptionToMsalException(@NonNull final BaseException
             );
         }
 
-        return new MsalClientException(exception.getErrorCode(), exception.getMessage());
+        return MsalExceptionAdapter.msalExceptionFromBaseException(exception);
     }
 
     /**

msal/src/main/java/com/microsoft/identity/client/PublicClientApplication.java

@@ -58,10 +58,9 @@ public final class MsalUiRequiredException extends MsalException {
      */
     public static final String NO_ACCOUNT_FOUND = ErrorStrings.NO_ACCOUNT_FOUND;
 
-    @Getter
-    @Accessors(prefix = "m")
-    @Nullable
-    private String mOauthSubErrorCode;
+    public String getOauthSubErrorCode(){
+        return super.getSubErrorCode();
+    }
 
     /**
      * Constructor of MsalUiRequiredException.
@@ -90,15 +89,4 @@ public MsalUiRequiredException(final String errorCode, final String errorMessage
     public MsalUiRequiredException(final String errorCode, final String errorMessage, final Throwable throwable) {
         super(errorCode, errorMessage, throwable);
     }
-
-    /**
-     * Constructor of MsalUiRequiredException.
-     * @param errorCode         String
-     * @param oauthSubErrorCode String
-     * @param errorMessage      String
-     */
-    public MsalUiRequiredException(final String errorCode, @Nullable final String oauthSubErrorCode, final String errorMessage) {
-        super(errorCode, errorMessage);
-        mOauthSubErrorCode = oauthSubErrorCode;
-    }
 }

msal/src/main/java/com/microsoft/identity/client/exception/MsalUiRequiredException.java

@@ -42,6 +42,12 @@
 public class MsalExceptionAdapter {
 
     public static MsalException msalExceptionFromBaseException(final BaseException e) {
+        final MsalException result = msalExceptionFromBaseExceptionInternal(e);
+        result.setSubErrorCode(e.getSubErrorCode());
+        return result;
+    }
+
+    private static MsalException msalExceptionFromBaseExceptionInternal(final BaseException e) {
         if (e instanceof MsalException) {
             return  (MsalException) e;
         }
@@ -69,8 +75,8 @@ public static MsalException msalExceptionFromBaseException(final BaseException e
             final UiRequiredException uiRequiredException = ((UiRequiredException) e);
             return new MsalUiRequiredException(
                     uiRequiredException.getErrorCode(),
-                    uiRequiredException.getOAuthSubErrorCode(),
-                    uiRequiredException.getMessage()
+                    uiRequiredException.getMessage(),
+                    uiRequiredException
             );
         }
 

msal/src/main/java/com/microsoft/identity/client/internal/controllers/MsalExceptionAdapter.java

@@ -34,7 +34,6 @@ class UserAttributes(internal val userAttributes: Map<String, String>) {
             private const val CITY = "city"
             private const val COUNTRY = "country"
             private const val DISPLAY_NAME = "displayName"
-            private const val EMAIL_ADDRESS = "email"
             private const val GIVEN_NAME = "givenName"
             private const val JOB_TITLE = "jobTitle"
             private const val POSTAL_CODE = "postalCode"
@@ -72,15 +71,6 @@ class UserAttributes(internal val userAttributes: Map<String, String>) {
             return this
         }
 
-        /**
-         * Sets the email address for the user
-         * @param emailAddress: Email address for the user
-         */
-        fun emailAddress(emailAddress: String): Builder {
-            userAttributes[EMAIL_ADDRESS] = emailAddress
-            return this
-        }
-
         /**
          * Sets the given name for the user
          * @param givenName: Given name for the user

msal/src/main/java/com/microsoft/identity/nativeauth/UserAttributes.kt

@@ -118,8 +118,8 @@ public HttpResponse performIntercept(
                             @NonNull HttpClient.HttpMethod httpMethod,
                             @NonNull URL requestUrl,
                             @NonNull Map<String, String> requestHeaders,
-                            @Nullable byte[] requestContent) throws IOException {
-                        throw new IOException("Sending requests to server has been disabled for mocked unit tests");
+                            @Nullable byte[] requestContent) throws ClientException {
+                        throw new ClientException("Sending requests to server has been disabled for mocked unit tests");
                     }
                 });
     }

msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/AcquireTokenMockTest.java

@@ -37,6 +37,7 @@
 import com.microsoft.identity.common.java.eststelemetry.PublicApiId;
 import com.microsoft.identity.common.java.eststelemetry.EstsTelemetry;
 import com.microsoft.identity.common.java.eststelemetry.SchemaConstants;
+import com.microsoft.identity.common.java.exception.ClientException;
 import com.microsoft.identity.common.java.net.HttpClient;
 import com.microsoft.identity.common.java.net.HttpResponse;
 import com.microsoft.identity.http.HttpRequestInterceptor;
@@ -110,7 +111,7 @@ public HttpResponse performIntercept(
                             @NonNull HttpClient.HttpMethod httpMethod,
                             @NonNull URL requestUrl,
                             @NonNull Map<String, String> requestHeaders,
-                            @Nullable byte[] requestContent) throws IOException {
+                            @Nullable byte[] requestContent) throws ClientException {
                         final String correlationId = requestHeaders.get("client-request-id");
 
                         AcquireTokenMockedTelemetryTest.addCorrelationId(correlationId);