Cleanup PR

Author: passsy

packages/fresh/CHANGELOG.md

@@ -1,4 +1,4 @@
-# 0.7.0
+# 0.5.0
 
 - feat: add `Token` base class for token extensibility
 - feat: add `OAuth2Token.issuedAt` field for token issue date tracking  

packages/fresh/lib/src/token.dart

@@ -30,13 +30,17 @@ abstract class Token {
 class OAuth2Token extends Token {
   /// {macro oauth2_token}
   const OAuth2Token({
-    required super.accessToken,
-    super.refreshToken,
-    super.tokenType,
+    required String accessToken,
+    String? refreshToken,
+    String? tokenType,
     this.expiresIn,
     this.scope,
     this.issuedAt,
-  });
+  }) : super(
+          accessToken: accessToken,
+          refreshToken: refreshToken,
+          tokenType: tokenType ?? 'bearer',
+        );
 
   /// If the access token expires, the server should reply
   /// with the duration of time the access token is granted for.

packages/fresh/pubspec.yaml

@@ -5,13 +5,10 @@ issue_tracker: https://github.com/felangel/fresh/issues
 homepage: https://github.com/felangel/fresh
 funding: [https://github.com/sponsors/felangel]
 
-version: 0.7.0
+version: 0.5.0
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
-
-dependency:
-  meta: ^1.10.0
+  sdk: ">=2.12.0 <4.0.0"
 
 dev_dependencies:
   mocktail: ^1.0.0

packages/fresh_dio/lib/src/fresh.dart

@@ -246,9 +246,12 @@ Example:
     RequestOptions requestOptions,
     T? token,
   ) {
-    if (token case Token(:final DateTime expiresAt)) {
-      final now = DateTime.now();
-      return expiresAt.isBefore(now);
+    if (token is Token) {
+      final expiresAt = token.expiresAt;
+      if (expiresAt != null) {
+        final now = DateTime.now();
+        return expiresAt.isBefore(now);
+      }
     }
 
     return false;

packages/fresh_dio/pubspec.yaml

@@ -8,11 +8,11 @@ funding: [https://github.com/sponsors/felangel]
 version: 0.5.0
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
+  sdk: ">=2.15.0 <4.0.0"
 
 dependencies:
   dio: ^5.5.0+1
-  fresh: ^0.7.0
+  fresh: ^0.5.0
 
 dev_dependencies:
   mocktail: ^1.0.0

packages/fresh_graphql/lib/src/fresh_link.dart

@@ -162,9 +162,12 @@ class FreshLink<T> extends Link with FreshMixin<T> {
   }
 
   static bool _defaultShouldRefreshBeforeRequest<T>(Request request, T? token) {
-    if (token case Token(:final DateTime expiresAt)) {
-      final now = DateTime.now();
-      return expiresAt.isBefore(now);
+    if (token is Token) {
+      final expiresAt = token.expiresAt;
+      if (expiresAt != null) {
+        final now = DateTime.now();
+        return expiresAt.isBefore(now);
+      }
     }
 
     return false;

packages/fresh_graphql/pubspec.yaml

@@ -8,10 +8,10 @@ funding: [https://github.com/sponsors/felangel]
 version: 0.7.0
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
+  sdk: ">=2.15.0 <4.0.0"
 
 dependencies:
-  fresh: ^0.7.0
+  fresh: ^0.5.0
 
   gql_exec: ^1.0.0
   gql_link: ^1.0.0