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
12 changes: 12 additions & 0 deletions modules/ensemble/lib/framework/data_context.dart
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,7 @@ class EnsembleStorage with Invokable {
'get': (String key) => StorageManager().read(key),
'set': setProperty,
'delete': (key) => delete(key),
'clear': ([dynamic _]) => clear(),
};
}

Expand All @@ -789,6 +790,17 @@ class EnsembleStorage with Invokable {
ScreenController().dispatchStorageChanges(context, key, null);
}

void clear() {
final keys = StorageManager()
.getKeys()
.where((key) => !key.startsWith('enc_'))
.toList();
StorageManager().clearPublicStorage();
for (final key in keys) {
ScreenController().dispatchStorageChanges(context, key, null);
}
}

@override
Map<String, Function> setters() {
throw UnimplementedError();
Expand Down
14 changes: 14 additions & 0 deletions modules/ensemble/lib/framework/storage_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,20 @@ mixin PublicStorage {
GetStorage().write(key, value);

Future<void> remove(String key) => GetStorage().remove(key);

/// get all keys in public storage
Iterable<String> getKeys() => GetStorage().getKeys();

/// remove all public storage entries except those with the encrypted prefix
Future<void> clearPublicStorage() async {
const encryptedPrefix = 'enc_';
final keys = GetStorage().getKeys().toList();
for (final key in keys) {
if (!key.startsWith(encryptedPrefix)) {
await GetStorage().remove(key);
}
}
}
}

/// secure storage. These are async so really only use-able
Expand Down
106 changes: 106 additions & 0 deletions modules/ensemble/test/storage_manager_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import 'package:flutter_test/flutter_test.dart';

void main() {
test('clear logic filters out encrypted keys correctly', () {
final storage = <String, dynamic>{
'name': 'Alice',
'theme': 'dark',
'enc_secret1': 'encrypted_value_1',
'enc_secret2': 'encrypted_value_2',
'session': 'abc123',
};

const encryptedPrefix = 'enc_';
final keysToRemove = storage.keys
.where((key) => !key.startsWith(encryptedPrefix))
.toList();

for (final key in keysToRemove) {
storage.remove(key);
}

expect(storage.containsKey('name'), isFalse);
expect(storage.containsKey('theme'), isFalse);
expect(storage.containsKey('session'), isFalse);
expect(storage['enc_secret1'], 'encrypted_value_1');
expect(storage['enc_secret2'], 'encrypted_value_2');
expect(storage.length, 2);
});

test('clear logic handles empty storage', () {
final storage = <String, dynamic>{};

const encryptedPrefix = 'enc_';
final keysToRemove = storage.keys
.where((key) => !key.startsWith(encryptedPrefix))
.toList();

for (final key in keysToRemove) {
storage.remove(key);
}

expect(storage, isEmpty);
});

test('clear logic removes all non-encrypted keys', () {
final storage = <String, dynamic>{
'user': 'Bob',
'age': 30,
'city': 'NYC',
};

const encryptedPrefix = 'enc_';
final keysToRemove = storage.keys
.where((key) => !key.startsWith(encryptedPrefix))
.toList();

for (final key in keysToRemove) {
storage.remove(key);
}

expect(storage, isEmpty);
});

test('clear logic preserves all encrypted keys when no regular keys exist',
() {
final storage = <String, dynamic>{
'enc_a': 'val_a',
'enc_b': 'val_b',
};

const encryptedPrefix = 'enc_';
final keysToRemove = storage.keys
.where((key) => !key.startsWith(encryptedPrefix))
.toList();

for (final key in keysToRemove) {
storage.remove(key);
}

expect(storage.length, 2);
expect(storage['enc_a'], 'val_a');
expect(storage['enc_b'], 'val_b');
});

test('storage can be used normally after clear', () {
final storage = <String, dynamic>{
'key1': 'value1',
'key2': 'value2',
};

const encryptedPrefix = 'enc_';
final keysToRemove = storage.keys
.where((key) => !key.startsWith(encryptedPrefix))
.toList();

for (final key in keysToRemove) {
storage.remove(key);
}

expect(storage, isEmpty);

storage['newKey'] = 'newValue';
expect(storage['newKey'], 'newValue');
expect(storage.length, 1);
});
}
Loading