Skip to content
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
13 changes: 9 additions & 4 deletions modules/ensemble/lib/framework/data_context.dart
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,13 @@ class RemoteConfigInvokable with Invokable {
Map<String, Function> setters() => {};
}

/// Keys for which `ensemble.storage.clear()` dispatches a [StorageBindingSource]
/// update after entries are removed from public storage (all keys except the
/// `enc_` encrypted prefix).
@visibleForTesting
List<String> ensembleStorageClearDispatchKeys(Iterable<String> allKeys) =>
allKeys.where((key) => !key.startsWith('enc_')).toList();

/// Singleton handling user storage
class EnsembleStorage with Invokable {
static final EnsembleStorage _instance = EnsembleStorage._internal();
Expand Down Expand Up @@ -791,10 +798,8 @@ class EnsembleStorage with Invokable {
}

void clear() {
final keys = StorageManager()
.getKeys()
.where((key) => !key.startsWith('enc_'))
.toList();
final keys =
ensembleStorageClearDispatchKeys(StorageManager().getKeys());
StorageManager().clearPublicStorage();
for (final key in keys) {
ScreenController().dispatchStorageChanges(context, key, null);
Expand Down
25 changes: 25 additions & 0 deletions modules/ensemble/test/ensemble_storage_clear_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import 'package:ensemble/framework/data_context.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
group('ensembleStorageClearDispatchKeys', () {
test('excludes enc_ prefix and preserves order of remaining keys', () {
expect(
ensembleStorageClearDispatchKeys(
['session', 'enc_token', 'theme', 'enc_other']),
['session', 'theme'],
);
});

test('treats only the enc_ prefix as encrypted storage namespace', () {
expect(
ensembleStorageClearDispatchKeys(['enc_legacy', 'enc2', 'normal']),
['enc2', 'normal'],
);
});

test('empty input yields empty list', () {
expect(ensembleStorageClearDispatchKeys([]), isEmpty);
});
});
}
Loading