From a59340bcd3dec5aa6d080b1a56ce879238afd26e Mon Sep 17 00:00:00 2001 From: Jan Romann Date: Tue, 19 Dec 2023 08:42:52 +0100 Subject: [PATCH] fixup! feat!: simplify credentials callback usage --- lib/core.dart | 2 +- lib/src/binding_coap/coap_client.dart | 2 +- lib/src/binding_coap/coap_client_factory.dart | 2 +- lib/src/binding_coap/coap_server.dart | 2 +- lib/src/binding_http/http_client.dart | 2 +- lib/src/binding_http/http_client_factory.dart | 2 +- lib/src/binding_http/http_server.dart | 2 +- lib/src/binding_mqtt/mqtt_client.dart | 2 +- lib/src/binding_mqtt/mqtt_client_factory.dart | 2 +- .../callbacks.dart} | 10 +++++----- lib/src/core/protocol_interfaces/protocol_server.dart | 2 +- lib/src/core/servient.dart | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) rename lib/src/core/{security_provider.dart => credentials/callbacks.dart} (92%) diff --git a/lib/core.dart b/lib/core.dart index 99492a7d..8d75bbaf 100644 --- a/lib/core.dart +++ b/lib/core.dart @@ -17,6 +17,7 @@ export 'src/core/credentials/ace_credentials.dart'; export 'src/core/credentials/apikey_credentials.dart'; export 'src/core/credentials/basic_credentials.dart'; export 'src/core/credentials/bearer_credentials.dart'; +export 'src/core/credentials/callbacks.dart'; export 'src/core/credentials/credentials.dart'; export 'src/core/credentials/digest_credentials.dart'; export 'src/core/credentials/oauth2_credentials.dart'; @@ -24,5 +25,4 @@ export 'src/core/credentials/psk_credentials.dart'; export 'src/core/protocol_interfaces/protocol_client.dart'; export 'src/core/protocol_interfaces/protocol_client_factory.dart'; export 'src/core/protocol_interfaces/protocol_server.dart'; -export 'src/core/security_provider.dart'; export 'src/core/servient.dart'; diff --git a/lib/src/binding_coap/coap_client.dart b/lib/src/binding_coap/coap_client.dart index 9248023d..a8b38630 100644 --- a/lib/src/binding_coap/coap_client.dart +++ b/lib/src/binding_coap/coap_client.dart @@ -13,9 +13,9 @@ import 'package:dcaf/dcaf.dart'; import '../core/content.dart'; import '../core/credentials/ace_credentials.dart'; +import '../core/credentials/callbacks.dart'; import '../core/credentials/psk_credentials.dart'; import '../core/protocol_interfaces/protocol_client.dart'; -import '../core/security_provider.dart'; import '../definitions/form.dart'; import '../definitions/operation_type.dart'; import '../scripting_api/subscription.dart'; diff --git a/lib/src/binding_coap/coap_client_factory.dart b/lib/src/binding_coap/coap_client_factory.dart index 7807bee2..ee4e1d19 100644 --- a/lib/src/binding_coap/coap_client_factory.dart +++ b/lib/src/binding_coap/coap_client_factory.dart @@ -4,9 +4,9 @@ // // SPDX-License-Identifier: BSD-3-Clause +import '../core/credentials/callbacks.dart'; import '../core/protocol_interfaces/protocol_client.dart'; import '../core/protocol_interfaces/protocol_client_factory.dart'; -import '../core/security_provider.dart'; import 'coap_client.dart'; import 'coap_config.dart'; diff --git a/lib/src/binding_coap/coap_server.dart b/lib/src/binding_coap/coap_server.dart index c5bce825..7592a9ff 100644 --- a/lib/src/binding_coap/coap_server.dart +++ b/lib/src/binding_coap/coap_server.dart @@ -4,8 +4,8 @@ // // SPDX-License-Identifier: BSD-3-Clause +import '../core/credentials/callbacks.dart'; import '../core/protocol_interfaces/protocol_server.dart'; -import '../core/security_provider.dart'; import '../scripting_api/exposed_thing.dart'; import 'coap_config.dart'; diff --git a/lib/src/binding_http/http_client.dart b/lib/src/binding_http/http_client.dart index 6de72d21..67cea18b 100644 --- a/lib/src/binding_http/http_client.dart +++ b/lib/src/binding_http/http_client.dart @@ -12,8 +12,8 @@ import 'package:http/http.dart'; import '../core/content.dart'; import '../core/credentials/basic_credentials.dart'; import '../core/credentials/bearer_credentials.dart'; +import '../core/credentials/callbacks.dart'; import '../core/protocol_interfaces/protocol_client.dart'; -import '../core/security_provider.dart'; import '../definitions/form.dart'; import '../definitions/operation_type.dart'; import '../definitions/security/basic_security_scheme.dart'; diff --git a/lib/src/binding_http/http_client_factory.dart b/lib/src/binding_http/http_client_factory.dart index 8f4cb4ee..acd84765 100644 --- a/lib/src/binding_http/http_client_factory.dart +++ b/lib/src/binding_http/http_client_factory.dart @@ -6,9 +6,9 @@ import '../core/credentials/basic_credentials.dart'; import '../core/credentials/bearer_credentials.dart'; +import '../core/credentials/callbacks.dart'; import '../core/protocol_interfaces/protocol_client.dart'; import '../core/protocol_interfaces/protocol_client_factory.dart'; -import '../core/security_provider.dart'; import 'http_client.dart'; import 'http_config.dart'; diff --git a/lib/src/binding_http/http_server.dart b/lib/src/binding_http/http_server.dart index 3bccf531..16f2640b 100644 --- a/lib/src/binding_http/http_server.dart +++ b/lib/src/binding_http/http_server.dart @@ -4,8 +4,8 @@ // // SPDX-License-Identifier: BSD-3-Clause +import '../core/credentials/callbacks.dart'; import '../core/protocol_interfaces/protocol_server.dart'; -import '../core/security_provider.dart'; import '../scripting_api/exposed_thing.dart'; import 'http_config.dart'; diff --git a/lib/src/binding_mqtt/mqtt_client.dart b/lib/src/binding_mqtt/mqtt_client.dart index c39dcb99..756634e5 100644 --- a/lib/src/binding_mqtt/mqtt_client.dart +++ b/lib/src/binding_mqtt/mqtt_client.dart @@ -12,8 +12,8 @@ import 'package:typed_data/typed_buffers.dart'; import '../core/content.dart'; import '../core/credentials/basic_credentials.dart'; +import '../core/credentials/callbacks.dart'; import '../core/protocol_interfaces/protocol_client.dart'; -import '../core/security_provider.dart'; import '../definitions/form.dart'; import '../scripting_api/subscription.dart' as scripting_api; import 'constants.dart'; diff --git a/lib/src/binding_mqtt/mqtt_client_factory.dart b/lib/src/binding_mqtt/mqtt_client_factory.dart index 31e5b40d..591282f4 100644 --- a/lib/src/binding_mqtt/mqtt_client_factory.dart +++ b/lib/src/binding_mqtt/mqtt_client_factory.dart @@ -5,9 +5,9 @@ // SPDX-License-Identifier: BSD-3-Clause import '../core/credentials/basic_credentials.dart'; +import '../core/credentials/callbacks.dart'; import '../core/protocol_interfaces/protocol_client.dart'; import '../core/protocol_interfaces/protocol_client_factory.dart'; -import '../core/security_provider.dart'; import 'constants.dart'; import 'mqtt_client.dart'; import 'mqtt_config.dart'; diff --git a/lib/src/core/security_provider.dart b/lib/src/core/credentials/callbacks.dart similarity index 92% rename from lib/src/core/security_provider.dart rename to lib/src/core/credentials/callbacks.dart index 146a8207..ba77bbdf 100644 --- a/lib/src/core/security_provider.dart +++ b/lib/src/core/credentials/callbacks.dart @@ -1,4 +1,4 @@ -// Copyright 2022 Contributors to the Eclipse Foundation. All rights reserved. +// Copyright 2023 Contributors to the Eclipse Foundation. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. // @@ -6,10 +6,10 @@ import 'package:dcaf/dcaf.dart'; -import '../definitions/form.dart'; -import 'credentials/ace_credentials.dart'; -import 'credentials/credentials.dart'; -import 'credentials/psk_credentials.dart'; +import '../../definitions/form.dart'; +import 'ace_credentials.dart'; +import 'credentials.dart'; +import 'psk_credentials.dart'; /// Function signature for a synchronous callback for providing client /// [PskCredentials] at runtime. diff --git a/lib/src/core/protocol_interfaces/protocol_server.dart b/lib/src/core/protocol_interfaces/protocol_server.dart index 9b4c261f..4e483782 100644 --- a/lib/src/core/protocol_interfaces/protocol_server.dart +++ b/lib/src/core/protocol_interfaces/protocol_server.dart @@ -5,7 +5,7 @@ // SPDX-License-Identifier: BSD-3-Clause import '../../../scripting_api.dart'; -import '../security_provider.dart'; +import '../credentials/callbacks.dart'; /// Base class for a Protocol Server. abstract interface class ProtocolServer { diff --git a/lib/src/core/servient.dart b/lib/src/core/servient.dart index 5bed3aa5..7f0af8e9 100644 --- a/lib/src/core/servient.dart +++ b/lib/src/core/servient.dart @@ -10,11 +10,11 @@ import '../definitions/interaction_affordances/interaction_affordance.dart'; import '../definitions/thing_description.dart'; import 'consumed_thing.dart'; import 'content_serdes.dart'; +import 'credentials/callbacks.dart'; import 'exposed_thing.dart'; import 'protocol_interfaces/protocol_client.dart'; import 'protocol_interfaces/protocol_client_factory.dart'; import 'protocol_interfaces/protocol_server.dart'; -import 'security_provider.dart'; import 'wot.dart'; /// Exception that is thrown by a [Servient].