π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Stop local Cast sessions before revocation
Neeraj Gupta43b6edbc7636
diff --git a/mobile/apps/photos/lib/services/auto_cast_service.dart b/mobile/apps/photos/lib/services/auto_cast_service.dartindex 7819d0c835..d0c0eb9c4d 100644--- a/mobile/apps/photos/lib/services/auto_cast_service.dart+++ b/mobile/apps/photos/lib/services/auto_cast_service.dart@@ -71,6 +71,15 @@ class AutoCastService {}Future<void> stop(Object device) async {+ Object? stopError;+ StackTrace? stopStackTrace;+ try {+ await _transport.stopCastingToDevice(device);+ } catch (error, stackTrace) {+ stopError = error;+ stopStackTrace = stackTrace;+ }+Object? revokeError;StackTrace? revokeStackTrace;final deviceID = _serverDeviceIDs[device];@@ -84,16 +93,14 @@ class AutoCastService {}}- try {- await _transport.stopCastingToDevice(device);- } catch (error, stackTrace) {+ if (stopError != null) {if (revokeError == null) {- Error.throwWithStackTrace(error, stackTrace);+ Error.throwWithStackTrace(stopError, stopStackTrace!);}_logger.warning("Failed to disconnect the local Cast session",- error,- stackTrace,+ stopError,+ stopStackTrace,);}@@ -101,4 +108,14 @@ class AutoCastService {Error.throwWithStackTrace(revokeError, revokeStackTrace!);}}++ Future<void> stopServerSession(String deviceID) async {+ for (final entry in _serverDeviceIDs.entries) {+ if (entry.value == deviceID) {+ await stop(entry.key);+ return;+ }+ }+ await _gateway.revokeSessionByID(deviceID);+ }}diff --git a/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart b/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dartindex 81c228e9b1..ac753ba28e 100644--- a/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart+++ b/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart@@ -8,6 +8,7 @@ import "package:logging/logging.dart";import "package:photos/core/network/network.dart";import "package:photos/gateways/cast/cast_gateway.dart";import "package:photos/generated/l10n.dart";+import "package:photos/service_locator.dart";import "package:photos/services/collections_service.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/ui/common/loading_widget.dart";@@ -127,7 +128,6 @@ class _CastSessionsListState extends State<CastSessionsList> {Future<void> _revokeSession(CastInfo session, Logger logger) async {final l10n = AppLocalizations.of(context);- final gw = CastGateway(NetworkClient.instance.enteDio);await showBottomSheetComponent<void>(context: context,builder: (sheetContext) => BottomSheetComponent(@@ -141,7 +141,7 @@ class _CastSessionsListState extends State<CastSessionsList> {onTap: () async {Navigator.of(sheetContext).pop();try {- await gw.revokeSession(session);+ await autoCastService.stopServerSession(session.deviceID);} catch (e, s) {logger.severe('Failed to revoke cast session: ', e, s);if (!mounted) return;diff --git a/mobile/apps/photos/test/services/auto_cast_service_test.dart b/mobile/apps/photos/test/services/auto_cast_service_test.dartindex 9ba77ff0cc..294d8ae6e0 100644--- a/mobile/apps/photos/test/services/auto_cast_service_test.dart+++ b/mobile/apps/photos/test/services/auto_cast_service_test.dart@@ -1,3 +1,5 @@+import "dart:async";+import "package:ente_cast/ente_cast.dart";import "package:flutter_test/flutter_test.dart";import "package:photos/gateways/cast/cast_gateway.dart";@@ -5,26 +7,28 @@ import "package:photos/models/collection/collection.dart";import "package:photos/services/auto_cast_service.dart";void main() {- test(- "stopping disconnects the device when server revocation fails",- () async {- final transport = _FakeCastService();- final gateway = _FakeCastGateway();- final service = AutoCastService(- transport: transport,- gateway: gateway,- encodePayload: (_, _, _) => "encrypted-payload",- );- final device = Object();- await service.connect(device, _FakeCollection());- gateway.revokeError = StateError("revoke failed");+ test("server session stop disconnects before revocation completes", () async {+ final transport = _FakeCastService();+ final gateway = _FakeCastGateway();+ final service = AutoCastService(+ transport: transport,+ gateway: gateway,+ encodePayload: (_, _, _) => "encrypted-payload",+ );+ final device = Object();+ await service.connect(device, _FakeCollection());+ final revokeCompleter = Completer<void>();+ gateway.revokeFuture = revokeCompleter.future;++ final stopFuture = service.stopServerSession("device-id");+ await Future<void>.delayed(Duration.zero);- await expectLater(service.stop(device), throwsStateError);+ expect(transport.stoppedDevices, [device]);+ expect(gateway.revokedDeviceIDs, ["device-id"]);- expect(gateway.revokedDeviceIDs, ["device-id"]);- expect(transport.stoppedDevices, [device]);- },- );+ revokeCompleter.completeError(StateError("revoke failed"));+ await expectLater(stopFuture, throwsStateError);+ });}class _FakeCastService extends Fake implements CastService {@@ -43,7 +47,7 @@ class _FakeCastService extends Fake implements CastService {class _FakeCastGateway extends Fake implements CastGateway {final revokedDeviceIDs = <String>[];- Object? revokeError;+ Future<void>? revokeFuture;@overrideFuture<String?> getPublicKey(String deviceCode) async {@@ -63,8 +67,8 @@ class _FakeCastGateway extends Fake implements CastGateway {@overrideFuture<void> revokeSessionByID(String deviceID) async {revokedDeviceIDs.add(deviceID);- if (revokeError case final error?) {- throw error;+ if (revokeFuture case final future?) {+ await future;}}}