mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-04-25 19:08:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded data wrapper

Browse Source
This commit is contained in:
NovaFox161
2023-01-30 15:02:11 -06:00
parent 4fbe4cc9af
commit e64e015574
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cam/src/main/kotlin/org/dreamexposure/discal/cam/google/GoogleAuth.kt
+2 -4
View File
@@ -15,7 +15,6 @@ import org.dreamexposure.discal.core.exceptions.EmptyNotAllowedException
import org.dreamexposure.discal.core.exceptions.NotFoundException
import org.dreamexposure.discal.core.logger.LOGGER
import org.dreamexposure.discal.core.`object`.calendar.CalendarData
import org.dreamexposure.discal.core.`object`.google.ClientData
import org.dreamexposure.discal.core.`object`.network.discal.CredentialData
import org.dreamexposure.discal.core.utils.GlobalVal.DEFAULT
import org.dreamexposure.discal.core.utils.GlobalVal.HTTP_CLIENT
@@ -28,7 +27,6 @@ import kotlin.system.exitProcess
@Suppress("BlockingMethodInNonBlockingContext")
object GoogleAuth {
private val clientData = ClientData(Config.SECRET_GOOGLE_CLIENT_ID.getString(), Config.SECRET_GOOGLE_CLIENT_SECRET.getString())
private val CREDENTIALS: Flux<DisCalGoogleCredential>
init {
@@ -83,8 +81,8 @@ object GoogleAuth {
private fun doAccessTokenRequest(refreshToken: String): Mono<CredentialData> {
return Mono.fromCallable {
val body = FormBody.Builder()
.addEncoded("client_id", clientData.clientId)
.addEncoded("client_secret", clientData.clientSecret)
.addEncoded("client_id", Config.SECRET_GOOGLE_CLIENT_ID.getString())
.addEncoded("client_secret", Config.SECRET_GOOGLE_CLIENT_SECRET.getString())
.addEncoded("refresh_token", refreshToken)
.addEncoded("grant_type", "refresh_token")
.build()
core/src/main/kotlin/org/dreamexposure/discal/core/object/google/ClientData.kt
-6
View File
@@ -1,6 +0,0 @@
package org.dreamexposure.discal.core.`object`.google
import kotlinx.serialization.Serializable
@Serializable
data class ClientData(val clientId: String, val clientSecret: String)
core/src/main/kotlin/org/dreamexposure/discal/core/wrapper/google/GoogleAuthWrapper.kt
+3 -6
View File
@@ -18,7 +18,6 @@ import org.dreamexposure.discal.core.exceptions.EmptyNotAllowedException
import org.dreamexposure.discal.core.exceptions.google.GoogleAuthCancelException
import org.dreamexposure.discal.core.logger.LOGGER
import org.dreamexposure.discal.core.`object`.calendar.CalendarData
import org.dreamexposure.discal.core.`object`.google.ClientData
import org.dreamexposure.discal.core.`object`.google.GoogleAuthPoll
import org.dreamexposure.discal.core.`object`.network.discal.CredentialData
import org.dreamexposure.discal.core.`object`.rest.RestError
@@ -34,8 +33,6 @@ import com.google.api.services.calendar.Calendar as GoogleCalendarService
@Suppress("BlockingMethodInNonBlockingContext")
object GoogleAuthWrapper {
private val clientData = ClientData(Config.SECRET_GOOGLE_CLIENT_ID.getString(), Config.SECRET_GOOGLE_CLIENT_SECRET.getString())
private val discalTokens: MutableMap<Int, CredentialData> = ConcurrentHashMap()
private val externalTokens: MutableMap<Snowflake, CredentialData> = ConcurrentHashMap()
@@ -173,7 +170,7 @@ object GoogleAuthWrapper {
fun requestDeviceCode(): Mono<Response> {
return Mono.fromCallable {
val body = FormBody.Builder()
.addEncoded("client_id", clientData.clientId)
.addEncoded("client_id", Config.SECRET_GOOGLE_CLIENT_ID.getString())
.addEncoded("scope", CalendarScopes.CALENDAR)
.build()
@@ -190,8 +187,8 @@ object GoogleAuthWrapper {
fun requestPollResponse(poll: GoogleAuthPoll): Mono<Response> {
return Mono.fromCallable {
val body = FormBody.Builder()
.addEncoded("client_id", clientData.clientId)
.addEncoded("client_secret", clientData.clientSecret)
.addEncoded("client_id", Config.SECRET_GOOGLE_CLIENT_ID.getString())
.addEncoded("client_secret", Config.SECRET_GOOGLE_CLIENT_SECRET.getString())
.addEncoded("code", poll.deviceCode)
.addEncoded("grant_type", "http://oauth.net/grant_type/device/1.0")
.build()