chore!: upgrade coap dependency

eclipse-thingweb · May 30, 2023 · 7296663 · 7296663
1 parent 8dd87ea
commit 7296663
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/example/coaps_readproperty.dart b/example/coaps_readproperty.dart
@@ -21,7 +21,7 @@ final Map<Uri, PskCredentials> _pskCredentialsStore = {
 PskCredentials? _pskCredentialsCallback(
   Uri uri,
   Form? form,
-  Uint8List? identityHint,
+  String? identityHint,
 ) {
   final key = Uri(scheme: uri.scheme, host: uri.host);
 

diff --git a/lib/src/binding_coap/coap_client.dart b/lib/src/binding_coap/coap_client.dart
@@ -10,7 +10,6 @@ import 'dart:typed_data';
 import 'package:coap/coap.dart' as coap;
 import 'package:coap/config/coap_config_default.dart';
 import 'package:dcaf/dcaf.dart';
-import 'package:typed_data/typed_buffers.dart';
 
 import '../core/content.dart';
 import '../core/credentials/ace_credentials.dart';
@@ -98,14 +97,13 @@ final class CoapClient implements ProtocolClient {
     coap.BlockSize? block1Size,
     coap.BlockSize? block2Size,
   }) async {
-    final payload = Uint8Buffer();
-    if (content != null) {
-      payload.addAll((await content.byteBuffer).asUint8List());
-    }
+    final payload = (await content?.byteBuffer)?.asUint8List();
 
-    final request = coap.CoapRequest(requestMethod)
-      ..payload = payload
-      ..uriPath = uri.path
+    final request = coap.CoapRequest(
+      uri,
+      requestMethod,
+      payload: payload,
+    )
       ..accept = accept
       ..contentFormat = format;
 
@@ -117,10 +115,6 @@ final class CoapClient implements ProtocolClient {
       request.block2 = coap.Block2Option.fromParts(0, block2Size);
     }
 
-    if (uri.query.isNotEmpty) {
-      request.uriQuery = uri.query;
-    }
-
     return request;
   }
 

diff --git a/lib/src/core/security_provider.dart b/lib/src/core/security_provider.dart
@@ -4,8 +4,6 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
-import 'dart:typed_data';
-
 import 'package:dcaf/dcaf.dart';
 
 import '../definitions/form.dart';
@@ -31,7 +29,7 @@ import 'credentials/psk_credentials.dart';
 typedef ClientPskCallback = PskCredentials? Function(
   Uri uri,
   Form? form,
-  Uint8List? identityHint,
+  String? identityHint,
 );
 
 /// Function signature for an asynchronous callback for providing client

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -17,7 +17,7 @@ dev_dependencies:
 
 dependencies:
   cbor: ^5.1.2
-  coap: ^8.0.0
+  coap: ^9.0.0
   collection: ^1.16.0
   curie: ^0.1.0
   dcaf: ^0.1.0