aezequiel
commented
3 years ago Hello, good afternoon. I downloaded the application, and the same thing happened to me. I found out that etoro added a new header from an x-csrf-token call, which is currently not being sent. modify these 3 files and now it works correctly.
Another thing I had to change is the version of the chrome driver, for a more current one
Maybe I can help you. Greetings
RequestUtils.kt package ok.work.etoroapi.client
import ok.work.etoroapi.client.browser.EtoroMetadata import ok.work.etoroapi.model.TradingMode import okhttp3.Request import java.net.URI import java.net.http.HttpRequest import kotlin.math.round import java.time.LocalDateTime import java.time.format.DateTimeFormatter
fun prepareRequest(path: String, auth: String, mode: TradingMode, credentials: EtoroMetadata): HttpRequest.Builder {
val now = LocalDateTime.now()
val formatter = DateTimeFormatter.ISO_DATE_TIME
val formatted = now.format(formatter)
val dt = formatted.split(".")[0]
println("prepareRequest Current Date and Time: $dt")
return HttpRequest.newBuilder().uri(URI("${credentials.baseUrl}/${path}"))
.header("authority", credentials.domain)
.header("accounttype", mode.name)
.header("x-sts-appdomain", credentials.baseUrl)
.header("content-type", "application/json;charset=UTF-8")
.header("accept", "application/json, text/plain, */*")
.header("x-sts-gatewayappid", "90631448-9A01-4860-9FA5-B4EBCDE5EA1D")
.header("applicationidentifier", "ReToro")
.header("applicationversion", "326.0.3")
.header("origin", credentials.baseUrl)
.header("sec-fetch-site", "same-origin")
.header("sec-fetch-mode", "cors")
.header("user-agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36")
.header("authorization", auth)
.header("referer", "${credentials.baseUrl}/login")
.header("cookie", credentials.cookies)
.header("sec-fetch-dest", "empty")
.header("x-csrf-token", "$credentials.cToken")
.header("x-sts-clienttime", "$dt")}
fun prepareOkRequest(path: String, auth: String, mode: TradingMode, credentials: EtoroMetadata): Request.Builder {
val now = LocalDateTime.now()
val formatter = DateTimeFormatter.ISO_DATE_TIME
val formatted = now.format(formatter)
val dt = formatted.split(".")[0]
println("prepareRequest Current Date and Time: $dt")
return Request.Builder().url("${credentials.baseUrl}/${path}")
.header("authority", credentials.domain)
.header("accounttype", mode.name)
.header("x-sts-appdomain", credentials.baseUrl)
.header("content-type", "application/json;charset=UTF-8")
.header("accept", "application/json, text/plain, */*")
.header("x-sts-gatewayappid", "90631448-9A01-4860-9FA5-B4EBCDE5EA1D")
.header("applicationidentifier", "ReToro")
.header("applicationversion", "326.0.3")
.header("origin", credentials.baseUrl)
.header("user-agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36")
.header("sec-fetch-site", "same-origin")
.header("sec-fetch-mode", "cors")
.header("authorization", auth)
.header("referer", "${credentials.baseUrl}/login")
.header("cookie", credentials.cookies)
.header("sec-fetch-dest", "empty")
.header("x-csrf-token", "$credentials.cToken")
.header("x-sts-clienttime", "$dt")}
fun Double.round(decimals: Int): Double { var multiplier = 1.0 repeat(decimals) { multiplier = 10 } return round(this multiplier) / multiplier }
EtoroBrowserContext.kt package ok.work.etoroapi.client.browser
import org.openqa.selenium.chrome.ChromeDriver import org.openqa.selenium.chrome.ChromeOptions import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component import java.lang.RuntimeException import java.util.* import javax.annotation.PostConstruct
data class EtoroMetadata(val cookies: String, val token: String, val cToken: String, val lsPassword: String, val baseUrl: String, val domain: String)
@Component class EtoroMetadataService(@Value("\${etoro.baseUrl}") val baseUrl: String, @Value("\${etoro.domain}") val domain: String) {
private lateinit var cookies: String
private lateinit var token: String
private lateinit var cToken: String
private lateinit var expirationTime: Date
private lateinit var driver: ChromeDriver
private lateinit var opts: ChromeOptions
@PostConstruct
fun init() {
val pathToDriver: String = when {
System.getProperty("os.name").startsWith("Mac") -> {
"drivers/mac/chromedriver"
}
System.getProperty("os.name").toLowerCase().contains("windows") -> {
"drivers/windows/chromedriver.exe"
}
else -> {
"drivers/ubuntu/chromedriver"
}
}
opts = ChromeOptions()
System.setProperty("webdriver.chrome.driver", pathToDriver)
opts.addArguments("start-maximized")
opts.addArguments("--disable-blink-features=AutomationControlled")
login()
}
fun login() {
driver = ChromeDriver(opts)
driver.get("$baseUrl/login")
val email = System.getenv("LOGIN")
val password = System.getenv("PASSWORD")
if (email == null || password == null) {
throw RuntimeException("LOGIN and/or PASSWORD environment variables are missing")
}
driver.findElementById("username").sendKeys(email)
driver.findElementById("password").sendKeys(password)
driver.findElementByClassName("blue-btn").click()
var seconds = 0
while (true) {
try {
token = driver.executeScript("return JSON.parse(atob(window.localStorage.loginData)).stsData_app_1.accessToken;") as String
println("Token retrieved after %d seconds".format(seconds))
break
} catch (e: Exception) {
if (seconds > 5) {
throw RuntimeException("Failed to retrieve token")
}
Thread.sleep(1000)
seconds++
}
cToken = driver.executeScript("return window.localStorage.cToken") as String
}
expirationTime = Date(driver.executeScript("return JSON.parse(atob(window.localStorage.loginData)).stsData_app_1.expirationUnixTimeMs;") as Long)
println(token)
println("expires at: $expirationTime")
val cookiesSet = driver.manage().cookies
cookies = cookiesSet.toList().joinToString("; ") { cookie -> "${cookie.name}=${cookie.value}" }
println("cookies: $cookies")
println("cToken: $cToken")
driver.quit()
}
fun getMetadata(): EtoroMetadata {
if (Date().after(expirationTime)) {
login()
}
return EtoroMetadata(
cookies,
token,
cToken,
"""{"UserAgent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36","ApplicationVersion":"213.0.2","ApplicationName":"ReToro","AccountType":"Demo","ApplicationIdentifier":"ReToro"}""",
baseUrl,
domain
)
}}
ok24601
claudio0603
WelschChristopher
andreiciceu
mzeeshanilyas
WarlaxZ
AndreJackBia
when trying to start the API today i was greeted by this line.. I tried updating the project files from 1.1.3 to 1.1.4, but allas this did not fix my problem. might anyone know how to fix this?
full output in attatched file, but this is the 'caused by' list
error log.docx
Caused by: org.json.JSONException: A JSONObject text must begin with '{' at 1 [character 2 line 1] at org.json.JSONTokener.syntaxError(JSONTokener.java:505) ~[json-20180813.jar!/:na] at org.json.JSONObject.(JSONObject.java:215) ~[json-20180813.jar!/:na]
at org.json.JSONObject.(JSONObject.java:399) ~[json-20180813.jar!/:na]
at ok.work.etoroapi.client.UserContext.getAccountData(UserContext.kt:45) ~[classes!/:na]
at ok.work.etoroapi.client.UserContext.setupAuthorizationContext(UserContext.kt:36) ~[classes!/:na]
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:na]
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:na]
at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:na]
at java.base/java.lang.reflect.Method.invoke(Method.java:566) ~[na:na]
at org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor$LifecycleElement.invoke(InitDestroyAnnotationBeanPostProcessor.java:389) ~[spring-beans-5.2.3.RELEASE.jar!/:5.2.3.RELEASE]
at org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor$LifecycleMetadata.invokeInitMethods(InitDestroyAnnotationBeanPostProcessor.java:333) ~[spring-beans-5.2.3.RELEASE.jar!/:5.2.3.RELEASE]
at org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor.postProcessBeforeInitialization(InitDestroyAnnotationBeanPostProcessor.java:157) ~[spring-beans-5.2.3.RELEASE.jar!/:5.2.3.RELEASE]
... 39 common frames omitted