CREDENTIAL: Teach the 'PasswordCredential(HTMLFormElement)' constructor about URLSearchParams

third_party/WebKit/Source/modules/credentialmanager/PasswordCredential.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/credentialmanager/PasswordCredential.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/HTMLNames.h"
 #include "core/dom/ExecutionContext.h"
@@ skipping 65 matching lines @@
         }
     }
 
     // Create a PasswordCredential using the data gathered above.
     PasswordCredential* credential = PasswordCredential::create(data, exceptionState);
     if (exceptionState.hadException())
         return nullptr;
     ASSERT(credential);
 
     // After creating the Credential, populate its 'additionalData', 'idName', and 'passwordName' attributes.
-    FormDataOrURLSearchParams additionalData;
-    additionalData.setFormData(formData);
-    credential->setAdditionalData(additionalData);
+    // If the form's 'enctype' is anything other than multipart, generate a URLSearchParams using the
+    // data in |formData|.
     credential->setIdName(idName);
     credential->setPasswordName(passwordName);
+
+    FormDataOrURLSearchParams additionalData;
+    if (form->enctype() == "multipart/form-data") {
+        additionalData.setFormData(formData);
+    } else {
+        URLSearchParams* params = URLSearchParams::create(URLSearchParamsInit());
+        for (const FormData::Entry* entry : formData->entries()) {
+            if (entry->isString())
+                params->append(entry->name().data(), entry->value().data());
+        }
+        additionalData.setURLSearchParams(params);
+    }
+
+    credential->setAdditionalData(additionalData);
     return credential;
 }
 
 PasswordCredential::PasswordCredential(WebPasswordCredential* webPasswordCredential)
     : Credential(webPasswordCredential->getPlatformCredential())
     , m_idName("username")
     , m_passwordName("password")
 {
 }
 
@@ skipping 51 matching lines @@
     return static_cast<PlatformPasswordCredential*>(m_platformCredential.get())->password();
 }
 
 DEFINE_TRACE(PasswordCredential)
 {
     Credential::trace(visitor);
     visitor->trace(m_additionalData);
 }
 
 } // namespace blink