Skip to content

add authentication to requests if required #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: multiplatform-client
Choose a base branch
from
Draft

add authentication to requests if required #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions modules/openapi-generator/src/main/resources/kotlin-multiplatform-client/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ public open class {{classname}} : ApiClientBase {
{{#authMethods}}
{{#-first}}

{{!TODO: Implement}}
//addAuthentication({{#authMethods}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}})
addAuthentication({{#authMethods}}"{{name}}"{{^-last}}, {{/-last}}{{/authMethods}})
{{/-first}}
{{/authMethods}}
{{#queryParams}}
Expand Down
34 changes: 17 additions & 17 deletions ...esources/kotlin-multiplatform-client/common/main/infrastructure/ApiClientBase.kt.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,42 +64,42 @@ public abstract class ApiClientBase {
}
{{#hasAuthMethods}}

protected fun HttpRequestBuilder.addAuthentication(apiKeyAuths: List<String>, basicAuths: List<String>, bearerAuths: List<String>, oAuths: List<String>) {
for (name in apiKeyAuths) {
val auth = apiKeyAuth[name] ?: throw IllegalStateException("ApiKeyAuth \"$name\" was configured, but not found")
Copy link
Owner

@cromefire cromefire Feb 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These had the pretty good reason to error on invalid schemas, so I'd like to keep them

if (auth.isConfigured) {
protected fun HttpRequestBuilder.addAuthentication(vararg auths: String) {
for (name in auths) {
val auth = apiKeyAuth[name]
if (auth?.isConfigured == true) {
auth.configure(this)
return
}
}
for (name in basicAuths) {
val auth = basicAuth[name] ?: throw IllegalStateException("HttpBasicAuth \"$name\" was configured, but not found")
Copy link
Owner

@cromefire cromefire Feb 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above

if (auth.isConfigured) {
for (name in auths) {
val auth = basicAuth[name]
if (auth?.isConfigured == true) {
auth.configure(this)
return
}
}
for (name in bearerAuths) {
val auth = bearerAuth[name] ?: throw IllegalStateException("HttpBearerAuth \"$name\" was configured, but not found")
Copy link
Owner

@cromefire cromefire Feb 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above

if (auth.isConfigured) {
for (name in auths) {
val auth = bearerAuth[name]
if (auth?.isConfigured == true) {
auth.configure(this)
return
}
}
for (name in oAuths) {
val auth = oAuth[name] ?: throw IllegalStateException("OAuth \"$name\" was configured, but not found")
Copy link
Owner

@cromefire cromefire Feb 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above

if (auth.isConfigured) {
for (name in auths) {
val auth = oAuth[name]
if (auth?.isConfigured == true) {
auth.configure(this)
return
}
}
throw IllegalStateException(
"""
No valid authentication configured, please configure one of the following:
API Key Authentication: ${apiKeyAuths.joinToString()}
HTTP Bearer Authentication: ${apiKeyAuths.joinToString()}
HTTP Basic Authentication: ${apiKeyAuths.joinToString()}
OAuth: ${apiKeyAuths.joinToString()}
API Key Authentication: ${apiKeyAuth.keys.joinToString()}
HTTP Bearer Authentication: ${bearerAuth.keys.joinToString()}
HTTP Basic Authentication: ${basicAuth.keys.joinToString()}
OAuth: ${oAuth.keys.joinToString()}
""".trimIndent()
)
}
Expand Down