Skip to content

Commit dd91c65

Browse files
marcoscaceresmarcoscaceres
committed
Digital Credentials: DigitalCredentialRequest was renamed DigitalCredentialGetRequest
https://bugs.webkit.org/show_bug.cgi?id=304311 rdar://167115220 Reviewed by Anne van Kesteren. Renamed DigitalCredentialRequest to DigitalCredentialGetRequest, as per spec change: w3c-fedid/digital-credentials#204 * LayoutTests/http/tests/digital-credentials/digital-credential-console-messages.https-expected.txt: * Source/WebCore/CMakeLists.txt: * Source/WebCore/DerivedSources-input.xcfilelist: * Source/WebCore/DerivedSources-output.xcfilelist: * Source/WebCore/DerivedSources.make: * Source/WebCore/Headers.cmake: * Source/WebCore/Modules/identity/DigitalCredential.cpp: (WebCore::jsToCredentialRequest): (WebCore::DigitalCredential::convertObjectsToDigitalPresentationRequests): * Source/WebCore/Modules/identity/DigitalCredential.h: * Source/WebCore/Modules/identity/DigitalCredentialGetRequest.h: Renamed from Source/WebCore/Modules/identity/DigitalCredentialRequest.h. * Source/WebCore/Modules/identity/DigitalCredentialGetRequest.idl: Renamed from Source/WebCore/Modules/identity/DigitalCredentialRequest.idl. * Source/WebCore/Modules/identity/DigitalCredentialRequestOptions.h: * Source/WebCore/Modules/identity/DigitalCredentialRequestOptions.idl: * Source/WebCore/Sources.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebKit/UIProcess/DigitalCredentials/WKDigitalCredentialsPicker.mm: * Source/WebKit/UIProcess/WebPageProxy.cpp: Canonical link: https://commits.webkit.org/305608@main
1 parent 9f5b37e commit dd91c65

16 files changed

Lines changed: 30 additions & 30 deletions

‎LayoutTests/http/tests/digital-credentials/digital-credential-console-messages.https-expected.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
CONSOLE MESSAGE: Ignoring DigitalCredentialRequest with unsupported protocol: "unknown-protocol-1"
2-
CONSOLE MESSAGE: Ignoring DigitalCredentialRequest with unsupported protocol: "unknown-protocol-2"
3-
CONSOLE MESSAGE: Ignoring DigitalCredentialRequest with unsupported protocol: "unknown-before"
4-
CONSOLE MESSAGE: Ignoring DigitalCredentialRequest with unsupported protocol: "unknown-after"
1+
CONSOLE MESSAGE: Ignoring DigitalCredentialGetRequest with unsupported protocol: "unknown-protocol-1"
2+
CONSOLE MESSAGE: Ignoring DigitalCredentialGetRequest with unsupported protocol: "unknown-protocol-2"
3+
CONSOLE MESSAGE: Ignoring DigitalCredentialGetRequest with unsupported protocol: "unknown-before"
4+
CONSOLE MESSAGE: Ignoring DigitalCredentialGetRequest with unsupported protocol: "unknown-after"
55
PASS successfullyParsed is true
66

77
TEST COMPLETE

‎Source/WebCore/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ set(WebCore_NON_SVG_IDL_FILES
451451
Modules/highlight/HighlightRegistry.idl
452452

453453
Modules/identity/DigitalCredential.idl
454-
Modules/identity/DigitalCredentialRequest.idl
454+
Modules/identity/DigitalCredentialGetRequest.idl
455455
Modules/identity/DigitalCredentialRequestOptions.idl
456456
Modules/identity/IdentityCredentialProtocol.idl
457457

‎Source/WebCore/DerivedSources-input.xcfilelist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ $(PROJECT_DIR)/Modules/geolocation/PositionOptions.idl
517517
$(PROJECT_DIR)/Modules/highlight/Highlight.idl
518518
$(PROJECT_DIR)/Modules/highlight/HighlightRegistry.idl
519519
$(PROJECT_DIR)/Modules/identity/DigitalCredential.idl
520-
$(PROJECT_DIR)/Modules/identity/DigitalCredentialRequest.idl
520+
$(PROJECT_DIR)/Modules/identity/DigitalCredentialGetRequest.idl
521521
$(PROJECT_DIR)/Modules/identity/DigitalCredentialRequestOptions.idl
522522
$(PROJECT_DIR)/Modules/identity/IdentityCredentialProtocol.idl
523523
$(PROJECT_DIR)/Modules/identity/protocols/ISO18013/MobileDocumentRequest.idl

‎Source/WebCore/DerivedSources-output.xcfilelist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -907,8 +907,8 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDeviceOrientationOrMotionPermissi
907907
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDeviceOrientationOrMotionPermissionState.h
908908
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredential.cpp
909909
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredential.h
910-
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredentialRequest.cpp
911-
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredentialRequest.h
910+
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredentialGetRequest.cpp
911+
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredentialGetRequest.h
912912
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredentialRequestOptions.cpp
913913
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredentialRequestOptions.h
914914
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDistanceModelType.cpp

‎Source/WebCore/DerivedSources.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ JS_BINDING_IDLS := \
378378
$(WebCore)/Modules/highlight/HighlightRegistry.idl \
379379
$(WebCore)/Modules/highlight/Highlight.idl \
380380
$(WebCore)/Modules/identity/DigitalCredential.idl \
381-
$(WebCore)/Modules/identity/DigitalCredentialRequest.idl \
381+
$(WebCore)/Modules/identity/DigitalCredentialGetRequest.idl \
382382
$(WebCore)/Modules/identity/DigitalCredentialRequestOptions.idl \
383383
$(WebCore)/Modules/identity/IdentityCredentialProtocol.idl \
384384
$(WebCore)/Modules/identity/protocols/ISO18013/MobileDocumentRequest.idl \

‎Source/WebCore/Headers.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
493493
Modules/identity/CredentialRequestCoordinator.h
494494
Modules/identity/CredentialRequestCoordinatorClient.h
495495
Modules/identity/DigitalCredential.h
496-
Modules/identity/DigitalCredentialRequest.h
496+
Modules/identity/DigitalCredentialGetRequest.h
497497
Modules/identity/DigitalCredentialRequestOptions.h
498498
Modules/identity/DigitalCredentialsRequestData.h
499499
Modules/identity/DigitalCredentialsResponseData.h

‎Source/WebCore/Modules/identity/DigitalCredential.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static std::optional<IdentityCredentialProtocol> convertProtocolString(const Str
7171
return std::nullopt;
7272
}
7373

74-
static ExceptionOr<std::optional<UnvalidatedDigitalCredentialRequest>> jsToCredentialRequest(const Document& document, const DigitalCredentialRequest& request)
74+
static ExceptionOr<std::optional<UnvalidatedDigitalCredentialRequest>> jsToCredentialRequest(const Document& document, const DigitalCredentialGetRequest& request)
7575
{
7676
auto scope = DECLARE_THROW_SCOPE(document.globalObject()->vm());
7777
auto* globalObject = document.globalObject();
@@ -98,7 +98,7 @@ static ExceptionOr<std::optional<UnvalidatedDigitalCredentialRequest>> jsToCrede
9898
}
9999
}
100100

101-
ExceptionOr<Vector<UnvalidatedDigitalCredentialRequest>> DigitalCredential::convertObjectsToDigitalPresentationRequests(const Document& document, const Vector<DigitalCredentialRequest>& requests)
101+
ExceptionOr<Vector<UnvalidatedDigitalCredentialRequest>> DigitalCredential::convertObjectsToDigitalPresentationRequests(const Document& document, const Vector<DigitalCredentialGetRequest>& requests)
102102
{
103103
Vector<UnvalidatedDigitalCredentialRequest> results;
104104
for (auto& request : requests) {
@@ -112,13 +112,13 @@ ExceptionOr<Vector<UnvalidatedDigitalCredentialRequest>> DigitalCredential::conv
112112
}
113113

114114
if (RefPtr context = document.scriptExecutionContext()) {
115-
String warning = makeString("Ignoring DigitalCredentialRequest with unsupported protocol: \""_s, request.protocol, "\""_s);
115+
String warning = makeString("Ignoring DigitalCredentialGetRequest with unsupported protocol: \""_s, request.protocol, "\""_s);
116116
context->addConsoleMessage(MessageSource::Other, MessageLevel::Warning, warning);
117117
}
118118
}
119119

120120
if (results.isEmpty())
121-
return Exception { ExceptionCode::TypeError, "At least one supported DigitalCredentialRequest must present"_s };
121+
return Exception { ExceptionCode::TypeError, "At least one supported DigitalCredentialGetRequest must present"_s };
122122

123123
return results;
124124
}

‎Source/WebCore/Modules/identity/DigitalCredential.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace WebCore {
4141
class Document;
4242
enum class IdentityCredentialProtocol : uint8_t;
4343
struct CredentialRequestOptions;
44-
struct DigitalCredentialRequest;
44+
struct DigitalCredentialGetRequest;
4545
struct DigitalCredentialRequestOptions;
4646
template<typename IDLType> class DOMPromiseDeferred;
4747
template<typename> class ExceptionOr;
@@ -75,7 +75,7 @@ class DigitalCredential final : public BasicCredential {
7575
DigitalCredential(JSC::Strong<JSC::JSObject>&&, IdentityCredentialProtocol);
7676

7777
static ExceptionOr<Vector<ValidatedDigitalCredentialRequest>> validateRequests(const Document&, Vector<UnvalidatedDigitalCredentialRequest>&&);
78-
static ExceptionOr<Vector<UnvalidatedDigitalCredentialRequest>> convertObjectsToDigitalPresentationRequests(const Document&, const Vector<DigitalCredentialRequest>&);
78+
static ExceptionOr<Vector<UnvalidatedDigitalCredentialRequest>> convertObjectsToDigitalPresentationRequests(const Document&, const Vector<DigitalCredentialGetRequest>&);
7979
static bool parseResponseData(RefPtr<Document>, const String&, JSC::JSObject*&);
8080

8181
Type credentialType() const final { return Type::DigitalCredential; }

Source/WebCore/Modules/identity/DigitalCredentialRequest.h renamed to Source/WebCore/Modules/identity/DigitalCredentialGetRequest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class JSObject;
3333

3434
namespace WebCore {
3535

36-
struct DigitalCredentialRequest {
36+
struct DigitalCredentialGetRequest {
3737
String protocol;
3838
JSC::Strong<JSC::JSObject> data;
3939
};

Source/WebCore/Modules/identity/DigitalCredentialRequest.idl renamed to Source/WebCore/Modules/identity/DigitalCredentialGetRequest.idl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
dictionary DigitalCredentialRequest {
26+
dictionary DigitalCredentialGetRequest {
2727
required DOMString protocol;
2828
required object data;
2929
};

0 commit comments

Comments
 (0)