Skip to content

Commit 5435910

Browse files
marcoscaceresmarcoscaceres
committed
Digital Credentials: IdentityCredentialProtocol was renamed DigitalCredentialPresentationProtocol
rdar://168641111 https://bugs.webkit.org/show_bug.cgi?id=305989 Reviewed by Anne van Kesteren. Renamed IdentityCredentialProtocol to DigitalCredentialPresentationProtocol. Spec change: w3c-fedid/digital-credentials#401 Relies on existing tests. * 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::DigitalCredential::create): (WebCore::DigitalCredential::DigitalCredential): (WebCore::convertProtocolString): (WebCore::jsToCredentialRequest): * Source/WebCore/Modules/identity/DigitalCredential.h: * Source/WebCore/Modules/identity/DigitalCredential.idl: * Source/WebCore/Modules/identity/DigitalCredentialPresentationProtocol.h: Renamed from Source/WebCore/Modules/identity/IdentityCredentialProtocol.h. * Source/WebCore/Modules/identity/DigitalCredentialPresentationProtocol.idl: Renamed from Source/WebCore/Modules/identity/IdentityCredentialProtocol.idl. * Source/WebCore/Modules/identity/DigitalCredentialsResponseData.h: * Source/WebCore/Modules/identity/protocols/DigitalCredentialsProtocols.h: * Source/WebCore/Sources.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: * Source/WebKit/UIProcess/DigitalCredentials/WKDigitalCredentialsPicker.mm: (-[WKRequestDataResult initWithRequestDataBytes:protocol:]): (-[WKDigitalCredentialsPicker handlePresentmentCompletionWithResponse:error:]): Canonical link: https://commits.webkit.org/306123@main
1 parent f9202f4 commit 5435910

16 files changed

Lines changed: 37 additions & 37 deletions

‎Source/WebCore/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ set(WebCore_NON_SVG_IDL_FILES
452452

453453
Modules/identity/DigitalCredential.idl
454454
Modules/identity/DigitalCredentialGetRequest.idl
455+
Modules/identity/DigitalCredentialPresentationProtocol.idl
455456
Modules/identity/DigitalCredentialRequestOptions.idl
456-
Modules/identity/IdentityCredentialProtocol.idl
457457

458458
Modules/identity/protocols/ISO18013/MobileDocumentRequest.idl
459459

‎Source/WebCore/DerivedSources-input.xcfilelist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ $(PROJECT_DIR)/Modules/highlight/HighlightRegistry.idl
519519
$(PROJECT_DIR)/Modules/identity/DigitalCredential.idl
520520
$(PROJECT_DIR)/Modules/identity/DigitalCredentialGetRequest.idl
521521
$(PROJECT_DIR)/Modules/identity/DigitalCredentialRequestOptions.idl
522-
$(PROJECT_DIR)/Modules/identity/IdentityCredentialProtocol.idl
522+
$(PROJECT_DIR)/Modules/identity/DigitalCredentialPresentationProtocol.idl
523523
$(PROJECT_DIR)/Modules/identity/protocols/ISO18013/MobileDocumentRequest.idl
524524
$(PROJECT_DIR)/Modules/indexeddb/IDBCursor.idl
525525
$(PROJECT_DIR)/Modules/indexeddb/IDBCursorDirection.idl

‎Source/WebCore/DerivedSources-output.xcfilelist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,8 +1747,8 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIIRFilterOptions.cpp
17471747
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIIRFilterOptions.h
17481748
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIPAddressSpace.cpp
17491749
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIPAddressSpace.h
1750-
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdentityCredentialProtocol.cpp
1751-
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdentityCredentialProtocol.h
1750+
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredentialPresentationProtocol.cpp
1751+
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSDigitalCredentialPresentationProtocol.h
17521752
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdleDeadline.cpp
17531753
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdleDeadline.h
17541754
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSIdleRequestCallback.cpp

‎Source/WebCore/DerivedSources.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ JS_BINDING_IDLS := \
380380
$(WebCore)/Modules/identity/DigitalCredential.idl \
381381
$(WebCore)/Modules/identity/DigitalCredentialGetRequest.idl \
382382
$(WebCore)/Modules/identity/DigitalCredentialRequestOptions.idl \
383-
$(WebCore)/Modules/identity/IdentityCredentialProtocol.idl \
383+
$(WebCore)/Modules/identity/DigitalCredentialPresentationProtocol.idl \
384384
$(WebCore)/Modules/identity/protocols/ISO18013/MobileDocumentRequest.idl \
385385
$(WebCore)/Modules/indexeddb/IDBCursor.idl \
386386
$(WebCore)/Modules/indexeddb/IDBCursorDirection.idl \

‎Source/WebCore/Headers.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,10 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
494494
Modules/identity/CredentialRequestCoordinatorClient.h
495495
Modules/identity/DigitalCredential.h
496496
Modules/identity/DigitalCredentialGetRequest.h
497+
Modules/identity/DigitalCredentialPresentationProtocol.h
497498
Modules/identity/DigitalCredentialRequestOptions.h
498499
Modules/identity/DigitalCredentialsRequestData.h
499500
Modules/identity/DigitalCredentialsResponseData.h
500-
Modules/identity/IdentityCredentialProtocol.h
501501

502502
Modules/identity/dummy/DummyCredentialRequestCoordinatorClient.h
503503

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
#include "Chrome.h"
3232
#include "CredentialRequestCoordinator.h"
3333
#include "CredentialRequestOptions.h"
34+
#include "DigitalCredentialPresentationProtocol.h"
3435
#include "DocumentPage.h"
3536
#include "ExceptionOr.h"
3637
#include "FrameDestructionObserverInlines.h"
3738
#include "IDLTypes.h"
38-
#include "IdentityCredentialProtocol.h"
3939
#include "LocalDOMWindow.h"
4040
#include "LocalFrame.h"
4141
#include "MediationRequirement.h"
@@ -50,24 +50,24 @@
5050

5151
namespace WebCore {
5252

53-
Ref<DigitalCredential> DigitalCredential::create(JSC::Strong<JSC::JSObject>&& data, IdentityCredentialProtocol protocol)
53+
Ref<DigitalCredential> DigitalCredential::create(JSC::Strong<JSC::JSObject>&& data, DigitalCredentialPresentationProtocol protocol)
5454
{
5555
return adoptRef(*new DigitalCredential(WTF::move(data), protocol));
5656
}
5757

5858
DigitalCredential::~DigitalCredential() = default;
5959

60-
DigitalCredential::DigitalCredential(JSC::Strong<JSC::JSObject>&& data, IdentityCredentialProtocol protocol)
60+
DigitalCredential::DigitalCredential(JSC::Strong<JSC::JSObject>&& data, DigitalCredentialPresentationProtocol protocol)
6161
: BasicCredential(createVersion4UUIDString(), Type::DigitalCredential, Discovery::CredentialStore)
6262
, m_protocol(protocol)
6363
, m_data(WTF::move(data))
6464
{
6565
}
6666

67-
static std::optional<IdentityCredentialProtocol> convertProtocolString(const String& protocolString)
67+
static std::optional<DigitalCredentialPresentationProtocol> convertProtocolString(const String& protocolString)
6868
{
6969
if (protocolString == "org-iso-mdoc"_s)
70-
return IdentityCredentialProtocol::OrgIsoMdoc;
70+
return DigitalCredentialPresentationProtocol::OrgIsoMdoc;
7171
return std::nullopt;
7272
}
7373

@@ -86,7 +86,7 @@ static ExceptionOr<std::optional<UnvalidatedDigitalCredentialRequest>> jsToCrede
8686
return std::optional<UnvalidatedDigitalCredentialRequest> { std::nullopt }; // Return empty optional for unknown protocols
8787

8888
switch (*protocol) {
89-
case IdentityCredentialProtocol::OrgIsoMdoc: {
89+
case DigitalCredentialPresentationProtocol::OrgIsoMdoc: {
9090
auto result = convertDictionary<MobileDocumentRequest>(*globalObject, request.data.get());
9191
if (result.hasException(scope)) [[unlikely]]
9292
return Exception { ExceptionCode::ExistingExceptionError };

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
namespace WebCore {
4040

4141
class Document;
42-
enum class IdentityCredentialProtocol : uint8_t;
42+
enum class DigitalCredentialPresentationProtocol : uint8_t;
4343
struct CredentialRequestOptions;
4444
struct DigitalCredentialGetRequest;
4545
struct DigitalCredentialRequestOptions;
@@ -50,7 +50,7 @@ using CredentialPromise = DOMPromiseDeferred<IDLNullable<IDLInterface<BasicCrede
5050

5151
class DigitalCredential final : public BasicCredential {
5252
public:
53-
static Ref<DigitalCredential> create(JSC::Strong<JSC::JSObject>&&, IdentityCredentialProtocol);
53+
static Ref<DigitalCredential> create(JSC::Strong<JSC::JSObject>&&, DigitalCredentialPresentationProtocol);
5454

5555
virtual ~DigitalCredential();
5656

@@ -59,7 +59,7 @@ class DigitalCredential final : public BasicCredential {
5959
return m_data;
6060
};
6161

62-
IdentityCredentialProtocol protocol() const
62+
DigitalCredentialPresentationProtocol protocol() const
6363
{
6464
return m_protocol;
6565
}
@@ -72,15 +72,15 @@ class DigitalCredential final : public BasicCredential {
7272
}
7373

7474
private:
75-
DigitalCredential(JSC::Strong<JSC::JSObject>&&, IdentityCredentialProtocol);
75+
DigitalCredential(JSC::Strong<JSC::JSObject>&&, DigitalCredentialPresentationProtocol);
7676

7777
static ExceptionOr<Vector<ValidatedDigitalCredentialRequest>> validateRequests(const Document&, Vector<UnvalidatedDigitalCredentialRequest>&&);
7878
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; }
8282

83-
IdentityCredentialProtocol m_protocol;
83+
DigitalCredentialPresentationProtocol m_protocol;
8484
const JSC::Strong<JSC::JSObject> m_data;
8585
};
8686

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
Conditional=WEB_AUTHN,
3131
] interface DigitalCredential : BasicCredential {
3232
[SameObject] readonly attribute object data;
33-
readonly attribute IdentityCredentialProtocol protocol;
33+
readonly attribute DigitalCredentialPresentationProtocol protocol;
3434
static boolean userAgentAllowsProtocol(DOMString protocol);
3535
[Default] object toJSON();
3636
};

Source/WebCore/Modules/identity/IdentityCredentialProtocol.h renamed to Source/WebCore/Modules/identity/DigitalCredentialPresentationProtocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
namespace WebCore {
2929

30-
enum class IdentityCredentialProtocol : uint8_t {
30+
enum class DigitalCredentialPresentationProtocol : uint8_t {
3131
OrgIsoMdoc,
3232
};
3333

Source/WebCore/Modules/identity/IdentityCredentialProtocol.idl renamed to Source/WebCore/Modules/identity/DigitalCredentialPresentationProtocol.idl

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

26-
enum IdentityCredentialProtocol {
26+
enum DigitalCredentialPresentationProtocol {
2727
"org-iso-mdoc",
2828
};

0 commit comments

Comments
 (0)