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

Fix getToken implementation

Browse source
This commit is contained in:
Mikołaj Pich 2024-03-23 15:06:28 +01:00
parent dab976890f
commit 545a90e2a0
No known key found for this signature in database
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/Scrapper.kt
View file

@ -480,7 +480,7 @@ class Scrapper {
suspend fun getToken(): TokenResponse { suspend fun getToken(): TokenResponse {
return when (isEduOne) { return when (isEduOne) {
true -> studentPlus.getToken() true -> studentPlus.getToken(studentId, diaryId, unitId)
else -> student.getToken() else -> student.getToken()
} }
} }

6
sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/repository/StudentPlusRepository.kt
View file

@ -184,8 +184,10 @@ internal class StudentPlusRepository(
return api.getRegisteredDevices(key) return api.getRegisteredDevices(key)
} }
suspend fun getToken(): TokenResponse { suspend fun getToken(studentId: Int, diaryId: Int, unitId: Int): TokenResponse {
val res = api.getDeviceRegistrationToken() val key = getEncodedKey(studentId, diaryId, unitId)
api.createDeviceRegistrationToken(mapOf("key" to key))
val res = api.getDeviceRegistrationToken(key)
return res.copy( return res.copy(
qrCodeImage = Jsoup.parse(res.qrCodeImage) qrCodeImage = Jsoup.parse(res.qrCodeImage)
.select("img") .select("img")

9
sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/service/StudentPlusService.kt
View file

@ -82,8 +82,15 @@ internal interface StudentPlusService {
@Query("key") key: String, @Query("key") key: String,
): List<Device> ): List<Device>
@POST("api/RejestracjaUrzadzeniaToken")
suspend fun createDeviceRegistrationToken(
@Body body: Map<String, String>,
)
@GET("api/RejestracjaUrzadzeniaToken") @GET("api/RejestracjaUrzadzeniaToken")
suspend fun getDeviceRegistrationToken(): TokenResponse suspend fun getDeviceRegistrationToken(
@Query("key") key: String,
): TokenResponse
@GET("api/Zebrania") @GET("api/Zebrania")
suspend fun getConferences( suspend fun getConferences(

6
sdk-scrapper/src/test/kotlin/io/github/wulkanowy/sdk/scrapper/school/SchoolPlusTest.kt
View file

@ -8,8 +8,10 @@ import org.junit.Test
class SchoolPlusTest : BaseLocalTest() { class SchoolPlusTest : BaseLocalTest() {
private val school by lazy { private val school by lazy {
runBlocking { getStudentPlusRepo(SchoolPlusTest::class.java, "SzkolaPlus.json") runBlocking {
.getSchool(1, 2, 3) } getStudentPlusRepo(SchoolPlusTest::class.java, "SzkolaPlus.json")
.getSchool(1, 2, 3)
}
} }
@Test @Test