LamGC/ScalaBot
1
0
Fork 0
mirror of https://github.com/LamGC/ScalaBot.git synced 2025-04-30 06:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(config): 简化凭证配置过程.

Browse Source 
由于先前的配置过程较为麻烦, 故将凭证配置简化为只有用户名和密码.
This commit is contained in:
LamGC 2022-05-19 23:53:25 +08:00
parent 24f34aa27f
commit 746221a085
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
1 changed files with 8 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
scalabot-app/src/main/kotlin/util/Serializers.kt
View File

@ -1,7 +1,6 @@
package net.lamgc.scalabot.util package net.lamgc.scalabot.util
import com.google.gson.* import com.google.gson.*
import mu.KotlinLogging
import net.lamgc.scalabot.MavenRepositoryConfig import net.lamgc.scalabot.MavenRepositoryConfig
import org.eclipse.aether.artifact.Artifact import org.eclipse.aether.artifact.Artifact
import org.eclipse.aether.artifact.DefaultArtifact import org.eclipse.aether.artifact.DefaultArtifact
@ -66,69 +65,18 @@ internal object ArtifactSerializer : JsonSerializer<Artifact>, JsonDeserializer<
internal object AuthenticationSerializer : JsonDeserializer<Authentication> { internal object AuthenticationSerializer : JsonDeserializer<Authentication> {
private val log = KotlinLogging.logger { } override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Authentication {
if (json !is JsonObject) {
override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Authentication? { throw JsonParseException("Unsupported JSON type.")
val builder = AuthenticationBuilder()
when (json) {
is JsonArray -> {
for (element in json) {
if (element is JsonArray) {
builder.addCustom(jsonArrayToAuthentication(element))
} else if (element is JsonObject) {
jsonToAuthentication(element, builder)
}
}
}
is JsonObject -> {
jsonToAuthentication(json, builder)
}
else -> {
throw JsonParseException("Unsupported JSON data type: ${json::class.java}")
}
} }
val username = SerializerUtils.checkJsonKey(json, "username")
val password = SerializerUtils.checkJsonKey(json, "password")
val builder = AuthenticationBuilder()
builder.addUsername(username)
builder.addPassword(password)
return builder.build() return builder.build()
} }
private fun jsonArrayToAuthentication(jsonArray: JsonArray): Authentication {
val builder = AuthenticationBuilder()
for (element in jsonArray) {
when (element) {
is JsonObject -> jsonToAuthentication(element, builder)
is JsonArray -> builder.addCustom(jsonArrayToAuthentication(element))
else -> log.warn { "不支持的 Json 类型: ${element::class.java}" }
}
}
return builder.build()
}
private const val KEY_TYPE = "type"
private fun jsonToAuthentication(json: JsonObject, builder: AuthenticationBuilder) {
if (!json.has(KEY_TYPE)) {
log.warn { "缺少 type 字段, 无法判断 Maven 认证信息类型." }
return
} else if (!json.get(KEY_TYPE).isJsonPrimitive) {
log.warn { "type 字段类型错误(应为 Primitive 类型), 无法判断 Maven 认证信息类型.(实际类型: `${json::class.java}`)" }
return
}
when (json.get(KEY_TYPE).asString.trim().lowercase()) {
"string" -> {
builder.addString(
SerializerUtils.checkJsonKey(json, "key"),
SerializerUtils.checkJsonKey(json, "value")
)
}
"secret" -> {
builder.addSecret(
SerializerUtils.checkJsonKey(json, "key"),
SerializerUtils.checkJsonKey(json, "value")
)
}
}
}
} }
private object SerializerUtils { private object SerializerUtils {