Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Preserve notes in authenticator imports

Neeraj Gupta88f9a3d5b9c5
diff --git a/mobile/apps/auth/changes/import-authenticator-notes.md b/mobile/apps/auth/changes/import-authenticator-notes.md
new file mode 100644
index 0000000000..dfbdd89f9d
--- /dev/null
+++ b/mobile/apps/auth/changes/import-authenticator-notes.md
@@ -0,0 +1 @@
+- Preserve notes when importing Aegis and Bitwarden exports.
diff --git a/mobile/apps/auth/lib/ui/settings/data/import/aegis_import.dart b/mobile/apps/auth/lib/ui/settings/data/import/aegis_import.dart
index c75a4fc178..a90d4f7ced 100644
--- a/mobile/apps/auth/lib/ui/settings/data/import/aegis_import.dart
+++ b/mobile/apps/auth/lib/ui/settings/data/import/aegis_import.dart
@@ -84,6 +84,10 @@ Future<int?> _processAegisExportFile(
} else {
aegisDB = decodedJson['db'];
}
+ return saveImportedCodes(parseAegisCodes(aegisDB));
+}
+
+List<Code> parseAegisCodes(Map? aegisDB) {
final Map<String, String> groupIDToName = {};
try {
if (aegisDB?['groups'] != null) {
@@ -129,12 +133,16 @@ Future<int?> _processAegisExportFile(
),
);
code = code.copyWith(
- display: CodeDisplay(pinned: isFavorite, tags: tags),
+ display: CodeDisplay(
+ pinned: isFavorite,
+ tags: tags,
+ note: item['note'] ?? '',
+ ),
);
parsedCodes.add(code);
}
- return saveImportedCodes(parsedCodes);
+ return parsedCodes;
}
String decryptAegisVault(dynamic data, {required String password}) {
diff --git a/mobile/apps/auth/lib/ui/settings/data/import/bitwarden_import.dart b/mobile/apps/auth/lib/ui/settings/data/import/bitwarden_import.dart
index baefee75f5..4087ec8c5b 100644
--- a/mobile/apps/auth/lib/ui/settings/data/import/bitwarden_import.dart
+++ b/mobile/apps/auth/lib/ui/settings/data/import/bitwarden_import.dart
@@ -1,7 +1,6 @@
import 'dart:convert';
import 'package:ente_auth/models/code.dart';
-import 'package:ente_auth/models/code_display.dart';
import 'package:ente_auth/ui/settings/data/import/import_file_cleanup.dart';
import 'package:ente_auth/ui/settings/data/import/import_flow.dart';
import 'package:ente_strings/ente_strings.dart';
@@ -36,6 +35,10 @@ Future<int?> _processBitwardenExportFile(
) async {
final jsonString = await readPickedImportFileAsString(path);
final data = jsonDecode(jsonString);
+ return saveImportedCodes(parseBitwardenCodes(data));
+}
+
+List<Code> parseBitwardenCodes(Map<String, dynamic> data) {
List<dynamic> jsonArray = data['items'];
final Map<String, String> folderIdToName = {};
try {
@@ -50,6 +53,7 @@ Future<int?> _processBitwardenExportFile(
if (item['login'] != null && item['login']['totp'] != null) {
var totp = item['login']['totp'];
String? folderID = item['folderId'];
+ String? note = item['notes'];
Code code;
if (totp.contains("otpauth://")) {
@@ -76,9 +80,13 @@ Future<int?> _processBitwardenExportFile(
Code.defaultDigits,
);
}
- if (folderID != null && folderIdToName.containsKey(folderID)) {
+ final folderName = folderID == null ? null : folderIdToName[folderID];
+ if (folderName != null || note != null) {
code = code.copyWith(
- display: CodeDisplay(tags: [folderIdToName[folderID]!]),
+ display: code.display.copyWith(
+ tags: folderName == null ? null : [folderName],
+ note: note,
+ ),
);
}
@@ -86,5 +94,5 @@ Future<int?> _processBitwardenExportFile(
}
}
- return saveImportedCodes(parsedCodes);
+ return parsedCodes;
}
diff --git a/mobile/apps/auth/test/ui/settings/data/import/import_notes_test.dart b/mobile/apps/auth/test/ui/settings/data/import/import_notes_test.dart
new file mode 100644
index 0000000000..2a98a44e27
--- /dev/null
+++ b/mobile/apps/auth/test/ui/settings/data/import/import_notes_test.dart
@@ -0,0 +1,56 @@
+import 'package:ente_auth/ui/settings/data/import/aegis_import.dart';
+import 'package:ente_auth/ui/settings/data/import/bitwarden_import.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+ test('imports Aegis notes with display metadata', () {
+ final code = parseAegisCodes({
+ 'groups': [
+ {'uuid': 'work', 'name': 'Work'},
+ ],
+ 'entries': [
+ {
+ 'type': 'totp',
+ 'name': '[email protected]',
+ 'issuer': 'Example',
+ 'favorite': true,
+ 'note': 'Recovery codes are in the safe.',
+ 'groups': ['work'],
+ 'info': {
+ 'algo': 'SHA1',
+ 'secret': 'JBSWY3DPEHPK3PXP',
+ 'period': 30,
+ 'digits': 6,
+ },
+ },
+ ],
+ }).single;
+
+ expect(code.note, 'Recovery codes are in the safe.');
+ expect(code.display.pinned, isTrue);
+ expect(code.display.tags, ['Work']);
+ });
+
+ test('imports Bitwarden notes with folder tags', () {
+ final code = parseBitwardenCodes({
+ 'folders': [
+ {'id': 'work', 'name': 'Work'},
+ ],
+ 'items': [
+ {
+ 'name': 'Example',
+ 'folderId': 'work',
+ 'notes': 'Recovery codes are in the safe.',
+ 'login': {
+ 'username': '[email protected]',
+ 'totp':
+ 'otpauth://totp/Example:[email protected]?secret=JBSWY3DPEHPK3PXP&issuer=Example',
+ },
+ },
+ ],
+ }).single;
+
+ expect(code.note, 'Recovery codes are in the safe.');
+ expect(code.display.tags, ['Work']);
+ });
+}