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.

Sign up for GitHub

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

Jump to bottom

fix: fix how gRPC transport security is determined #201

Merged
merged 2 commits into from
Dec 11, 2023
Merged

fix: fix how gRPC transport security is determined #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d883ab1
#fix grpc transport secure
ToanBarcelona1998 Dec 8, 2023
4b59220
test: added network info secure credentials
ToanBarcelona1998 Dec 8, 2023
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
2 changes: 1 addition & 1 deletion lib/wallet/network_info.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class GRPCInfo extends Equatable {
return GrpcOrGrpcWebClientChannel.toSeparateEndpoints(
grpcHost: host.replaceFirst(RegExp('http(s)?://'), ''),
grpcPort: port,
grpcTransportSecure: credentials == ChannelCredentials.secure(),
grpcTransportSecure: credentials.isSecure,
grpcWebHost: finaleWebHost.replaceFirst(RegExp('http(s)?://'), ''),
grpcWebPort: webPort,
grpcWebTransportSecure: webTransportSecure,
Expand Down
14 changes: 12 additions & 2 deletions test/types/network_info_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,34 @@ void main() {
group('GRPCInfo', () {
group('toJson and fromJson work properly', () {
test('with secure credentials', () {
final channelCredential = ChannelCredentials.secure();
final grpcInfo = GRPCInfo(
host: 'localhost',
port: 1111,
credentials: ChannelCredentials.secure(),
credentials: channelCredential,
);

final channel = grpcInfo.getChannel();

expect(channel.options.credentials.isSecure, true);

final json = grpcInfo.toJson();
final fromJson = GRPCInfo.fromJson(json);
expect(fromJson, equals(grpcInfo));
});

test('with insecure credentials', () {
final channelCredential = ChannelCredentials.insecure();
final grpcInfo = GRPCInfo(
host: 'localhost',
port: 1111,
credentials: ChannelCredentials.insecure(),
credentials: channelCredential,
);

final channel = grpcInfo.getChannel();

expect(channel.options.credentials.isSecure, false);

final json = grpcInfo.toJson();
final fromJson = GRPCInfo.fromJson(json);
expect(fromJson, equals(grpcInfo));
Expand Down
Loading