π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Fix 2FAS token transfer imports
Neeraj Gupta84d9971cd51a
diff --git a/mobile/apps/auth/changes/2fas-otpauth-import.md b/mobile/apps/auth/changes/2fas-otpauth-import.mdnew file mode 100644index 0000000000..3144d4820c--- /dev/null+++ b/mobile/apps/auth/changes/2fas-otpauth-import.md@@ -0,0 +1 @@+- Fixed 2FAS token imports.diff --git a/mobile/apps/auth/lib/ui/settings/data/import/plain_text_import_parser.dart b/mobile/apps/auth/lib/ui/settings/data/import/plain_text_import_parser.dartindex 3beffa9d2a..c1e117a84b 100644--- a/mobile/apps/auth/lib/ui/settings/data/import/plain_text_import_parser.dart+++ b/mobile/apps/auth/lib/ui/settings/data/import/plain_text_import_parser.dart@@ -23,9 +23,7 @@ List<Code> parsePlainTextImport(String content) {}List<Code> _parseOTPAuthCodes(String content) {- final entries = content.contains(',')- ? content.split(',')- : const LineSplitter().convert(content);+ final entries = content.split(RegExp(r'(?:\r\n?|\n)|,(?=\s*otpauth://)'));return _parseEntries(entries.map((entry) => entry.trim()).where((entry) => entry.isNotEmpty),Code.fromOTPAuthUrl,diff --git a/mobile/apps/auth/lib/ui/settings/data/import/two_fas_import.dart b/mobile/apps/auth/lib/ui/settings/data/import/two_fas_import.dartindex 8683a5cd29..575fb78934 100644--- a/mobile/apps/auth/lib/ui/settings/data/import/two_fas_import.dart+++ b/mobile/apps/auth/lib/ui/settings/data/import/two_fas_import.dart@@ -5,6 +5,7 @@ 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_auth/ui/settings/data/import/plain_text_import_parser.dart';import 'package:ente_auth/utils/dialog_util.dart';import 'package:ente_strings/ente_strings.dart';import 'package:ente_ui/components/progress_dialog.dart';@@ -42,8 +43,13 @@ Future<int?> _process2FasExportFile(String path,final ProgressDialog dialog,) async {- final jsonString = await readPickedImportFileAsString(path);- final decodedJson = jsonDecode(jsonString);+ final export = await readPickedImportFileAsString(path);+ if (export.trimLeft().startsWith('otpauth://')) {+ await dialog.show();+ return saveImportedCodes(parsePlainTextImport(export));+ }++ final decodedJson = jsonDecode(export);int version = (decodedJson['schemaVersion'] ?? 0) as int;if (version != 3 && version != 4) {if (!context.mounted) return null;diff --git a/mobile/apps/auth/test/ui/settings/data/import/plain_text_import_parser_test.dart b/mobile/apps/auth/test/ui/settings/data/import/plain_text_import_parser_test.dartindex cf67e77fb9..00bdae0c95 100644--- a/mobile/apps/auth/test/ui/settings/data/import/plain_text_import_parser_test.dart+++ b/mobile/apps/auth/test/ui/settings/data/import/plain_text_import_parser_test.dart@@ -35,6 +35,29 @@ not-an-otp-uriexpect(codes.single.account, '[email protected]');});+ test('preserves commas inside newline-delimited OTP entries', () {+ const content = '''+otpauth://totp/[email protected]?secret=JBSWY3DPEHPK3PXP&issuer=Example,%20Inc+otpauth://totp/[email protected]?secret=GEZDGNBVGY3TQOJQ&issuer=Example+''';++ final codes = parsePlainTextImport(content);++ expect(codes, hasLength(2));+ expect(codes.first.issuer, 'Example, Inc');+ expect(codes.last.account, '[email protected]');+ });++ test('parses comma-delimited OTP entries', () {+ const content =+ 'otpauth://totp/[email protected]?secret=JBSWY3DPEHPK3PXP&issuer=Example,'+ 'otpauth://totp/[email protected]?secret=GEZDGNBVGY3TQOJQ&issuer=Example';++ final codes = parsePlainTextImport(content);++ expect(codes, hasLength(2));+ });+test('preserves display properties from the rich fixture', () async {final content = await File('test/ui/settings/data/import/fixtures/rich_display_import.txt',