Merge pull request #162 from adamint/dev

adamint · web-flow · commit 976b402222e4 · 2019-11-17T22:05:52.000-05:00
switch to teamcity
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.gitignore b/.gitignore
@@ -125,4 +125,4 @@ gradle-app.setting
 **/build/
 
 # End of https://www.gitignore.io/api/gradle,kotlin,intellij
-/.idea/
+/.idea/
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -108,11 +108,6 @@ tasks.getByName<KotlinJsCompile>("compileKotlinJs") {
     }
 }
 tasks.named<Test>("jvmTest") {
-    systemProperty("clientId", System.getProperty("clientId"))
-    systemProperty("clientSecret", System.getProperty("clientSecret"))
-    systemProperty("spotifyRedirectUri", System.getProperty("spotifyRedirectUri"))
-    systemProperty("spotifyTokenString", System.getProperty("spotifyTokenString"))
-
     useJUnitPlatform()
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Nov 17 20:55:43 EST 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/commonMain/kotlin/com.adamratzman.spotify/Builder.kt b/src/commonMain/kotlin/com.adamratzman.spotify/Builder.kt
@@ -306,7 +306,7 @@ class SpotifyClientApiBuilder(
             } catch (e: CancellationException) {
                 throw e
             } catch (e: Exception) {
-                throw SpotifyException.AuthenticationException("Invalid credentials provided in the login process", e)
+                throw SpotifyException.AuthenticationException("Invalid credentials provided in the login process (clientId=$clientId, clientSecret=$clientSecret, authCode=${authorization.authorizationCode})", e)
             }
             authorization.token != null -> SpotifyClientApi(
                 clientId,
@@ -424,7 +424,7 @@ class SpotifyAppApiBuilder(
             } catch (e: CancellationException) {
                 throw e
             } catch (e: Exception) {
-                throw SpotifyException.AuthenticationException("Invalid credentials provided in the login process", e)
+                throw SpotifyException.AuthenticationException("Invalid credentials provided in the login process (clientId=$clientId, clientSecret=$clientSecret)", e)
             }
         }
     }
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/Common.kt b/src/commonTest/kotlin/com.adamratzman/spotify/Common.kt
@@ -2,23 +2,29 @@
 package com.adamratzman.spotify
 
 val api = when {
-    getEnvironmentVariable("spotifyRedirectUri")?.isNotBlank() != true -> {
+    getEnvironmentVariable("SPOTIFY_REDIRECT_URI")?.isNotBlank() != true -> {
+        println("CLIENT ID: ${getEnvironmentVariable("SPOTIFY_CLIENT_ID")}")
+        println("CLIENT SECRET: ${getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")}")
         spotifyAppApi {
             credentials {
-                clientId = getEnvironmentVariable("clientId")
-                clientSecret = getEnvironmentVariable("clientSecret")
+                clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")
+                clientSecret = getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")
             }
         }.build()
     }
     else -> {
+        println("CLIENT ID: ${getEnvironmentVariable("SPOTIFY_CLIENT_ID")}")
+        println("CLIENT SECRET: ${getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")}")
+        println("REDIRECT URI: ${getEnvironmentVariable("SPOTIFY_REDIRECT_URI")}")
+        println("TOKEN: ${getEnvironmentVariable("SPOTIFY_TOKEN_STRING")}")
         spotifyClientApi {
             credentials {
-                clientId = getEnvironmentVariable("clientId")
-                clientSecret = getEnvironmentVariable("clientSecret")
-                redirectUri = getEnvironmentVariable("spotifyRedirectUri")
+                clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")
+                clientSecret = getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")
+                redirectUri = getEnvironmentVariable("SPOTIFY_REDIRECT_URI")
             }
             authorization {
-                tokenString = getEnvironmentVariable("spotifyTokenString")
+                tokenString = getEnvironmentVariable("SPOTIFY_TOKEN_STRING")
             }
         }.build()
     }
diff --git a/src/commonTest/kotlin/com.adamratzman/spotify/utilities/UtilityTests.kt b/src/commonTest/kotlin/com.adamratzman/spotify/utilities/UtilityTests.kt
@@ -22,7 +22,7 @@ class UtilityTests : Spek({
                 assertFailsWith<IllegalArgumentException> {
                     spotifyClientApi {
                         credentials {
-                            clientId = getEnvironmentVariable("clientId")
+                            clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")
                         }
                     }.build()
                 }
@@ -34,8 +34,8 @@ class UtilityTests : Spek({
                     assertFailsWith<IllegalArgumentException> {
                         spotifyClientApi {
                             credentials {
-                                clientId = getEnvironmentVariable("clientId")
-                                clientSecret = getEnvironmentVariable("clientSecret")
+                                clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")
+                                clientSecret = getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")
                             }
                         }.build()
                     }
@@ -45,8 +45,8 @@ class UtilityTests : Spek({
             it("App API valid parameters") {
                 val api = spotifyAppApi {
                     credentials {
-                        clientId = getEnvironmentVariable("clientId")
-                        clientSecret = getEnvironmentVariable("clientSecret")
+                        clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")
+                        clientSecret = getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")
                     }
                 }
                 api.build()
@@ -56,8 +56,8 @@ class UtilityTests : Spek({
             it("Refresh on invalid token") {
                 val api = spotifyAppApi {
                     credentials {
-                        clientId = getEnvironmentVariable("clientId")
-                        clientSecret = getEnvironmentVariable("clientSecret")
+                        clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")
+                        clientSecret = getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")
                     }
                 }.build()
             }
diff --git a/src/jvmTest/kotlin/com/adamratzman/spotify/CommonImpl.kt b/src/jvmTest/kotlin/com/adamratzman/spotify/CommonImpl.kt
@@ -2,5 +2,5 @@
 package com.adamratzman.spotify
 
 actual fun getEnvironmentVariable(name: String): String? {
-    return System.getProperty(name) ?: System.getenv(name)
+    return System.getenv(name) ?: System.getProperty(name)
 }

Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,6 @@ tasks.getByName<KotlinJsCompile>("compileKotlinJs") {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`tasks.named<Test>("jvmTest") {`
`111`		`- systemProperty("clientId", System.getProperty("clientId"))`
`112`		`- systemProperty("clientSecret", System.getProperty("clientSecret"))`
`113`		`- systemProperty("spotifyRedirectUri", System.getProperty("spotifyRedirectUri"))`
`114`		`- systemProperty("spotifyTokenString", System.getProperty("spotifyTokenString"))`
`115`		`-`
`116`	`111`	`useJUnitPlatform()`
`117`	`112`	`}`
`118`	`113`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ class SpotifyClientApiBuilder(`
`306`	`306`	`} catch (e: CancellationException) {`
`307`	`307`	`throw e`
`308`	`308`	`} catch (e: Exception) {`
`309`		`- throw SpotifyException.AuthenticationException("Invalid credentials provided in the login process", e)`
	`309`	`+ throw SpotifyException.AuthenticationException("Invalid credentials provided in the login process (clientId=$clientId, clientSecret=$clientSecret, authCode=${authorization.authorizationCode})", e)`
`310`	`310`	`}`
`311`	`311`	`authorization.token != null -> SpotifyClientApi(`
`312`	`312`	`clientId,`
`@@ -424,7 +424,7 @@ class SpotifyAppApiBuilder(`
`424`	`424`	`} catch (e: CancellationException) {`
`425`	`425`	`throw e`
`426`	`426`	`} catch (e: Exception) {`
`427`		`- throw SpotifyException.AuthenticationException("Invalid credentials provided in the login process", e)`
	`427`	`+ throw SpotifyException.AuthenticationException("Invalid credentials provided in the login process (clientId=$clientId, clientSecret=$clientSecret)", e)`
`428`	`428`	`}`
`429`	`429`	`}`
`430`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class UtilityTests : Spek({`
`22`	`22`	`assertFailsWith<IllegalArgumentException> {`
`23`	`23`	`spotifyClientApi {`
`24`	`24`	`credentials {`
`25`		`- clientId = getEnvironmentVariable("clientId")`
	`25`	`+ clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")`
`26`	`26`	`}`
`27`	`27`	`}.build()`
`28`	`28`	`}`
`@@ -34,8 +34,8 @@ class UtilityTests : Spek({`
`34`	`34`	`assertFailsWith<IllegalArgumentException> {`
`35`	`35`	`spotifyClientApi {`
`36`	`36`	`credentials {`
`37`		`- clientId = getEnvironmentVariable("clientId")`
`38`		`- clientSecret = getEnvironmentVariable("clientSecret")`
	`37`	`+ clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")`
	`38`	`+ clientSecret = getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")`
`39`	`39`	`}`
`40`	`40`	`}.build()`
`41`	`41`	`}`
`@@ -45,8 +45,8 @@ class UtilityTests : Spek({`
`45`	`45`	`it("App API valid parameters") {`
`46`	`46`	`val api = spotifyAppApi {`
`47`	`47`	`credentials {`
`48`		`- clientId = getEnvironmentVariable("clientId")`
`49`		`- clientSecret = getEnvironmentVariable("clientSecret")`
	`48`	`+ clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")`
	`49`	`+ clientSecret = getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`api.build()`
`@@ -56,8 +56,8 @@ class UtilityTests : Spek({`
`56`	`56`	`it("Refresh on invalid token") {`
`57`	`57`	`val api = spotifyAppApi {`
`58`	`58`	`credentials {`
`59`		`- clientId = getEnvironmentVariable("clientId")`
`60`		`- clientSecret = getEnvironmentVariable("clientSecret")`
	`59`	`+ clientId = getEnvironmentVariable("SPOTIFY_CLIENT_ID")`
	`60`	`+ clientSecret = getEnvironmentVariable("SPOTIFY_CLIENT_SECRET")`
`61`	`61`	`}`
`62`	`62`	`}.build()`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`package com.adamratzman.spotify`
`3`	`3`
`4`	`4`	`actual fun getEnvironmentVariable(name: String): String? {`
`5`		`- return System.getProperty(name) ?: System.getenv(name)`
	`5`	`+ return System.getenv(name) ?: System.getProperty(name)`
`6`	`6`	`}`