Always add client id to request

Closes #23

Author: Jan Berkel

src/main/java/com/soundcloud/api/ApiWrapper.java

@@ -469,16 +469,17 @@ public long resolve(String url) throws IOException {
         HttpResponse resp = get(Request.to(Endpoints.RESOLVE).with("url", url));
         if (resp.getStatusLine().getStatusCode() == HttpStatus.SC_MOVED_TEMPORARILY) {
             Header location = resp.getFirstHeader("Location");
-            if (location != null) {
-                String s = location.getValue();
-                if (s.contains("/")) {
+            if (location != null && location.getValue() != null) {
+                final String path = URI.create(location.getValue()).getPath();
+                if (path != null && path.contains("/")) {
                     try {
-                        return Integer.parseInt(s.substring(s.lastIndexOf("/") + 1, s.length()));
+                      final String id = path.substring(path.lastIndexOf("/") + 1);
+                      return Integer.parseInt(id);
                     } catch (NumberFormatException e) {
                         throw new ResolverException(e, resp);
                     }
                 } else {
-                    throw new ResolverException("Invalid string:"+s, resp);
+                    throw new ResolverException("Invalid string:"+path, resp);
                 }
             } else {
                 throw new ResolverException("No location header", resp);
@@ -613,8 +614,7 @@ protected HttpResponse execute(Request req, Class<? extends HttpRequestBase> req
     }
 
     protected Request addClientIdIfNecessary(Request req) {
-        return (mToken != EMPTY_TOKEN || req.getParams().containsKey(CLIENT_ID)) ?
-                req : new Request(req).add(CLIENT_ID, mClientId);
+        return req.getParams().containsKey(CLIENT_ID) ? req : new Request(req).add(CLIENT_ID, mClientId);
     }
 
     protected void logRequest( Class<? extends HttpRequestBase> reqType, Request request) {

src/test/java/com/soundcloud/api/ApiWrapperTest.java

@@ -531,9 +531,9 @@ public void testAddClientIdWithoutToken() throws Exception {
     }
 
     @Test
-    public void testDontAddClientIdWithToken() throws Exception {
+    public void testShouldAlwaysAddClientIdEvenWhenAuthenticated() throws Exception {
         api.setToken(new Token("access", "refresh"));
-        assertThat(api.addClientIdIfNecessary(Request.to("/foo")).toUrl(), equalTo("/foo"));
+        assertThat(api.addClientIdIfNecessary(Request.to("/foo")).toUrl(), equalTo("/foo?client_id=" + TEST_CLIENT_ID));
     }
 
     @Test

src/test/java/com/soundcloud/api/CloudAPIIntegrationTest.java

@@ -273,26 +273,6 @@ private void testResolveNonApiStreamUrls() throws IOException {
         assertThat(resolved.eTag, equalTo("\"5eeb63b73f99ff2de44a60441d421d2a\""));
     }
 
-    @Test @Ignore /* playcounts not deployed on sandbox */
-    public void shouldResolveStreamUrlAndSkipPlaycountLogging() throws Exception {
-        // need the playcount scope for this to work
-        assertTrue(login(Token.SCOPE_PLAYCOUNT).scoped(Token.SCOPE_PLAYCOUNT));
-
-        long trackId = api.resolve(TRACK_PERMALINK);
-
-        int count = Http.getJSON(api.get(Request.to("/tracks/"+trackId))).getInt("playback_count");
-        api.resolveStreamUrl("https://api.soundcloud.com/tracks/"+trackId+"/stream", false);
-        int count2 = Http.getJSON(api.get(Request.to("/tracks/"+trackId))).getInt("playback_count");
-
-        assertTrue(String.format("%d !> %d", count2, count), count2 > count);
-
-        // resolve again, this time skipping count
-        api.resolveStreamUrl("https://api.soundcloud.com/tracks/"+trackId+"/stream", true);
-
-        int count3 = Http.getJSON(api.get(Request.to("/tracks/"+trackId))).getInt("playback_count");
-        assertTrue(String.format("%d != %d", count3, count2), count3 == count2);
-    }
-
     @Test
     public void shouldThrowResolverExceptionWhenStreamCannotBeResolved() throws Exception {
         login();
@@ -463,16 +443,6 @@ public void run() {
         System.err.println("all threads finished");
     }
 
-    @Test @Ignore
-    public void updateMyDetails() throws Exception {
-        Request updateMe = Request.to(MY_DETAILS).with(
-                Params.User.WEBSITE, "http://mywebsite.com")
-                .withFile(Params.User.AVATAR, new File(getClass().getResource("cat.jpg").getFile()));
-
-        HttpResponse resp = api.put(updateMe);
-        assertThat(resp.getStatusLine().getStatusCode(), is(200));
-    }
-
     @SuppressWarnings({"UnusedDeclaration"})
     private void writeResponse(HttpResponse resp, String file) throws IOException {
         FileOutputStream fos = new FileOutputStream(file);