From 4e37215b5a39e0d692f7c62e4e2d337bdd548411 Mon Sep 17 00:00:00 2001 From: NovaFox161 Date: Wed, 20 Mar 2024 19:55:33 -0500 Subject: [PATCH] CAM is now free of using any deprecated methods --- .../discal/cam/discord/DiscordOauthHandler.kt | 9 +++++---- .../org/dreamexposure/discal/cam/google/GoogleAuth.kt | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cam/src/main/kotlin/org/dreamexposure/discal/cam/discord/DiscordOauthHandler.kt b/cam/src/main/kotlin/org/dreamexposure/discal/cam/discord/DiscordOauthHandler.kt index dad3ec25e..16a660c4c 100644 --- a/cam/src/main/kotlin/org/dreamexposure/discal/cam/discord/DiscordOauthHandler.kt +++ b/cam/src/main/kotlin/org/dreamexposure/discal/cam/discord/DiscordOauthHandler.kt @@ -4,13 +4,13 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import kotlinx.coroutines.reactor.awaitSingle import okhttp3.FormBody +import okhttp3.OkHttpClient import okhttp3.Request import org.dreamexposure.discal.cam.json.discord.AccessTokenResponse import org.dreamexposure.discal.cam.json.discord.AuthorizationInfo import org.dreamexposure.discal.core.config.Config import org.dreamexposure.discal.core.exceptions.AuthenticationException import org.dreamexposure.discal.core.utils.GlobalVal -import org.dreamexposure.discal.core.utils.GlobalVal.HTTP_CLIENT import org.springframework.stereotype.Component import reactor.core.publisher.Mono import reactor.core.scheduler.Schedulers @@ -18,6 +18,7 @@ import reactor.core.scheduler.Schedulers @Component class DiscordOauthHandler( private val objectMapper: ObjectMapper, + private val httpClient: OkHttpClient, ) { private val cdnUrl = "https://cdn.discordapp.com" private val redirectUrl = Config.URL_DISCORD_REDIRECT.getString() @@ -38,7 +39,7 @@ class DiscordOauthHandler( .header("Content-Type", "application/x-www-form-urlencoded") .build() - val response = Mono.fromCallable(HTTP_CLIENT.newCall(tokenExchangeRequest)::execute) + val response = Mono.fromCallable(httpClient.newCall(tokenExchangeRequest)::execute) .subscribeOn(Schedulers.boundedElastic()) .awaitSingle() @@ -66,7 +67,7 @@ class DiscordOauthHandler( .header("Content-Type", "application/x-www-form-urlencoded") .build() - val response = Mono.fromCallable(HTTP_CLIENT.newCall(tokenExchangeRequest)::execute) + val response = Mono.fromCallable(httpClient.newCall(tokenExchangeRequest)::execute) .subscribeOn(Schedulers.boundedElastic()) .awaitSingle() @@ -88,7 +89,7 @@ class DiscordOauthHandler( .header("Authorization", "Bearer $accessToken") .build() - val response = Mono.fromCallable(HTTP_CLIENT.newCall(request)::execute) + val response = Mono.fromCallable(httpClient.newCall(request)::execute) .subscribeOn(Schedulers.boundedElastic()) .awaitSingle() diff --git a/cam/src/main/kotlin/org/dreamexposure/discal/cam/google/GoogleAuth.kt b/cam/src/main/kotlin/org/dreamexposure/discal/cam/google/GoogleAuth.kt index 1674aa205..8e1d0f190 100644 --- a/cam/src/main/kotlin/org/dreamexposure/discal/cam/google/GoogleAuth.kt +++ b/cam/src/main/kotlin/org/dreamexposure/discal/cam/google/GoogleAuth.kt @@ -6,6 +6,7 @@ import com.google.api.client.http.HttpStatusCodes.STATUS_CODE_BAD_REQUEST import com.google.api.client.http.HttpStatusCodes.STATUS_CODE_OK import kotlinx.coroutines.reactor.awaitSingle import okhttp3.FormBody +import okhttp3.OkHttpClient import okhttp3.Request import org.dreamexposure.discal.cam.json.google.ErrorData import org.dreamexposure.discal.cam.json.google.RefreshData @@ -20,7 +21,6 @@ import org.dreamexposure.discal.core.logger.LOGGER import org.dreamexposure.discal.core.`object`.network.discal.CredentialData import org.dreamexposure.discal.core.`object`.new.Calendar import org.dreamexposure.discal.core.utils.GlobalVal.DEFAULT -import org.dreamexposure.discal.core.utils.GlobalVal.HTTP_CLIENT import org.springframework.stereotype.Component import reactor.core.publisher.Mono import reactor.core.scheduler.Schedulers @@ -32,6 +32,7 @@ class GoogleAuth( private val credentialService: CredentialService, private val calendarService: CalendarService, private val objectMapper: ObjectMapper, + private val httpClient: OkHttpClient, ) { suspend fun requestNewAccessToken(calendar: Calendar): CredentialData? { @@ -79,7 +80,7 @@ class GoogleAuth( .build() - val response = Mono.fromCallable(HTTP_CLIENT.newCall(request)::execute) + val response = Mono.fromCallable(httpClient.newCall(request)::execute) .subscribeOn(Schedulers.boundedElastic()) .awaitSingle()