Refresh token if expires in the next 5 minutes

Show artist name in artist page
AlvaroRojas · Jun 8, 2023 · bf6e073 · bf6e073
1 parent 78cd6ed
commit bf6e073
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/lib/APIs/spotify_api.dart b/lib/APIs/spotify_api.dart
@@ -79,6 +79,7 @@ class SpotifyApi {
     String? refreshToken,
   }) async {
     Map<String, String>? body;
+    Map<String, String>? headers;
     if (code != null) {
       body = {
         'grant_type': 'authorization_code',
@@ -93,6 +94,7 @@ class SpotifyApi {
         'refresh_token': refreshToken,
         'client_id': clientID
       };
+      headers = {'Content-Type': 'application/x-www-form-urlencoded'};
     }
 
     if (body == null) {
@@ -101,7 +103,7 @@ class SpotifyApi {
 
     try {
       final Uri path = Uri.parse(requestToken);
-      final response = await post(path, body: body);
+      final response = await post(path, body: body, headers: headers);
 
       if (response.statusCode == 200) {
         final Map result = jsonDecode(response.body) as Map;

diff --git a/lib/CustomWidgets/song_tile_trailing_menu.dart b/lib/CustomWidgets/song_tile_trailing_menu.dart
@@ -22,13 +22,10 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:share_plus/share_plus.dart';
-import 'package:soundal/APIs/spotify_api.dart';
 import 'package:soundal/CustomWidgets/add_playlist.dart';
 import 'package:soundal/Helpers/add_mediaitem_to_queue.dart';
 import 'package:soundal/Helpers/mediaitem_converter.dart';
-import 'package:soundal/Helpers/spotify_helper.dart';
 import 'package:soundal/Screens/Common/song_list.dart';
-import 'package:soundal/Screens/Search/albums.dart';
 import 'package:soundal/Screens/Search/artists.dart';
 import 'package:soundal/Screens/Search/search.dart';
 import 'package:soundal/Services/youtube_services.dart';
@@ -224,7 +221,11 @@ class _SongTileTrailingMenuState extends State<SongTileTrailingMenu> {
               PageRouteBuilder(
                 opaque: false,
                 pageBuilder: (_, __, ___) => ArtistSearchPage(
-                  data: {'id': value.toString()},
+                  data: {
+                    'id': value.toString(),
+                    'title': (widget.data['artist'].split(', ') as List)[
+                        widget.data['spotify_artist_id'].indexOf(value) as int]
+                  },
                 ),
               ),
             );

diff --git a/lib/Helpers/spotify_helper.dart b/lib/Helpers/spotify_helper.dart
@@ -41,7 +41,7 @@ Future<String?> retriveAccessToken() async {
     return null;
   } else {
     final currentTime = DateTime.now().millisecondsSinceEpoch / 1000;
-    if ((currentTime + 60) >= expiredAt) {
+    if ((currentTime + 60 * 5) >= expiredAt) {
       final List<String> data =
           await SpotifyApi().getAccessToken(refreshToken: refreshToken);
       if (data.isNotEmpty) {

diff --git a/lib/Screens/Home/spotify.dart b/lib/Screens/Home/spotify.dart
@@ -115,8 +115,8 @@ class _SpotifyHomePageState extends State<SpotifyHomePage>
               'imagesList': [element],
               'source': 'spotify',
             };
-            Hive.box('settings').put('playlistNames', playlistNames);
-            Hive.box('settings').put('playlistDetails', playlistDetails);
+            await Hive.box('settings').put('playlistNames', playlistNames);
+            await Hive.box('settings').put('playlistDetails', playlistDetails);
           } else {
             if (playlistDetails[element['title']]['imagesList'][0]
                     ['snapshot_id'] !=
@@ -127,7 +127,7 @@ class _SpotifyHomePageState extends State<SpotifyHomePage>
                 'imagesList': [element],
                 'source': 'spotify',
               };
-              Hive.box('settings').put('playlistDetails', playlistDetails);
+              await Hive.box('settings').put('playlistDetails', playlistDetails);
             }
           }
         }

diff --git a/lib/Screens/Search/albums.dart b/lib/Screens/Search/albums.dart
@@ -21,7 +21,6 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:intl/intl.dart';
-import 'package:soundal/APIs/api.dart';
 import 'package:soundal/APIs/spotify_api.dart';
 import 'package:soundal/CustomWidgets/bouncy_sliver_scroll_view.dart';
 import 'package:soundal/CustomWidgets/copy_clipboard.dart';
@@ -154,6 +153,7 @@ class _AlbumSearchPageState extends State<AlbumSearchPage> {
                     temp.addAll(List<Map>.from(value['artists'] as List)),
                     for (final element in temp)
                       {
+                        element['title'] = element['name'],
                         if ((element['images'] as List).isNotEmpty)
                           {
                             element['image'] = element['images'].first['url'],