summaryrefslogtreecommitdiffstats
path: root/dom/credentialmanagement
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
commitd8bbc7858622b6d9c278469aab701ca0b609cddf (patch)
treeeff41dc61d9f714852212739e6b3738b82a2af87 /dom/credentialmanagement
parentReleasing progress-linux version 125.0.3-1~progress7.99u1. (diff)
downloadfirefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz
firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/credentialmanagement')
-rw-r--r--dom/credentialmanagement/identity/IdentityCredential.cpp15
-rw-r--r--dom/credentialmanagement/identity/IdentityNetworkHelpers.h2
2 files changed, 8 insertions, 9 deletions
diff --git a/dom/credentialmanagement/identity/IdentityCredential.cpp b/dom/credentialmanagement/identity/IdentityCredential.cpp
index 182974e81d..c7541a8d69 100644
--- a/dom/credentialmanagement/identity/IdentityCredential.cpp
+++ b/dom/credentialmanagement/identity/IdentityCredential.cpp
@@ -602,15 +602,14 @@ RefPtr<IdentityCredential::GetTokenPromise> IdentityCredential::FetchToken(
MakeSafeRefPtr<InternalRequest>(tokenLocation, fragment);
internalRequest->SetMethod("POST"_ns);
URLParams bodyValue;
- bodyValue.Set(u"account_id"_ns, aAccount.mId);
- bodyValue.Set(u"client_id"_ns, aProvider.mClientId);
+ bodyValue.Set("account_id"_ns, NS_ConvertUTF16toUTF8(aAccount.mId));
+ bodyValue.Set("client_id"_ns, aProvider.mClientId);
if (aProvider.mNonce.WasPassed()) {
- bodyValue.Set(u"nonce"_ns, aProvider.mNonce.Value());
+ bodyValue.Set("nonce"_ns, aProvider.mNonce.Value());
}
- bodyValue.Set(u"disclosure_text_shown"_ns, u"false"_ns);
- nsString bodyString;
- bodyValue.Serialize(bodyString, true);
- nsCString bodyCString = NS_ConvertUTF16toUTF8(bodyString);
+ bodyValue.Set("disclosure_text_shown"_ns, "false"_ns);
+ nsAutoCString bodyCString;
+ bodyValue.Serialize(bodyCString, true);
nsCOMPtr<nsIInputStream> streamBody;
rv = NS_NewCStringInputStream(getter_AddRefs(streamBody), bodyCString);
if (NS_FAILED(rv)) {
@@ -1097,7 +1096,7 @@ already_AddRefed<Promise> IdentityCredential::LogoutRPs(
nsContentPolicyType::TYPE_WEB_IDENTITY);
RefPtr<Request> domRequest =
new Request(global, std::move(internalRequest), nullptr);
- RequestOrUSVString fetchInput;
+ RequestOrUTF8String fetchInput;
fetchInput.SetAsRequest() = domRequest;
RootedDictionary<RequestInit> requestInit(RootingCx());
IgnoredErrorResult error;
diff --git a/dom/credentialmanagement/identity/IdentityNetworkHelpers.h b/dom/credentialmanagement/identity/IdentityNetworkHelpers.h
index d812269612..e8107ef280 100644
--- a/dom/credentialmanagement/identity/IdentityNetworkHelpers.h
+++ b/dom/credentialmanagement/identity/IdentityNetworkHelpers.h
@@ -28,7 +28,7 @@ RefPtr<TPromise> FetchJSONStructure(Request* aRequest) {
new typename TPromise::Private(__func__);
// Fetch the provided request
- RequestOrUSVString fetchInput;
+ RequestOrUTF8String fetchInput;
fetchInput.SetAsRequest() = aRequest;
RootedDictionary<RequestInit> requestInit(RootingCx());
IgnoredErrorResult error;