fix: Fix parsing error in user model

This commit is contained in:
Anton Stubenbord
2023-10-07 22:34:40 +02:00
parent b612f8b04f
commit 93d7a36f1d
5 changed files with 27 additions and 14 deletions

View File

@@ -0,0 +1 @@
Beheben eines Fehlers, durch welchen die App bei Paperless Versionen vor 1.14.0 nicht mehr startete

View File

@@ -0,0 +1 @@
Fix bug where app would not login with paperless versions before 1.14.0

View File

@@ -7,14 +7,11 @@ import 'package:paperless_api/config/hive/hive_type_ids.dart';
part 'user_model.g.dart';
sealed class UserModel {
@HiveField(0)
final int id;
@HiveField(1)
final String username;
const UserModel({
required this.id,
required this.username,
});
int get id;
String get username;
const UserModel();
String? get fullName;
}
@@ -22,11 +19,18 @@ sealed class UserModel {
@JsonSerializable(fieldRename: FieldRename.snake)
@HiveType(typeId: PaperlessApiHiveTypeIds.userModelv2)
class UserModelV2 extends UserModel {
@override
@HiveField(0)
@JsonKey(name: 'user_id')
final int id;
@override
@HiveField(1)
final String username;
@HiveField(2)
final String? displayName;
const UserModelV2({
required super.id,
required super.username,
required this.id,
required this.username,
this.displayName,
});
Map<String, dynamic> toJson() => _$UserModelV2ToJson(this);
@@ -40,6 +44,12 @@ class UserModelV2 extends UserModel {
@JsonSerializable(fieldRename: FieldRename.snake)
@HiveType(typeId: PaperlessApiHiveTypeIds.userModelv3)
class UserModelV3 extends UserModel {
@override
@HiveField(0)
final int id;
@override
@HiveField(1)
final String username;
@HiveField(2)
final String? email;
@HiveField(3)
@@ -76,8 +86,8 @@ class UserModelV3 extends UserModel {
}
const UserModelV3({
required super.id,
required super.username,
required this.id,
required this.username,
this.email,
this.firstName,
this.lastName,

View File

@@ -366,7 +366,7 @@ packages:
description:
path: "."
ref: master
resolved-ref: "2e6c7396e13c2c6ecd0a704d2322b349a7a21584"
resolved-ref: "8eae877b37d4634f1b636e48ebffd9066b0cb47d"
url: "https://github.com/sawankumarbundelkhandi/edge_detection"
source: git
version: "1.1.2"

View File

@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 3.0.1+48
version: 3.0.2+49
environment:
sdk: ">=3.0.0 <4.0.0"
@@ -97,6 +97,7 @@ dependencies:
transparent_image: ^2.0.1
flutter_animate: ^4.2.0+1
shared_preferences: ^2.2.1
# camerawesome: ^2.0.0-dev.1
dependency_overrides:
intl: ^0.18.1