feat: add optional HttpClient to allow mocking (#64)

TBD54566975 · Apr 23, 2024 · 3b7c7c3 · 3b7c7c3
1 parent f4d2ed0
commit 3b7c7c3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/packages/web5/lib/src/dids/did_jwk/did_jwk.dart b/packages/web5/lib/src/dids/did_jwk/did_jwk.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:web5/src/crypto.dart';
 import 'package:web5/src/dids/did.dart';
@@ -60,7 +61,8 @@ class DidJwk {
   /// an invalid [DidResolutionResult].
   ///
   /// Throws [FormatException] if the JWK parsing fails.
-  static Future<DidResolutionResult> resolve(Did did) async {
+  static Future<DidResolutionResult> resolve(Did did,
+      {HttpClient? client}) async {
     if (did.method != methodName) {
       return DidResolutionResult.withError(DidResolutionError.invalidDid);
     }

diff --git a/packages/web5/lib/src/dids/did_method_resolver.dart b/packages/web5/lib/src/dids/did_method_resolver.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:web5/src/dids/did.dart';
 import 'package:web5/src/dids/did_core.dart';
 
@@ -7,13 +9,16 @@ class DidMethodResolver {
   String name;
 
   /// The function to resolve a DID URI using this method.
-  Future<DidResolutionResult> Function(Did) resolve;
+  Future<DidResolutionResult> Function(Did, {HttpClient? client}) resolve;
 
   /// Constructs a [DidMethodResolver] with a given [name] and [resolve] function.
   DidMethodResolver({required this.name, required this.resolve});
 
-  Future<DidDereferenceResult> dereference(Did did) async {
-    final didResolutionResult = await resolve(did);
+  Future<DidDereferenceResult> dereference(
+    Did did, {
+    HttpClient? client,
+  }) async {
+    final didResolutionResult = await resolve(did, client: client);
 
     if (didResolutionResult.hasError()) {
       return DidDereferenceResult.withError(

diff --git a/packages/web5/lib/src/dids/did_resolver.dart b/packages/web5/lib/src/dids/did_resolver.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:web5/src/dids/did.dart';
 import 'package:web5/src/dids/did_core.dart';
 import 'package:web5/src/dids/did_dht/did_dht.dart';
@@ -27,12 +29,15 @@ class DidResolver {
   // Static field to hold the instance
   static final DidResolver _instance = DidResolver._default();
 
-  static Future<DidResolutionResult> resolve(String uri) {
-    return _instance.resolveDid(uri);
+  static Future<DidResolutionResult> resolve(String uri, {HttpClient? client}) {
+    return _instance.resolveDid(uri, client: client);
   }
 
-  static Future<DidDereferenceResult> dereference(String url) {
-    return _instance.dereferenceDid(url);
+  static Future<DidDereferenceResult> dereference(
+    String url, {
+    HttpClient? client,
+  }) {
+    return _instance.dereferenceDid(url, client: client);
   }
 
   /// Constructs a [DidResolver] with a list of [DidMethodResolver]s.
@@ -47,7 +52,7 @@ class DidResolver {
   /// Resolves a DID URI into a [DidResolutionResult].
   ///
   /// Throws an [Exception] if no resolver is available for the given method.
-  Future<DidResolutionResult> resolveDid(String uri) {
+  Future<DidResolutionResult> resolveDid(String uri, {HttpClient? client}) {
     final Did did;
     try {
       did = Did.parse(uri);
@@ -63,20 +68,23 @@ class DidResolver {
       throw Exception('no resolver available for did:${did.method}');
     }
 
-    return resolver.resolve(did);
+    return resolver.resolve(did, client: client);
   }
 
   /// Resolves a DID URI into a [DidResolutionResult].
   ///
   /// Throws an [Exception] if no resolver is available for the given method.
-  Future<DidDereferenceResult> dereferenceDid(String url) {
+  Future<DidDereferenceResult> dereferenceDid(
+    String url, {
+    HttpClient? client,
+  }) {
     final did = Did.parse(url);
     final resolver = methodResolvers[did.method];
 
     if (resolver == null) {
       throw Exception('no resolver available for did:${did.method}');
     }
 
-    return resolver.dereference(did);
+    return resolver.dereference(did, client: client);
   }
 }