Merge branch 'master' into fix-spotify-precision

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.13.2
+
+- add codeVerifier for oauth flow
+- add method to expand spotify's shortened URLs 
+  - e.g. `await spotify.expandLink('https://spotify.link/hRkBrwub9xb')`
+
 ## 0.13.1
 
 - fix empty playbackState returning 404

lib/src/spotify_api.dart

@@ -40,8 +40,10 @@ class SpotifyApi extends SpotifyApiBase {
 
   static oauth2.AuthorizationCodeGrant authorizationCodeGrant(
       SpotifyApiCredentials credentials,
-      {Function(SpotifyApiCredentials)? onCredentialsRefreshed}) {
-    return SpotifyApiBase.authorizationCodeGrant(
-        credentials, http.Client(), onCredentialsRefreshed);
+      {String? codeVerifier,
+      Function(SpotifyApiCredentials)? onCredentialsRefreshed}) {
+    return SpotifyApiBase.authorizationCodeGrant(credentials, http.Client(),
+        codeVerifier: codeVerifier,
+        onCredentialsRefreshed: onCredentialsRefreshed);
   }
 }

lib/src/spotify_base.dart

@@ -10,40 +10,57 @@ abstract class SpotifyApiBase {
       'https://accounts.spotify.com/authorize';
 
   bool _shouldWait = false;
-  late FutureOr<oauth2.Client> _client;
+
+  late FutureOr<oauth2.Client> _client;  
+  FutureOr<oauth2.Client> get client => _client;
+
   late Artists _artists;
   Artists get artists => _artists;
+
   late Albums _albums;
   Albums get albums => _albums;
+
   late Browse _browse;
   Browse get browse => _browse;
+
   late Tracks _tracks;
   Tracks get tracks => _tracks;
+
   late Playlists _playlists;
   Playlists get playlists => _playlists;
+
   late Episodes _episodes;
   Episodes get episodes => _episodes;
+
   late RecommendationsEndpoint _recommendations;
   RecommendationsEndpoint get recommendations => _recommendations;
+
   late Markets _markets;
   Markets get markets => _markets;
+
   late Users _users;
   Users get users => _users;
+
   late Search _search;
   Search get search => _search;
+
   late AudioFeatures _audioFeatures;
   AudioFeatures get audioFeatures => _audioFeatures;
+
   late AudioAnalysisEndpoint _audioAnalysis;
   AudioAnalysisEndpoint get audioAnalysis => _audioAnalysis;
+
   late Categories _categories;
   Categories get categories => _categories;
+
   late Me _me;
   Me get me => _me;
+
   late PlayerEndpoint _player;
   PlayerEndpoint get player => _player;
+
   late Shows _shows;
   Shows get shows => _shows;
-  FutureOr<oauth2.Client> get client => _client;
 
   SpotifyApiBase.fromClient(FutureOr<http.BaseClient> client) {
     _client = client as FutureOr<oauth2.Client>;
@@ -94,22 +111,24 @@ abstract class SpotifyApiBase {
 
   static oauth2.AuthorizationCodeGrant authorizationCodeGrant(
       SpotifyApiCredentials credentials, http.Client httpClient,
-      [Function(SpotifyApiCredentials)? callBack]) {
+      {String? codeVerifier,
+      Function(SpotifyApiCredentials)? onCredentialsRefreshed}) {
     return oauth2.AuthorizationCodeGrant(
         credentials.clientId!,
         Uri.parse(SpotifyApiBase._authorizationUrl),
         Uri.parse(SpotifyApiBase._tokenUrl),
         secret: credentials.clientSecret,
+        codeVerifier: codeVerifier,
         httpClient: httpClient,
-        onCredentialsRefreshed: callBack != null
+        onCredentialsRefreshed: onCredentialsRefreshed != null
             ? (oauth2.Credentials cred) {
                 final newCredentials = SpotifyApiCredentials(
                     credentials.clientId, credentials.clientSecret,
                     accessToken: cred.accessToken,
                     expiration: cred.expiration,
                     refreshToken: cred.refreshToken,
                     scopes: cred.scopes);
-                callBack(newCredentials);
+                onCredentialsRefreshed(newCredentials);
               }
             : null);
   }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: spotify
 description: An incomplete dart library for interfacing with the Spotify Web API.
-version: 0.13.1
+version: 0.13.2
 homepage: https://github.com/rinukkusu/spotify-dart
 
 environment:

test/spotify_test.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
 import 'spotify_mock.dart';
 import 'package:test/test.dart';
 import 'package:spotify/spotify.dart';