force logout in deleted device, other fixes

Author: dabblingwithcode

docs/model_relations/school_data_hub_server.svg

@@ -0,0 +1,79 @@
+/* AUTOMATICALLY GENERATED CODE DO NOT MODIFY */
+/*   To generate run: "serverpod generate"    */
+
+// ignore_for_file: implementation_imports
+// ignore_for_file: library_private_types_in_public_api
+// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: public_member_api_docs
+// ignore_for_file: type_literal_in_constant_pattern
+// ignore_for_file: use_super_parameters
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'package:serverpod_client/serverpod_client.dart' as _i1;
+
+abstract class ForceLogoutEvent implements _i1.SerializableModel {
+  ForceLogoutEvent._({
+    required this.userInfoId,
+    required this.deviceId,
+  });
+
+  factory ForceLogoutEvent({
+    required int userInfoId,
+    required String deviceId,
+  }) = _ForceLogoutEventImpl;
+
+  factory ForceLogoutEvent.fromJson(Map<String, dynamic> jsonSerialization) {
+    return ForceLogoutEvent(
+      userInfoId: jsonSerialization['userInfoId'] as int,
+      deviceId: jsonSerialization['deviceId'] as String,
+    );
+  }
+
+  int userInfoId;
+
+  String deviceId;
+
+  /// Returns a shallow copy of this [ForceLogoutEvent]
+  /// with some or all fields replaced by the given arguments.
+  @_i1.useResult
+  ForceLogoutEvent copyWith({
+    int? userInfoId,
+    String? deviceId,
+  });
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      'userInfoId': userInfoId,
+      'deviceId': deviceId,
+    };
+  }
+
+  @override
+  String toString() {
+    return _i1.SerializationManager.encode(this);
+  }
+}
+
+class _ForceLogoutEventImpl extends ForceLogoutEvent {
+  _ForceLogoutEventImpl({
+    required int userInfoId,
+    required String deviceId,
+  }) : super._(
+          userInfoId: userInfoId,
+          deviceId: deviceId,
+        );
+
+  /// Returns a shallow copy of this [ForceLogoutEvent]
+  /// with some or all fields replaced by the given arguments.
+  @_i1.useResult
+  @override
+  ForceLogoutEvent copyWith({
+    int? userInfoId,
+    String? deviceId,
+  }) {
+    return ForceLogoutEvent(
+      userInfoId: userInfoId ?? this.userInfoId,
+      deviceId: deviceId ?? this.deviceId,
+    );
+  }
+}

school_data_hub_client/lib/src/protocol/_features/hub/models/force_logout_event.dart

@@ -72,7 +72,7 @@ class _AudioButtonState extends State<AudioButton> {
     if (!AuthClearanceHelper.isCreatorOrAdmin(widget.file.createdBy)) {
       di<NotificationService>().showSnackBar(
         NotificationType.error,
-        'Nur Admins können Dokumente löschen',
+        'Nur Dokumenteninhaber können Dokumente löschen',
       );
       return;
     }

school_data_hub_client/lib/src/protocol/protocol.dart

@@ -7,7 +7,8 @@ import 'package:flutter_it/flutter_it.dart';
 import 'package:logging/logging.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/core/env/env_manager.dart';
-import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
+import 'package:school_data_hub_flutter/core/env/utils/env_utils.dart';
+import 'package:school_data_hub_flutter/core/session/hub_session_helper.dart';
 import 'package:school_data_hub_flutter/core/session/serverpod_connectivity_monitor.dart';
 
 final _log = Logger('HubStreamService');
@@ -46,6 +47,7 @@ class HubStreamService with WidgetsBindingObserver {
   bool _disposed = false;
   final _random = Random();
   VoidCallback? _connectivityListener;
+  String? _currentDeviceId;
 
   final _events = StreamController<Object>.broadcast();
 
@@ -61,6 +63,7 @@ class HubStreamService with WidgetsBindingObserver {
   bool get isConnected => _state.value == HubConnectionState.connected;
 
   Future<HubStreamService> init() async {
+    _currentDeviceId = (await EnvUtils.getDeviceNameAndId()).deviceId;
     _attemptConnect(isReconnect: false);
     final monitor = di<ServerpodConnectivityMonitor>();
     _connectivityListener = () {
@@ -210,9 +213,20 @@ class HubStreamService with WidgetsBindingObserver {
             _hasReceivedFirstEvent = true;
             _reconnectDelayMs = _initialReconnectDelayMs;
           }
-          if (!_disposed) {
-            _events.add(message as Object);
+          if (_disposed) return;
+
+          // Check for force-logout targeting this device.
+          if (message is ForceLogoutEvent &&
+              message.deviceId == _currentDeviceId) {
+            _log.warning(
+              '[HUB] ForceLogoutEvent received for this device — wiping data',
+            );
+            _cleanupSubscription();
+            SessionHelper.logoutAndDeleteAllInstanceData();
+            return;
           }
+
+          _events.add(message as Object);
         },
         onError: (Object error) {
           _handleStreamError(error);
@@ -240,7 +254,8 @@ class HubStreamService with WidgetsBindingObserver {
 
     if (error is ServerpodClientUnauthorized ||
         (error is ServerpodClientException && error.statusCode == 401)) {
-      di<HubSessionManager>().signOutDevice();
+      _log.warning('[HUB] Unauthorized — wiping data and signing out');
+      SessionHelper.logoutAndDeleteAllInstanceData();
       return;
     }
 

school_data_hub_flutter/assets/school_data_hub_server.svg

@@ -152,32 +152,33 @@ class HubSessionManager with ChangeNotifier {
   Future<bool> _signOut({required bool allDevices}) async {
     if (!isSignedIn) return true;
 
+    // Attempt to notify the server; ignore failures (e.g. key already deleted).
     try {
       if (allDevices) {
         await caller.status.signOutAllDevices();
       } else {
         await caller.status.signOutDevice();
       }
-      await caller.client.updateStreamingConnectionAuthenticationKey(null);
+    } catch (e) {
+      _log.warning('Server sign-out call failed (key may already be deleted): $e');
+    }
 
-      _signedInUser = null;
+    // Always clean up locally regardless of whether the server call succeeded.
+    try {
+      await caller.client.updateStreamingConnectionAuthenticationKey(null);
+    } catch (_) {}
 
-      // await _handleAuthCallResultInStorage();
+    _signedInUser = null;
 
-      await keyManager.remove();
+    await keyManager.remove();
 
-      if (!_isDisposed) notifyListeners();
+    if (!_isDisposed) notifyListeners();
 
-      /// Don't forget to set the flag in [EnvManager] to false
-      /// to get to the login screen.
-      _log.info('User signed out ');
+    _log.info('User signed out');
 
-      _envManager.setUserAuthenticatedFlagOnlyByHubSessionManager(false);
+    _envManager.setUserAuthenticatedFlagOnlyByHubSessionManager(false);
 
-      return true;
-    } catch (e) {
-      return false;
-    }
+    return true;
   }
 
   Future<void> attemptLogin({

school_data_hub_flutter/lib/common/audio/presentation/audio_button.dart

@@ -45,11 +45,6 @@ class PupilFilterManager implements Resettable {
   void resetFilters() {
     _pupilFilterState.value = {...initialPupilFilterValues};
 
-    //TODO: fix this
-    //  di<SchooldayEventFilterManager>().resetFilters();
-
-    // _searchText.value = '';
-
     _sortMode.value = {...initialSortModeValues};
 
     di<FiltersStateManager>().setFilterState(

school_data_hub_flutter/lib/common/services/hub_stream_service.dart

@@ -129,7 +129,7 @@ class PupilProfileLearningSupportContentList extends WatchingWidget {
                           if (!isAdmin) {
                             di<NotificationService>().showSnackBar(
                               NotificationType.error,
-                              'Nur Admins können Dokumente ansehen',
+                              'Nur Dokumenteninhaber können Dokumente löschen',
                             );
                             return;
                           }