From 708a0eec31b8ec523d218d17392a5d9483b022e6 Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Mon, 2 Sep 2024 15:58:18 -0300 Subject: [PATCH] chore: add default baseURL (#24) PR: https://github.com/Topsort/topsort.kt/pull/24 --- .../java/com/topsort/analytics/core/ServiceSettings.kt | 7 +------ .../analytics/service/TopsortAuctionsHttpService.kt | 6 ++---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/TopsortAnalytics/src/main/java/com/topsort/analytics/core/ServiceSettings.kt b/TopsortAnalytics/src/main/java/com/topsort/analytics/core/ServiceSettings.kt index e5dfc33..fb15e2f 100644 --- a/TopsortAnalytics/src/main/java/com/topsort/analytics/core/ServiceSettings.kt +++ b/TopsortAnalytics/src/main/java/com/topsort/analytics/core/ServiceSettings.kt @@ -1,10 +1,5 @@ package com.topsort.analytics.core object ServiceSettings { - lateinit var baseApiUrl: String - lateinit var bearerToken: String - - fun isSetup() : Boolean{ - return this::baseApiUrl.isInitialized - } + var baseApiUrl: String = "https://api.topsort.com" } diff --git a/TopsortAnalytics/src/main/java/com/topsort/analytics/service/TopsortAuctionsHttpService.kt b/TopsortAnalytics/src/main/java/com/topsort/analytics/service/TopsortAuctionsHttpService.kt index 83d7c7a..ea81b45 100644 --- a/TopsortAnalytics/src/main/java/com/topsort/analytics/service/TopsortAuctionsHttpService.kt +++ b/TopsortAnalytics/src/main/java/com/topsort/analytics/service/TopsortAuctionsHttpService.kt @@ -1,10 +1,9 @@ package com.topsort.analytics.service +import com.topsort.analytics.Cache import com.topsort.analytics.core.HttpClient import com.topsort.analytics.core.HttpResponse -import com.topsort.analytics.core.ServiceSettings import com.topsort.analytics.core.ServiceSettings.baseApiUrl -import com.topsort.analytics.core.ServiceSettings.bearerToken import com.topsort.analytics.model.auctions.AuctionRequest import com.topsort.analytics.model.auctions.AuctionResponse @@ -24,10 +23,9 @@ internal object TopsortAuctionsHttpService { private fun executeRunAuctions(auctionRequest: AuctionRequest): HttpResponse { if(!this::httpClient.isInitialized){ - assert(ServiceSettings.isSetup()) httpClient = HttpClient("${baseApiUrl}${AUCTION_ENDPOINT}") } val json = auctionRequest.toJsonObject().toString() - return httpClient.post(json, bearerToken) + return httpClient.post(json, Cache.token.ifEmpty { null }) } }