From 30241f7ae6050dbb49d34c71412259e4b8cea682 Mon Sep 17 00:00:00 2001
From: Simon <homer12345@gmail.com>
Date: Mon, 14 Aug 2023 18:32:48 -0700
Subject: [PATCH] Minor refactoring

Reuse mixins
---
 lib/mangadex/model.dart | 2 +-
 lib/mangadex/types.dart | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/mangadex/model.dart b/lib/mangadex/model.dart
index aa1041dd..aa50b2dc 100644
--- a/lib/mangadex/model.dart
+++ b/lib/mangadex/model.dart
@@ -149,7 +149,7 @@ class MangaDexModel {
         return false;
       }
 
-      return _token!.expired;
+      return _token!.isExpired();
     });
   }
 
diff --git a/lib/mangadex/types.dart b/lib/mangadex/types.dart
index cfa8e5bd..128860da 100644
--- a/lib/mangadex/types.dart
+++ b/lib/mangadex/types.dart
@@ -925,7 +925,7 @@ class ReadChapterSet with ShortLivedData {
 
 // Deprecated old style login types
 @freezed
-class OldToken with _$OldToken {
+class OldToken with _$OldToken, ShortLivedData {
   OldToken._();
 
   static const int expiryTime = 600; // seconds (10 minutes)
@@ -938,10 +938,10 @@ class OldToken with _$OldToken {
   factory OldToken.fromJson(Map<String, dynamic> json) =>
       _$OldTokenFromJson(json);
 
-  final DateTime expiresAt =
+  @override
+  final DateTime expiry =
       DateTime.now().add(const Duration(seconds: expiryTime));
 
-  Duration get timeUntilExpiry => expiresAt.difference(DateTime.now());
-  bool get expired => (DateTime.now().compareTo(expiresAt) >= 0);
+  Duration get timeUntilExpiry => expiry.difference(DateTime.now());
   bool get isValid => (session.isNotEmpty && refresh.isNotEmpty);
 }