sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[Vulcan/Web] Fix checking login expiry time.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2021-02-23 12:48:17 +01:00
parent 9da6dbccb3
commit b75ab76c2a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt
View File

@ -17,7 +17,7 @@ import pl.szczodrzynski.edziennik.utils.Utils
class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) { class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) {
fun isWebMainLoginValid() = symbol.isNotNullNorEmpty() fun isWebMainLoginValid() = symbol.isNotNullNorEmpty()
&& (webExpiryTime[symbol] ?: 0) - 30 > currentTimeUnix() && (webExpiryTime[symbol]?.toLongOrNull() ?: 0) - 30 > currentTimeUnix()
&& webAuthCookie[symbol].isNotNullNorEmpty() && webAuthCookie[symbol].isNotNullNorEmpty()
&& webHost.isNotNullNorEmpty() && webHost.isNotNullNorEmpty()
&& webType.isNotNullNorEmpty() && webType.isNotNullNorEmpty()
@ -358,10 +358,10 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app
* If the time passes, the certificate needs to be POSTed again (if valid) * If the time passes, the certificate needs to be POSTed again (if valid)
* or re-generated. * or re-generated.
*/ */
var webExpiryTime: Map<String, Long?> = mapOf() var webExpiryTime: Map<String, String?> = mapOf()
get() { mWebExpiryTime = mWebExpiryTime ?: loginStore.getLoginData("webExpiryTime", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebExpiryTime ?: mapOf() } get() { mWebExpiryTime = mWebExpiryTime ?: loginStore.getLoginData("webExpiryTime", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebExpiryTime ?: mapOf() }
set(value) { loginStore.putLoginData("webExpiryTime", app.gson.toJson(value)); mWebExpiryTime = value } set(value) { loginStore.putLoginData("webExpiryTime", app.gson.toJson(value)); mWebExpiryTime = value }
private var mWebExpiryTime: Map<String, Long?>? = null private var mWebExpiryTime: Map<String, String?>? = null
/** /**
* EfebSsoAuthCookie retrieved after posting a certificate * EfebSsoAuthCookie retrieved after posting a certificate

2
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt
View File

@ -86,7 +86,7 @@ open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) {
return return
} }
data.webExpiryTime = data.webExpiryTime.toMutableMap().also { map -> data.webExpiryTime = data.webExpiryTime.toMutableMap().also { map ->
map[symbol] = Date.fromIso(certificate.expiryDate) / 1000L map[symbol] = (Date.fromIso(certificate.expiryDate) / 1000L).toString()
} }
onResult(symbol, STATE_SUCCESS) onResult(symbol, STATE_SUCCESS)
} }