@W-21933885: [MSDK Android] App Attestation Implementation (Restore Previous Attestation Encoding)

Author: JohnsonEricAtSalesforce

libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/AppAttestationClient.kt

@@ -250,6 +250,6 @@ internal data class OAuthAuthorizationAttestation(
     /**
      * Returns a Base64-encoded JSON representation of this object
      */
-    fun toBase64String(): String? = Base64.getUrlEncoder().withoutPadding().encodeToString(Json.encodeToString(serializer(), this).encodeToByteArray())
+    fun toBase64String(): String? = Base64.getEncoder().encodeToString(Json.encodeToString(serializer(), this).encodeToByteArray())
 }
 

libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/OAuth2.java

@@ -583,7 +583,7 @@ public static TokenEndpointResponse makeTokenEndpointRequest(HttpAccess httpAcce
         final String challenge = appAttestationClient != null ? appAttestationClient.fetchMobileAppAttestationChallenge() : null;
         final String attestationValue = challenge != null ? appAttestationClient.createAppAttestationBlocking(challenge) : null;
         if (attestationValue != null) {
-            sb.append(AND).append(ATTESTATION).append(EQUAL).append(Uri.encode(attestationValue));
+            sb.append(AND).append(ATTESTATION).append(EQUAL).append(attestationValue);
         }
 
         final String refreshPath = sb.toString();

libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/auth/AppAttestationClientTest.kt

@@ -417,7 +417,7 @@ class AppAttestationClientTest {
         const val TEST_CHALLENGE_VALUE = "__TEST_CHALLENGE_VALUE__"
         const val TEST_INTEGRITY_TOKEN = "__TEST_INTEGRITY_TOKEN__"
         const val EXPECTED_ATTESTATION_RESULT =
-            "eyJhdHRlc3RhdGlvbklkIjoiMTIzNDU2IiwiYXR0ZXN0YXRpb25EYXRhIjoiWDE5VVJWTlVYMGxPVkVWSFVrbFVXVjlVVDB0RlRsOWYifQ"
+            "eyJhdHRlc3RhdGlvbklkIjoiMTIzNDU2IiwiYXR0ZXN0YXRpb25EYXRhIjoiWDE5VVJWTlVYMGxPVkVWSFVrbFVXVjlVVDB0RlRsOWYifQ=="
         const val TEST_ATTESTATION_ID = "123456"
         const val TEST_ATTESTATION_DATA = "W19VVlJTVVhNbExPVkVWSFVrbFVXVjlVVDB0RlRsOWYifQ=="
         const val TEST_ATTESTATION_JSON =