Merge branch 'dev' into yuki/company-with-robert-PR-test

Yuki-YuXin · Yuki-YuXin · commit 43be7bfda1f2 · 2024-07-31T14:42:52.000+01:00
# Conflicts:
#	common
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "microsoft-authentication-library-common-for-android"]
 	path = common
 	url = https://github.com/AzureAD/microsoft-authentication-library-common-for-android.git
-	branch = yuki/key-vault-test
diff --git a/changelog b/changelog
@@ -6,6 +6,7 @@ vNext
 Version 5.4.2
 ---------
 - [PATCH] Update common @17.6.1
+- [MINOR] Fix UserAttributesBuilder being a singleton bug (#2145)
 
 Version 5.4.0
 ----------
diff --git a/common b/common
@@ -1 +1 @@
-Subproject commit c8318496e4b5cfb0e86325f72c03e93a4e2e5c44
+Subproject commit 18da6e27ced2d415d5dc6918ffe9749db85ca52e
diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/AcquireTokenMockTest.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/AcquireTokenMockTest.java
@@ -200,7 +200,7 @@ public void testAcquireTokenFailureUnsuccessfulTokenResult() {
                 .withLoginHint(username)
                 .withScopes(Arrays.asList(mScopes))
                 .fromAuthority(getAuthority())
-                .withCallback(AcquireTokenTestHelper.failureInteractiveCallback(ErrorCodes.UNKNOWN_ERROR_CODE))
+                .withCallback(AcquireTokenTestHelper.failureInteractiveCallback(ErrorCodes.NULL_POINTER_ERROR_CDOE))
                 .build();
 
         mApplication.acquireToken(parameters);
diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/utils/ErrorCodes.java b/msal/src/test/java/com/microsoft/identity/client/e2e/utils/ErrorCodes.java
@@ -29,4 +29,5 @@ public class ErrorCodes {
     public static final String NO_ACCOUNT_FOUND_ERROR_CODE = "no_account_found";
     public static final String NO_CURRENT_ACCOUNT_ERROR_CODE = "no_current_account";
     public static final String INTERNAL_SERVER_ERROR_CODE = "internal_server_error";
+    public static final String NULL_POINTER_ERROR_CDOE = "null_pointer_error";
 }

Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,5 @@ public class ErrorCodes {`
`29`	`29`	`public static final String NO_ACCOUNT_FOUND_ERROR_CODE = "no_account_found";`
`30`	`30`	`public static final String NO_CURRENT_ACCOUNT_ERROR_CODE = "no_current_account";`
`31`	`31`	`public static final String INTERNAL_SERVER_ERROR_CODE = "internal_server_error";`
	`32`	`+ public static final String NULL_POINTER_ERROR_CDOE = "null_pointer_error";`
`32`	`33`	`}`