0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: encoding and decoding logic

Browse source
This commit is contained in:
Prateek Sunal 2024-04-27 16:02:42 +05:30
parent a22f38ca3b
commit adbb8f38c9
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
auth/lib/models/code.dart
View file

@ -151,11 +151,12 @@ class Code {
}
String toExportFormat() {
return Uri.parse(
rawData +
"&codeDisplay=" +
jsonEncode((display ?? CodeDisplay()).toJson()),
).toString();
return jsonEncode(
Uri.parse(
"$rawData&codeDisplay="
"${jsonEncode((display ?? CodeDisplay()).toJson())}",
).toString(),
);
}
static String _getIssuer(Uri uri) {

18
auth/lib/store/code_store.dart
View file

@ -29,18 +29,16 @@ class CodeStore {
final List<Code> codes = [];
for (final entity in entities) {
try {
if (entity.rawData.startsWith('otpauth://')) {
final code = Code.fromOTPAuthUrl(entity.rawData);
code.generatedID = entity.generatedID;
code.hasSynced = entity.hasSynced;
codes.add(code);
final decodeJson = jsonDecode(entity.rawData);
late Code code;
if (decodeJson is String && decodeJson.startsWith('otpauth://')) {
code = Code.fromOTPAuthUrl(decodeJson);
} else {
final decodeJson = jsonDecode(entity.rawData);
final code = Code.fromExportJson(decodeJson);
code.generatedID = entity.generatedID;
code.hasSynced = entity.hasSynced;
codes.add(code);
code = Code.fromExportJson(decodeJson);
}
code.generatedID = entity.generatedID;
code.hasSynced = entity.hasSynced;
codes.add(code);
} catch (e) {
_logger.severe("Could not parse code", e);
}