Add test for audio analysis and move around auth URL method

Author: thelinmichael

__tests__/spotify-web-api.js

@@ -3601,6 +3601,37 @@ describe('Spotify Web API', () => {
     );
   });
 
+  test('should get the audio analysis for a track', done => {
+    sinon.stub(HttpManager, '_makeRequest').callsFake(function(
+      method,
+      options,
+      uri,
+      callback
+    ) {
+      expect(method).toBe(superagent.get);
+      expect(uri).toBe(
+        'https://api.spotify.com/v1/audio-analysis/3Qm86XLflmIXVm1wcwkgDK'
+      );
+      expect(options.query).toBeFalsy();
+      expect(options.data).toBeFalsy();
+      callback(null, {
+        body: {
+        }
+      });
+    });
+
+    var api = new SpotifyWebApi();
+
+    api.getAudioAnalysisForTrack('3Qm86XLflmIXVm1wcwkgDK').then(
+      function(data) {
+        done();
+      },
+      function(err) {
+        done(err);
+      }
+    );
+  });
+
   test('should get the audio features for a track', done => {
     sinon.stub(HttpManager, '_makeRequest').callsFake(function(
       method,
@@ -4080,6 +4111,44 @@ describe('Spotify Web API', () => {
       'https://accounts.spotify.com/authorize?client_id=5fe01282e44241328a84e7c5cc169165&response_type=code&redirect_uri=https://example.com/callback&scope=user-read-private%20user-read-email&state=some-state-of-my-choice'
     );
   });
+
+  test('should create authorization URL with code based authentication', () => {
+    var scopes = ['user-read-private', 'user-read-email'],
+      redirectUri = 'https://example.com/callback',
+      clientId = '5fe01282e44241328a84e7c5cc169165',
+      state = 'some-state-of-my-choice',
+      showDialog = true;
+
+    var api = new SpotifyWebApi({
+      clientId: clientId,
+      redirectUri: redirectUri
+    });
+
+    var authorizeURL = api.createAuthorizeURL(scopes, state, showDialog);
+    expect(authorizeURL).toBe(
+      'https://accounts.spotify.com/authorize?client_id=5fe01282e44241328a84e7c5cc169165&response_type=code&redirect_uri=https://example.com/callback&scope=user-read-private%20user-read-email&state=some-state-of-my-choice&show_dialog=true'
+    );
+  });
+  
+  test('should create authorization URL with token based authentication', () => {
+    var scopes = ['user-read-private', 'user-read-email'],
+      redirectUri = 'https://example.com/callback',
+      clientId = '5fe01282e44241328a84e7c5cc169165',
+      state = 'some-state-of-my-choice',
+      showDialog = true,
+      responseType = 'token'
+
+    var api = new SpotifyWebApi({
+      clientId: clientId,
+      redirectUri: redirectUri
+    });
+
+    var authorizeURL = api.createAuthorizeURL(scopes, state, showDialog, responseType);
+
+    expect(authorizeURL).toBe(
+      'https://accounts.spotify.com/authorize?client_id=5fe01282e44241328a84e7c5cc169165&response_type=token&redirect_uri=https://example.com/callback&scope=user-read-private%20user-read-email&state=some-state-of-my-choice&show_dialog=true'
+    );
+  });
 
   /* Client credentials */
   test('should retrieve an access token using the client credentials flow', function(done) {
@@ -4238,44 +4307,6 @@ describe('Spotify Web API', () => {
     });
   });
 
-  test('should create authorization URL with code based authentication', () => {
-    var scopes = ['user-read-private', 'user-read-email'],
-      redirectUri = 'https://example.com/callback',
-      clientId = '5fe01282e44241328a84e7c5cc169165',
-      state = 'some-state-of-my-choice',
-      showDialog = true;
-
-    var api = new SpotifyWebApi({
-      clientId: clientId,
-      redirectUri: redirectUri
-    });
-
-    var authorizeURL = api.createAuthorizeURL(scopes, state, showDialog);
-    expect(authorizeURL).toBe(
-      'https://accounts.spotify.com/authorize?client_id=5fe01282e44241328a84e7c5cc169165&response_type=code&redirect_uri=https://example.com/callback&scope=user-read-private%20user-read-email&state=some-state-of-my-choice&show_dialog=true'
-    );
-  });
-
-  test('should create authorization URL with token based authentication', () => {
-    var scopes = ['user-read-private', 'user-read-email'],
-      redirectUri = 'https://example.com/callback',
-      clientId = '5fe01282e44241328a84e7c5cc169165',
-      state = 'some-state-of-my-choice',
-      showDialog = true,
-      responseType = 'token'
-
-    var api = new SpotifyWebApi({
-      clientId: clientId,
-      redirectUri: redirectUri
-    });
-
-    var authorizeURL = api.createAuthorizeURL(scopes, state, showDialog, responseType);
-
-    expect(authorizeURL).toBe(
-      'https://accounts.spotify.com/authorize?client_id=5fe01282e44241328a84e7c5cc169165&response_type=token&redirect_uri=https://example.com/callback&scope=user-read-private%20user-read-email&state=some-state-of-my-choice&show_dialog=true'
-    );
-  });
-
   test('should set, get and reset credentials', function(done) {
     var api = new SpotifyWebApi();
 

src/server-methods.js

@@ -4,6 +4,30 @@ var AuthenticationRequest = require('./authentication-request');
 var HttpManager = require('./http-manager');
 
 module.exports = {
+
+  /**
+   * Retrieve a URL where the user can give the application permissions.
+   * @param {string[]} scopes The scopes corresponding to the permissions the application needs.
+   * @param {string} state A parameter that you can use to maintain a value between the request and the callback to redirect_uri.It is useful to prevent CSRF exploits.
+   * @param {boolean} showDialog A parameter that you can use to force the user to approve the app on each login rather than being automatically redirected.
+   * @param {string} responseType An optional parameter that you can use to specify the code response based on the authentication type - can be set to 'code' or 'token'. Default 'code' to ensure backwards compatability.
+   * @returns {string} The URL where the user can give application permissions.
+   */
+  createAuthorizeURL: function(scopes, state, showDialog, responseType = 'code') {
+    return AuthenticationRequest.builder()
+      .withPath('/authorize')
+      .withQueryParameters({
+        client_id: this.getClientId(),
+        response_type: responseType,
+        redirect_uri: this.getRedirectURI(),
+        scope: scopes.join('%20'),
+        state: state,
+        show_dialog: showDialog && !!showDialog
+      })
+      .build()
+      .getURL();
+  },
+
   /**
    * Request an access token using the Client Credentials flow.
    * Requires that client ID and client secret has been set previous to the call.

src/spotify-web-api.js

@@ -773,29 +773,6 @@ SpotifyWebApi.prototype = {
       .execute(HttpManager.get, callback);
   },
 
-  /**
-   * Retrieve a URL where the user can give the application permissions.
-   * @param {string[]} scopes The scopes corresponding to the permissions the application needs.
-   * @param {string} state A parameter that you can use to maintain a value between the request and the callback to redirect_uri.It is useful to prevent CSRF exploits.
-   * @param {boolean} showDialog A parameter that you can use to force the user to approve the app on each login rather than being automatically redirected.
-   * @param {string} responseType An optional parameter that you can use to specify the code response based on the authentication type - can be set to 'code' or 'token'. Default 'code' to ensure backwards compatability.
-   * @returns {string} The URL where the user can give application permissions.
-   */
-  createAuthorizeURL: function(scopes, state, showDialog, responseType = 'code') {
-    return AuthenticationRequest.builder()
-      .withPath('/authorize')
-      .withQueryParameters({
-        client_id: this.getClientId(),
-        response_type: responseType,
-        redirect_uri: this.getRedirectURI(),
-        scope: scopes.join('%20'),
-        state: state,
-        show_dialog: showDialog && !!showDialog
-      })
-      .build()
-      .getURL();
-  },
-
   /**
    * Retrieve the tracks that are saved to the authenticated users Your Music library.
    * @param {Object} [options] Options, being market, limit, and/or offset.
@@ -1672,7 +1649,6 @@ SpotifyWebApi.prototype = {
   },
 };
 
-
 SpotifyWebApi._addMethods = function(methods) {
   for (var i in methods) {
     if (methods.hasOwnProperty(i)) {