fix: Update enrollment test in info_verb_test.dart

atsign-foundation · Aug 23, 2023 · 2b02716 · 2b02716
1 parent fdb92ed
commit 2b02716
Showing 1 changed file with 53 additions and 30 deletions.
diff --git a/tests/at_functional_test/test/info_verb_test.dart b/tests/at_functional_test/test/info_verb_test.dart
@@ -3,6 +3,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:at_commons/at_commons.dart';
 import 'package:at_functional_test/conf/config_util.dart';
 import 'package:test/test.dart';
 import 'package:version/version.dart';
@@ -16,11 +17,13 @@ void main() {
  var firstAtsign =
  ConfigUtil.getYaml()!['first_atsign_server']['first_atsign_name'];
  Socket? socketFirstAtsign;
+ String firstAtsignServer = '';
+ int firstAtsignPort = 0;
 
  setUp(() async {
- var firstAtsignServer =
+ firstAtsignServer =
  ConfigUtil.getYaml()!['first_atsign_server']['first_atsign_url'];
- var firstAtsignPort =
+ firstAtsignPort =
  ConfigUtil.getYaml()!['first_atsign_server']['first_atsign_port'];
 
  socketFirstAtsign =
@@ -36,36 +39,56 @@ void main() {
  expect(infoResponse['version'], isNotEmpty);
  });
 
- // commenting the test as the server doesn't have enroll verb changes yet
  test('info verb with enroll verb changes', () async {
- await socket_writer(socketFirstAtsign!, 'info:brief');
- var infoResponse = await read();
- infoResponse = infoResponse.replaceFirst('data:', '');
- var serverVersion = jsonDecode(infoResponse)['version'];
- if (Version.parse(serverVersion) > Version(3, 0, 34)) {
- await socket_writer(socketFirstAtsign!, 'from:$firstAtsign');
- var fromResponse = await read();
- fromResponse = fromResponse.replaceAll('data:', '');
- var pkamDigest = generatePKAMDigest(firstAtsign, fromResponse);
- await socket_writer(socketFirstAtsign!, 'pkam:$pkamDigest');
- var pkamResult = await read();
- expect(pkamResult, 'data:success\n');
+ await socket_writer(socketFirstAtsign!, 'from:$firstAtsign');
+ var fromResponse = await read();
+ fromResponse = fromResponse.replaceAll('data:', '');
+ var pkamDigest = generatePKAMDigest(firstAtsign, fromResponse);
+ await socket_writer(socketFirstAtsign!, 'pkam:$pkamDigest');
+ var pkamResult = await read();
+ expect(pkamResult, 'data:success\n');
 
- // create a key with the _manage namespace
- var enrollRequest =
- 'enroll:request:appName:wavi:deviceName:pixel:namespaces:[wavi,rw]:apkamPublicKey:${pkamPublicKeyMap[firstAtsign]!}\n';
- await socket_writer(socketFirstAtsign!, enrollRequest);
- var enrollResponse = await read();
- enrollResponse = enrollResponse.replaceFirst('data:', '');
- var enrollJsonMap = jsonDecode(enrollResponse);
- expect(enrollJsonMap['enrollmentId'], isNotEmpty);
+ // create a key with the _manage namespace
+ var enrollRequest =
+ 'enroll:request:{"appName":"wavi","deviceName":"pixel","namespaces":{"wavi":"rw"},"apkamPublicKey":"${pkamPublicKeyMap[firstAtsign]!}"}\n';
+ await socket_writer(socketFirstAtsign!, enrollRequest);
+ var enrollResponse = await read();
+ enrollResponse = enrollResponse.replaceFirst('data:', '');
+ var enrollJsonMap = jsonDecode(enrollResponse);
+ expect(enrollJsonMap['enrollmentId'], isNotEmpty);
+ String enrollmentId = enrollJsonMap['enrollmentId'].toString().trim();
+ // Approve enrollment
+ await socket_writer(
+ socketFirstAtsign!, 'enroll:approve:{"enrollmentId":"$enrollmentId"}');
+ enrollResponse = await read();
+ enrollResponse = enrollResponse.replaceFirst('data:', '');
+ await socketFirstAtsign?.close();
 
- // check the info verb.. It should return the result
- await socket_writer(socketFirstAtsign!, 'info');
- var infoVerbResponse = await read();
- infoVerbResponse = infoVerbResponse.replaceAll('data:', '');
- var infoResponse = jsonDecode(infoVerbResponse);
- expect(infoResponse['apkam_metadata'], isNotEmpty);
- }
+ socketFirstAtsign =
+ await secure_socket_connection(firstAtsignServer, firstAtsignPort);
+ socket_listener(socketFirstAtsign!);
+ await socket_writer(socketFirstAtsign!, 'from:$firstAtsign');
+ fromResponse = await read();
+ fromResponse = fromResponse.replaceAll('data:', '');
+ pkamDigest = generatePKAMDigest(firstAtsign, fromResponse);
+ // Authenticate the connection via enrollmentId to fetch the APKAM metadata
+ await socket_writer(
+ socketFirstAtsign!, 'pkam:enrollmentId:$enrollmentId:$pkamDigest');
+ pkamResult = await read();
+ expect(pkamResult, 'data:success\n');
+
+ // check the info verb.. It should return the result
+ await socket_writer(socketFirstAtsign!, 'info');
+ var infoVerbResponse = await read();
+ infoVerbResponse = infoVerbResponse.replaceAll('data:', '');
+ var infoResponse = jsonDecode(infoVerbResponse);
+ expect(infoResponse['apkam_metadata'], isNotEmpty);
+ var apkamMetadata = jsonDecode(infoResponse['apkam_metadata']);
+ // Assert the APKAM metadata
+ expect(apkamMetadata['appName'], 'wavi');
+ expect(apkamMetadata['deviceName'], 'pixel');
+ expect(apkamMetadata['namespaces'], {"wavi": "rw"});
+ expect(apkamMetadata['sessionId'], isNotNull);
+ expect(apkamMetadata['apkamPublicKey'], isNotNull);
  });
 }