wulkanowy/sdk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix eduone student registration

Browse source
This commit is contained in:
Mikołaj Pich 2024-05-17 19:41:45 +02:00
parent 5127c75edf
commit 5558b73771
No known key found for this signature in database
2 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -18,7 +18,7 @@ ext {
moshi = "1.13.0"
}
version = "2.6.7"
version = "2.6.8-SNAPSHOT"
group = "io.github.wulkanowy"
nexusPublishing {

31
sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/repository/RegisterRepository.kt
View file

@ -184,9 +184,8 @@ internal class RegisterRepository(
val registerStudents = runCatching {
when {
isEduOne -> {
val (baseStudentPlus, homepage) = loginResult.getOrThrow()
val (_, homepage) = loginResult.getOrThrow()
getEduOneDiaries(
baseStudentPlus = baseStudentPlus.toString(),
homepage = homepage,
)
}
@ -347,9 +346,9 @@ internal class RegisterRepository(
return userCache?.isParent
}
private suspend fun getEduOneDiaries(baseStudentPlus: String, homepage: Document): List<RegisterStudent> {
private suspend fun getEduOneDiaries(homepage: Document): List<RegisterStudent> {
val moduleHeaders = getModuleHeadersFromDocument(homepage)
val baseStudentPlus = url.generate(UrlGenerator.Site.STUDENT_PLUS)
val contextUrl = (baseStudentPlus + "api/Context").toHttpUrl()
val contextVToken = contextUrl.getMatchedVToken(StudentPlusModuleHost, moduleHeaders)
val mappedContextUrl = contextUrl.mapModuleUrl(StudentPlusModuleHost, moduleHeaders.appVersion)
@ -378,28 +377,4 @@ internal class RegisterRepository(
contextStudent.mapToRegisterStudent(semesters)
}
}
private suspend fun loginModule(site: UrlGenerator.Site): Pair<String, String> {
loginHelper.loginModule(site)
val baseStudentPlus = url.generate(site)
val studentPageUrl = baseStudentPlus + "LoginEndpoint.aspx"
val start = student.getStart(studentPageUrl)
val homepage = if ("Working" in Jsoup.parse(start).title()) {
val cert = certificateAdapter.fromHtml(start)
student.sendModuleCertificate(
referer = url.createReferer(site),
url = cert.action,
certificate = mapOf(
"wa" to cert.wa,
"wresult" to cert.wresult,
"wctx" to cert.wctx,
),
)
} else {
start
}
return baseStudentPlus to homepage
}
}