Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add to/fromJson and export portable did #49

Merged
merged 4 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jobs:
with:
cache: true

- name: Get web5 test vectors
run: git submodule update --init --recursive

- name: Install Dependencies
run: just get

Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "web5-spec"]
path = web5-spec
url = git@github.com:TBD54566975/web5-spec.git
url = https://github.com/TBD54566975/web5-spec.git
1 change: 1 addition & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @mistermoe @ethan-tbd @kirahsapong @wesbillman
11 changes: 6 additions & 5 deletions packages/web5/lib/src/dids.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
export 'dids/did.dart';
export 'dids/did_core.dart';
export 'dids/bearer_did.dart';
export './dids/did_resolver.dart';
export './dids/did_dht/did_dht.dart';
export './dids/did_jwk/did_jwk.dart';
export './dids/did_web/did_web.dart';
export './dids/did_method_resolver.dart';
export './dids/did_resolver.dart';
export './dids/did_web/did_web.dart';
export './dids/portable_did.dart';
export 'dids/bearer_did.dart';
export 'dids/did_core.dart';
export 'dids/did.dart';
23 changes: 20 additions & 3 deletions packages/web5/lib/src/dids/portable_did.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,28 @@ import 'package:web5/src/dids/did_core.dart';
class PortableDid {
String uri;
DidDocument document;
List<Jwk> privateKeys;
late List<Jwk> privateKeys;

PortableDid({
required this.uri,
required this.document,
this.privateKeys = const [],
});
List<Jwk>? privateKeys,
}) : privateKeys = privateKeys ?? [];

factory PortableDid.fromJson(Map<String, dynamic> json) {
return PortableDid(
uri: json['uri'],
document: DidDocument.fromJson(json['document']),
privateKeys:
(json['privateKeys'] as List).map((e) => Jwk.fromJson(e)).toList(),
);
}

Map<String, dynamic> toJson() {
return {
'uri': uri,
'document': document.toJson(),
'privateKeys': privateKeys.map((e) => e.toJson()).toList(),
};
}
}
1 change: 0 additions & 1 deletion packages/web5/test/crypto/crypto_test.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'dart:convert';
import 'dart:typed_data';

import 'package:test/test.dart';
import 'package:web5/src/crypto.dart';
Expand Down
2 changes: 0 additions & 2 deletions packages/web5/test/dids/did_core/did_document_test.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:convert';

import 'package:test/test.dart';
import 'package:web5/src/crypto.dart';
import 'package:web5/src/dids/did_core.dart';
Expand Down
3 changes: 2 additions & 1 deletion packages/web5/test/dids/did_jwk_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ void main() {

test('should resolve with didDocument if legit', () async {
final did = Did.parse(
'did:jwk:eyJraWQiOiJ1cm46aWV0ZjpwYXJhbXM6b2F1dGg6andrLXRodW1icHJpbnQ6c2hhLTI1NjpGZk1iek9qTW1RNGVmVDZrdndUSUpqZWxUcWpsMHhqRUlXUTJxb2JzUk1NIiwia3R5IjoiT0tQIiwiY3J2IjoiRWQyNTUxOSIsImFsZyI6IkVkRFNBIiwieCI6IkFOUmpIX3p4Y0tCeHNqUlBVdHpSYnA3RlNWTEtKWFE5QVBYOU1QMWo3azQifQ');
'did:jwk:eyJraWQiOiJ1cm46aWV0ZjpwYXJhbXM6b2F1dGg6andrLXRodW1icHJpbnQ6c2hhLTI1NjpGZk1iek9qTW1RNGVmVDZrdndUSUpqZWxUcWpsMHhqRUlXUTJxb2JzUk1NIiwia3R5IjoiT0tQIiwiY3J2IjoiRWQyNTUxOSIsImFsZyI6IkVkRFNBIiwieCI6IkFOUmpIX3p4Y0tCeHNqUlBVdHpSYnA3RlNWTEtKWFE5QVBYOU1QMWo3azQifQ',
);
final resolutionResult = await DidJwk.resolve(did);

expect(resolutionResult.didDocument, isNotNull);
Expand Down
29 changes: 0 additions & 29 deletions packages/web5_flutter/.gitignore

This file was deleted.

33 changes: 0 additions & 33 deletions packages/web5_flutter/.metadata

This file was deleted.

15 changes: 0 additions & 15 deletions packages/web5_flutter/README.md

This file was deleted.

5 changes: 0 additions & 5 deletions packages/web5_flutter/analysis_options.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions packages/web5_flutter/android/.gitignore

This file was deleted.

68 changes: 0 additions & 68 deletions packages/web5_flutter/android/build.gradle

This file was deleted.

1 change: 0 additions & 1 deletion packages/web5_flutter/android/settings.gradle

This file was deleted.

3 changes: 0 additions & 3 deletions packages/web5_flutter/android/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

This file was deleted.

43 changes: 0 additions & 43 deletions packages/web5_flutter/example/.gitignore

This file was deleted.

16 changes: 0 additions & 16 deletions packages/web5_flutter/example/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions packages/web5_flutter/example/analysis_options.yaml

This file was deleted.

Loading
Loading