expiration

Author: jcardus

lib/services/api_service.dart

@@ -250,7 +250,8 @@ class ApiService {
         headers: permissionHeaders,
         body: permissionBody,
       );
-      return 'https://eta.fleetmap.io/?token=$token';
+      final exp = Uri.encodeComponent(expirationTime.toUtc().toIso8601String());
+      return 'https://eta.fleetmap.io/?token=$token&expiration=$exp';
     } catch (e, stack) {
       dev.log('Error in shareDevice: $e', name: 'API', error: e, stackTrace: stack);
       return '';
@@ -271,7 +272,8 @@ class ApiService {
       );
 
       if (response.statusCode == 200) {
-        final url = "https://fleetmap-io.github.io/share-vehicle-location?token=${response.body}";
+        final exp = Uri.encodeComponent(expiration.toUtc().toIso8601String());
+        final url = "https://fleetmap-io.github.io/share-vehicle-location?token=${response.body}&expiration=$exp";
         dev.log(url);
         return url;
       } else {

lib/widgets/device_detail.dart

@@ -162,12 +162,24 @@ class DeviceDetail extends StatelessWidget {
   Future<void> _shareLocation(BuildContext context) async {
     if (position == null) return;
 
+    final now = DateTime.now();
+    final pickedDate = await showDatePicker(
+      context: context,
+      initialDate: now.add(const Duration(days: 1)),
+      firstDate: now,
+      lastDate: now.add(const Duration(days: 365)),
+    );
+    if (pickedDate == null) return;
+    if (!context.mounted) return;
+
+    final expiration = DateTime(pickedDate.year, pickedDate.month, pickedDate.day, 23, 59, 59);
+
     final apiService = ApiService();
 
     try {
-      final expiration = DateTime.now().add(const Duration(hours: 24));
       String? shareUrl = await apiService.shareDevice(device.id, expiration);
       if (shareUrl.isEmpty) {
+        if (!context.mounted) return;
         shareUrl = await apiService.shareDeviceV2(device.id, expiration);
       }
       if (shareUrl == null || shareUrl.isEmpty) throw Exception('No share URL');

pubspec.lock

@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -409,18 +409,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.18"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
@@ -662,10 +662,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.9"
+    version: "0.7.7"
   typed_data:
     dependency: transitive
     description: