add test for pkce auth

Author: adamint

build.gradle.kts

@@ -31,7 +31,7 @@ buildscript {
 }
 
 group = "com.adamratzman"
-version = "3.2.0"
+version = "3.2.01"
 
 /*java {
     withSourcesJar()
@@ -165,6 +165,7 @@ kotlin {
                     implementation("org.spekframework.spek2:spek-dsl-jvm:$spekVersion")
                     runtimeOnly("org.spekframework.spek2:spek-runner-junit5:$spekVersion")
                     runtimeOnly(kotlin("reflect"))
+                    implementation("com.sparkjava:spark-core:2.9.1")
                 }
             }
 

src/commonMain/kotlin/com.adamratzman.spotify/Builder.kt

@@ -352,7 +352,6 @@ fun spotifyClientApi(block: SpotifyClientApiBuilder.() -> Unit) = SpotifyClientA
                 ||     ||
  */
 
-
 /**
  * Instantiate a new [SpotifyClientApiBuilder] using an [authCode] and [codeVerifier]. This is for **PKCE authorization**.
  *
@@ -367,14 +366,12 @@ fun spotifyClientApi(block: SpotifyClientApiBuilder.() -> Unit) = SpotifyClientA
  */
 fun spotifyClientPkceApi(
         clientId: String?,
-        clientSecret: String?,
         redirectUri: String?,
         authCode: String,
         codeVerifier: String
 ) = SpotifyClientApiBuilder().apply {
     credentials {
         this.clientId = clientId
-        this.clientSecret = clientSecret
         this.redirectUri = redirectUri
     }
 
@@ -399,15 +396,13 @@ fun spotifyClientPkceApi(
  */
 fun spotifyClientPkceApi(
         clientId: String?,
-        clientSecret: String?,
         redirectUri: String?,
         authCode: String,
         codeVerifier: String,
         block: SpotifyClientApiBuilder.() -> Unit = {}
 ) = SpotifyClientApiBuilder().apply {
     credentials {
         this.clientId = clientId
-        this.clientSecret = clientSecret
         this.redirectUri = redirectUri
     }
 
@@ -723,7 +718,7 @@ class SpotifyClientApiBuilder(
         val redirectUri = credentials.redirectUri
 
         // either application credentials, or a token is required
-        require((clientId != null && clientSecret != null && redirectUri != null) || authorization.token != null || authorization.tokenString != null) { "You need to specify a valid clientId, clientSecret, and redirectUri in the credentials block!" }
+        require((clientId != null && clientSecret != null && redirectUri != null) || (clientId != null && redirectUri != null && authorization.pkceCodeVerifier != null) ||  authorization.token != null || authorization.tokenString != null) { "You need to specify a valid clientId, clientSecret, and redirectUri in the credentials block!" }
         return when {
             authorization.authorizationCode != null && authorization.pkceCodeVerifier == null -> try {
                 require(clientId != null && clientSecret != null && redirectUri != null) { "You need to specify a valid clientId, clientSecret, and redirectUri in the credentials block!" }

src/jvmTest/kotlin/com/adamratzman/spotify/PkceTest.kt

@@ -0,0 +1,51 @@
+package com.adamratzman.spotify
+
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+import spark.Spark.exception
+import spark.Spark.get
+import spark.Spark.port
+import kotlin.random.Random
+
+class PkceTest : Spek({
+    if (getEnvironmentVariable("VERBOSE_TEST_ENABLED")?.toBoolean() == true
+            && _clientId != null) {
+        val serverRedirectUri = "http://localhost:1337"
+        describe("verbose pkce test. print auth, wait for redirect. requires VERBOSE_TEST_ENABLED=true AND http://localhost:1337 as a redirect uri") {
+            val pkceCodeVerifier = (1..100).map { "1" }.joinToString("")
+            val state = Random.nextLong().toString()
+
+            println(
+                    getPkceAuthorizationUrl(
+                            *SpotifyScope.values(),
+                            clientId = _clientId,
+                            redirectUri = serverRedirectUri,
+                            codeChallenge = getSpotifyPkceCodeChallenge(pkceCodeVerifier),
+                            state = state
+                    ))
+            // spotifyClientApi(_clientId,)
+            var stop = false
+
+            port(1337)
+
+            exception(Exception::class.java) { exception, request, response -> exception.printStackTrace() }
+
+            get("/") { request, _ ->
+                val code = request.queryParams("code")
+                val actualState = request.queryParams("state")
+                if (code != null && actualState == state) {
+                    val api = spotifyClientPkceApi(_clientId, serverRedirectUri, code, pkceCodeVerifier).build()
+                    val username = api.users.getClientProfile().complete().displayName
+                    stop = true
+                    "Successfully authenticated $username with PKCE."
+                } else "err."
+            }
+
+            while (!stop) {
+                Thread.sleep(2000)
+                println("Waiting...")
+            }
+
+        }
+    }
+})