Ensure base urls have trailing slashes.

Author: dshatz

e2e/tvdb/src/test/kotlin/TestTvDb.kt

@@ -1,14 +1,26 @@
 import io.ktor.client.engine.cio.CIO
 import kotlinx.coroutines.test.runTest
 import tvdb.client.Client
+import tvdb.client.Servers
+import tvdb.models.paths.login.post.requestBody.PostLoginRequest
+import tvdb.models.paths.login.post.response.PostLoginResponse401
 import kotlin.test.Test
+import kotlin.test.assertIs
+import kotlin.test.fail
 
 class TestTvDb {
 
 
     @Test
-    fun `create`() = runTest {
+    fun `try to make request`() = runTest {
         val client = Client(CIO)
-        client.getUser()
+        val response = client.postLogin(PostLoginRequest("weewewfweewf"))
+
+        try {
+            response.dataOrThrow()
+            fail("Request succeeded without apikey. Something is wrong.")
+        } catch (e: PostLoginResponse401) {
+
+        }
     }
 }

gradle-plugin/processor/src/main/kotlin/com/dshatz/openapi2ktor/generators/clients/KtorClientGenerator.kt

@@ -130,15 +130,7 @@ class KtorClientGenerator(override val typeStore: TypeStore, val packages: Packa
         }
         val enum = TypeSpec.enumBuilder(ClassName(packages.client, "Servers"))
             .primaryConstructor(FunSpec.constructorBuilder().addParameter("url", String::class).build())
-            .apply {
-                enumNames.forEach { (server, name) ->
-                    addEnumConstant(name,
-                        TypeSpec.anonymousClassBuilder()
-                            .addSuperclassConstructorParameter("%S", server.url)
-                            .build()
-                    )
-                }
-            }
+            .addServerEnumConstants(enumNames)
             .addProperty(PropertySpec.builder("url", String::class).initializer("url").build())
             .build()
         return FileSpec.builder(ClassName(packages.client, "Servers")).addType(enum).build()
@@ -152,7 +144,7 @@ class KtorClientGenerator(override val typeStore: TypeStore, val packages: Packa
         val params = listOf(
             ParameterSpec.builder("engine", HttpClientEngine::class).build(),
             ParameterSpec.builder("baseUrl", String::class.asTypeName())
-                .run { if (api.hasServers()) defaultValue("%S", api.servers.first().url) else this }
+                .run { if (api.hasServers()) defaultValue("%S", api.servers.first().url.ensureTrailingSlash()) else this }
                 .build(),
             ParameterSpec.builder("json", Json::class.asTypeName()).defaultValue("Json { ignoreUnknownKeys = true }").build(),
             ParameterSpec.builder("config", configLambdaType).defaultValue(CodeBlock.of("{}")).build()

gradle-plugin/processor/src/main/kotlin/com/dshatz/openapi2ktor/generators/clients/KtorHelpers.kt

@@ -3,11 +3,13 @@ package com.dshatz.openapi2ktor.generators.clients
 import com.dshatz.openapi2ktor.generators.TypeStore
 import com.dshatz.openapi2ktor.generators.clients.KtorHelpers.contentTypeClass
 import com.dshatz.openapi2ktor.generators.clients.KtorHelpers.contentTypeExtension
+import com.reprezen.kaizen.oasparser.model3.Server
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.MemberName
 import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.TypeSpec
 
 internal object KtorHelpers {
     val setBodyExtension = MemberName("io.ktor.client.request", "setBody", isExtension = true)
@@ -29,4 +31,19 @@ internal fun CodeBlock.Builder.setContentType(requestBodyInfo: TypeStore.Request
             it.mediaType
         ))
     }
+}
+
+
+internal fun String.ensureTrailingSlash(): String {
+    return if (this.endsWith("/")) this else "$this/"
+}
+
+internal fun TypeSpec.Builder.addServerEnumConstants(values: Map<Server, String>) = apply {
+    values.forEach { (server, name) ->
+        addEnumConstant(name,
+            TypeSpec.anonymousClassBuilder()
+                .addSuperclassConstructorParameter("%S", server.url.ensureTrailingSlash())
+                .build()
+        )
+    }
 }

gradle-plugin/processor/src/main/kotlin/com/dshatz/openapi2ktor/generators/clients/SecurityScheme.kt

@@ -58,7 +58,7 @@ sealed class Http(): SecurityScheme() {
         }
 
         override fun generateApplicator(name: String): CodeBlock {
-            return CodeBlock.of("%L?.bearer?.let { %M(it) }", generateAccessor(name), bearerMethod)
+            return CodeBlock.builder().addStatement("%L?.bearer?.let { %M(it) }", generateAccessor(name), bearerMethod).build()
         }
     }