feat: lets make spotify work live

Author: necodeus

Diff for: app/Console/Commands/GetSpotifyActivitiesCommand.php

@@ -13,7 +13,7 @@
 
 class GetSpotifyActivitiesCommand extends Command
 {
-    protected $signature = 'spotify:activities {authorId?}';
+    protected $signature = 'spotify:activities';
 
     protected function devices(string $bearerToken)
     {
@@ -107,20 +107,12 @@ protected function state(string $bearerToken)
 
     public function handle()
     {
-        $authorId = $this->argument('authorId');
+        $authors = DB::table('authors')->whereNotNull('spotify_user_id')->get();
 
-        if (!$authorId) {
-            $authors = DB::table('authors')->whereNotNull('spotify_user_id')->get();
-
-            foreach ($authors as $author) {
-                print "Aktualizacja aktywności dla autora: {$author->name}\n";
-                $this->updateSpotifyActivity($author->id);
-            }
-
-            return;
+        foreach ($authors as $author) {
+            print "Aktualizacja aktywności dla autora: {$author->name}\n";
+            $this->updateSpotifyActivity($author->id);
         }
-
-        $this->updateSpotifyActivity($authorId);
     }
 
     protected function updateSpotifyActivity(string $authorId)
@@ -147,9 +139,20 @@ protected function updateSpotifyActivity(string $authorId)
             return;
         }
 
-        $bearerToken = $spotifyUser->access_token;
-
         try {
+            $bearerToken = $spotifyUser->access_token;
+            $refreshedAt = $spotifyUser->token_refreshed_at;
+
+            if (empty($refreshedAt) || Carbon::parse($refreshedAt)->addSeconds(1800)->isPast()) {
+                $response = SpotifyService::getRefreshToken(env('SPOTIFY_CLIENT_ID'), env('SPOTIFY_CLIENT_SECRET'), $spotifyUser->refresh_token);
+                
+                $spotifyUser->update([
+                    'access_token' => $response->access_token,
+                    'token_refreshed_at' => Carbon::now(),
+                    'scope' => $response->scope,
+                ]);
+            }
+
             $devices = $this->devices($bearerToken);
             $state = $this->state($bearerToken);
             $history = $this->history($bearerToken);
@@ -169,9 +172,6 @@ protected function updateSpotifyActivity(string $authorId)
                 'player' => $player,
             ];
         } catch (Throwable $t) {
-            // TODO refresh token and retry once!
-            // SpotifyService::getRefreshToken(env('SPOTIFY_CLIENT_ID'), env('SPOTIFY_CLIENT_SECRET'), $spotifyUser->refresh_token);
-
             print $t->getMessage();
             logger()->error($t->getMessage());
             return;

Diff for: app/Http/Controllers/Spotify/SpotifyController.php

@@ -41,10 +41,12 @@ public function handleCallback()
             die('Błąd autoryzacji');
         }
 
-        session(['spotify_token' => $token->access_token]);
-
         $spotifyUser = SpotifyService::getCurrentUser($token->access_token);
 
+        if (empty($spotifyUser)) {
+            die('Błąd autoryzacji');
+        }
+
         $existingUser = SpotifyUser::where('user_id', $spotifyUser->id)->first();
 
         if ($existingUser) {
@@ -53,7 +55,7 @@ public function handleCallback()
                 'refresh_token' => $token->refresh_token,
                 'scope' => $token->scope,
                 'followers' => $spotifyUser->followers->total,
-                'avatar_url' => $spotifyUser->images[0]->url,
+                'avatar_url' => $spotifyUser->images[0]->url ?? '',
                 'type' => $spotifyUser->type,
                 'token_refreshed_at' => null,
             ]);
@@ -68,7 +70,7 @@ public function handleCallback()
             'refresh_token' => $token->refresh_token,
             'scope' => $token->scope,
             'followers' => $spotifyUser->followers->total,
-            'avatar_url' => $spotifyUser->images[0]->url,
+            'avatar_url' => $spotifyUser->images[0]->url ?? '',
             'type' => $spotifyUser->type,
             'token_refreshed_at' => null,
         ]);

Diff for: app/Models/Spotify/SpotifyUser.php

@@ -15,6 +15,7 @@
  * @property int $followers
  * @property string $avatar_url
  * @property string $type
+ * @property string $token_refreshed_at
  */
 class SpotifyUser extends Model
 {

Diff for: app/Services/Spotify/SpotifyService.php

@@ -100,12 +100,18 @@ public static function getTrack(string $bearerToken, string $trackId)
         return json_decode($response);
     }
 
-    public static function authorizeWithSpotify(string $clientId, string $state, string $redirectUri): RedirectResponse
+    public static function authorizeWithSpotify(string $clientId, string $state, string $redirectUri, array $scope = []): RedirectResponse
     {
-        $scope = implode(' ', [
-            'user-read-recently-played', // poprzednio grany utwór
-            'user-read-playback-state', // stan odtwarzania
-        ]);
+        if (empty($scope)) {
+            $scope = [
+                'user-read-private',
+                'user-read-email',
+                'user-read-recently-played',
+                'user-read-playback-state',
+            ];
+        }
+
+        $scope = implode(' ', $scope);
 
         $url = "https://accounts.spotify.com/authorize?response_type=code&client_id=$clientId&scope=$scope&state=$state&redirect_uri=$redirectUri";