Skip to content

AuthAPI: use unixTime from APIHolder #2926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luna712 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

AuthAPI: use unixTime from APIHolder #2926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbbff41
AuthAPI: use unixTime from APIHolder
Luna712 Jun 15, 2026
4160172
Use APIHolder here also
Luna712 Jun 15, 2026
752464c
Use base64Encode
Luna712 Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 29 additions & 47 deletions app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,14 @@
package com.lagradost.cloudstream3.syncproviders

import android.util.Base64
import androidx.annotation.WorkerThread
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.APIHolder
import com.lagradost.cloudstream3.APIHolder.unixTime
import com.lagradost.cloudstream3.ActorData
import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
import com.lagradost.cloudstream3.CloudStreamApp.Companion.openBrowser
import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
import com.lagradost.cloudstream3.CommonActivity.showToast
import com.lagradost.cloudstream3.ErrorLoadingException
import com.lagradost.cloudstream3.LoadResponse
import com.lagradost.cloudstream3.NextAiring
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.Score
import com.lagradost.cloudstream3.SearchQuality
import com.lagradost.cloudstream3.SearchResponse
import com.lagradost.cloudstream3.ShowStatus
import com.lagradost.cloudstream3.TvType
import com.lagradost.cloudstream3.mvvm.Resource
import com.lagradost.cloudstream3.mvvm.logError
import com.lagradost.cloudstream3.mvvm.safe
import com.lagradost.cloudstream3.mvvm.safeApiCall
import com.lagradost.cloudstream3.APIHolder.unixTimeMS
import com.lagradost.cloudstream3.base64Encode
import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING
import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.NONE_ID
import com.lagradost.cloudstream3.syncproviders.providers.Addic7ed
import com.lagradost.cloudstream3.syncproviders.providers.AniListApi
import com.lagradost.cloudstream3.syncproviders.providers.LocalList
import com.lagradost.cloudstream3.syncproviders.providers.MALApi
import com.lagradost.cloudstream3.syncproviders.providers.KitsuApi
import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi
import com.lagradost.cloudstream3.syncproviders.providers.SimklApi
import com.lagradost.cloudstream3.syncproviders.providers.SubDlApi
import com.lagradost.cloudstream3.syncproviders.providers.SubSourceApi
import com.lagradost.cloudstream3.ui.SyncWatchType
import com.lagradost.cloudstream3.ui.library.ListSorting
import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery
import com.lagradost.cloudstream3.utils.DataStoreHelper
import com.lagradost.cloudstream3.utils.UiText
import com.lagradost.cloudstream3.utils.txt
import java.net.URL
import java.net.URI
import java.security.SecureRandom
import java.util.Date
import java.util.concurrent.TimeUnit

data class AuthLoginPage(
/** The website to open to authenticate */
Expand Down Expand Up @@ -79,10 +45,10 @@ data class AuthToken(
val payload: String? = null,
) {
fun isAccessTokenExpired(marginSec: Long = 10L) =
accessTokenLifetime != null && (System.currentTimeMillis() / 1000) + marginSec >= accessTokenLifetime
accessTokenLifetime != null && unixTime + marginSec >= accessTokenLifetime

fun isRefreshTokenExpired(marginSec: Long = 10L) =
refreshTokenLifetime != null && (System.currentTimeMillis() / 1000) + marginSec >= refreshTokenLifetime
refreshTokenLifetime != null && unixTime + marginSec >= refreshTokenLifetime
}

data class AuthUser(
Expand Down Expand Up @@ -177,16 +143,33 @@ abstract class AuthAPI {
open val inAppLoginRequirement: AuthLoginRequirement? = null

companion object {
@Deprecated(
message = "Use APIHolder.unixTime instead",
replaceWith = ReplaceWith(
expression = "APIHolder.unixTime",
imports = ["com.lagradost.cloudstream3.APIHolder"]
),
level = DeprecationLevel.WARNING,
)
val unixTime: Long
get() = System.currentTimeMillis() / 1000L
get() = APIHolder.unixTime

@Deprecated(
message = "Use APIHolder.unixTimeMS instead",
replaceWith = ReplaceWith(
expression = "unixTimeMS",
imports = ["com.lagradost.cloudstream3.APIHolder.unixTimeMS"]
),
level = DeprecationLevel.WARNING,
)
val unixTimeMs: Long
get() = System.currentTimeMillis()
get() = unixTimeMS

fun splitRedirectUrl(redirectUrl: String): Map<String, String> {
return splitQuery(
URL(
URI(
redirectUrl.replace(APP_STRING, "https").replace("/#", "?")
)
).toURL()
)
}

Expand All @@ -196,9 +179,8 @@ abstract class AuthAPI {
val secureRandom = SecureRandom()
val codeVerifierBytes = ByteArray(96) // base64 has 6bit per char; (8/6)*96 = 128
secureRandom.nextBytes(codeVerifierBytes)
return Base64.encodeToString(codeVerifierBytes, Base64.DEFAULT).trimEnd('=')
.replace("+", "-")
.replace("/", "_").replace("\n", "")
return base64Encode(codeVerifierBytes).trimEnd('=')
.replace("+", "-").replace("/", "_").replace("\n", "")
}
}

Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.Actor
import com.lagradost.cloudstream3.ActorData
import com.lagradost.cloudstream3.ActorRole
import com.lagradost.cloudstream3.APIHolder
import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
import com.lagradost.cloudstream3.ErrorLoadingException
Expand Down Expand Up @@ -52,7 +53,7 @@ class AniListApi : SyncAPI() {
val token = AuthToken(
accessToken = sanitizer["access_token"] ?: throw ErrorLoadingException("No access token"),
//refreshToken = sanitizer["refresh_token"],
accessTokenLifetime = unixTime + sanitizer["expires_in"]!!.toLong(),
accessTokenLifetime = APIHolder.unixTime + sanitizer["expires_in"]!!.toLong(),
)
return token
}
Expand Down Expand Up @@ -106,7 +107,7 @@ class AniListApi : SyncAPI() {
nextAiring = season.nextAiringEpisode?.let {
NextAiring(
it.episode ?: return@let null,
(it.timeUntilAiring ?: return@let null) + unixTime
(it.timeUntilAiring ?: return@let null) + APIHolder.unixTime
)
},
title = season.title?.userPreferred,
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.syncproviders.providers

import androidx.annotation.StringRes
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.APIHolder
import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
import com.lagradost.cloudstream3.R
Expand Down Expand Up @@ -106,7 +107,7 @@ class KitsuApi: SyncAPI() {
).parsed<ResponseToken>()

return AuthToken(
accessTokenLifetime = unixTime + token.expiresIn.toLong(),
accessTokenLifetime = APIHolder.unixTime + token.expiresIn.toLong(),
refreshToken = token.refreshToken,
accessToken = token.accessToken,
)
Expand All @@ -125,7 +126,7 @@ class KitsuApi: SyncAPI() {
return AuthToken(
accessToken = res.accessToken,
refreshToken = res.refreshToken,
accessTokenLifetime = unixTime + res.expiresIn.toLong()
accessTokenLifetime = APIHolder.unixTime + res.expiresIn.toLong()
)
}

Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.syncproviders.providers

import androidx.annotation.StringRes
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.APIHolder
import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
import com.lagradost.cloudstream3.R
Expand Down Expand Up @@ -78,7 +79,7 @@ class MALApi : SyncAPI() {
)
).parsed<ResponseToken>()
return AuthToken(
accessTokenLifetime = unixTime + token.expiresIn.toLong(),
accessTokenLifetime = APIHolder.unixTime + token.expiresIn.toLong(),
refreshToken = token.refreshToken,
accessToken = token.accessToken
)
Expand Down Expand Up @@ -366,7 +367,7 @@ class MALApi : SyncAPI() {
return AuthToken(
accessToken = res.accessToken,
refreshToken = res.refreshToken,
accessTokenLifetime = unixTime + res.expiresIn.toLong()
accessTokenLifetime = APIHolder.unixTime + res.expiresIn.toLong()
)
}

Expand Down
12 changes: 7 additions & 5 deletions app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ package com.lagradost.cloudstream3.syncproviders.providers

import android.util.Log
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.app
import com.lagradost.cloudstream3.APIHolder
import com.lagradost.cloudstream3.APIHolder.unixTimeMS
import com.lagradost.cloudstream3.ErrorLoadingException
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.app
import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
import com.lagradost.cloudstream3.syncproviders.AuthData
import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
Expand Down Expand Up @@ -43,17 +45,17 @@ class OpenSubtitlesApi : SubtitleAPI() {
}

private fun canDoRequest(): Boolean {
return unixTimeMs > currentCoolDown
return unixTimeMS > currentCoolDown
}

private fun throwIfCantDoRequest() {
if (!canDoRequest()) {
throw ErrorLoadingException("Too many requests wait for ${(currentCoolDown - unixTimeMs) / 1000L}s")
throw ErrorLoadingException("Too many requests wait for ${(currentCoolDown - unixTimeMS) / 1000L}s")
}
}

private fun throwGotTooManyRequests() {
currentCoolDown = unixTimeMs + COOLDOWN_DURATION
currentCoolDown = unixTimeMS + COOLDOWN_DURATION
throw ErrorLoadingException("Too many requests")
}

Expand Down Expand Up @@ -89,7 +91,7 @@ class OpenSubtitlesApi : SubtitleAPI() {
accessToken = response.token
?: throw ErrorLoadingException("Invalid password or username"),
/// JWT token is valid 24 hours after successfully authentication of user
accessTokenLifetime = unixTime + 60 * 60 * 24,
accessTokenLifetime = APIHolder.unixTime + 60 * 60 * 24,
payload = form.toJson()
)
}
Expand Down
17 changes: 9 additions & 8 deletions app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import androidx.annotation.StringRes
import androidx.core.net.toUri
import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.APIHolder
import com.lagradost.cloudstream3.BuildConfig
import com.lagradost.cloudstream3.CloudStreamApp
import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
Expand Down Expand Up @@ -77,15 +78,15 @@ class SimklApi : SyncAPI() {
private class SimklCacheWrapper<T>(
@JsonProperty("obj") val obj: T?,
@JsonProperty("validUntil") val validUntil: Long,
@JsonProperty("cacheTime") val cacheTime: Long = unixTime,
@JsonProperty("cacheTime") val cacheTime: Long = APIHolder.unixTime,
) {
/** Returns true if cache is newer than cacheDays */
fun isFresh(): Boolean {
return validUntil > unixTime
return validUntil > APIHolder.unixTime
}

fun remainingTime(): Duration {
val unixTime = unixTime
val unixTime = APIHolder.unixTime
return if (validUntil > unixTime) {
(validUntil - unixTime).toDuration(DurationUnit.SECONDS)
} else {
Expand All @@ -109,7 +110,7 @@ class SimklApi : SyncAPI() {
SIMKL_CACHE_KEY,
path,
// Storing as plain sting is required to make generics work.
SimklCacheWrapper(value, unixTime + cacheTime.inWholeSeconds).toJson()
SimklCacheWrapper(value, APIHolder.unixTime + cacheTime.inWholeSeconds).toJson()
)
}

Expand Down Expand Up @@ -418,7 +419,7 @@ class SimklApi : SyncAPI() {
}

suspend fun execute(): Boolean {
val time = getDateTime(unixTime)
val time = getDateTime(APIHolder.unixTime)
val headers = this.headers ?: emptyMap()
return if (this.status == SimklListStatusType.None.value) {
app.post(
Expand Down Expand Up @@ -568,7 +569,7 @@ class SimklApi : SyncAPI() {
@JsonProperty("year") year: Int?,
@JsonProperty("ids") ids: Ids?,
@JsonProperty("rating") val rating: Int,
@JsonProperty("rated_at") val ratedAt: String? = getDateTime(unixTime)
@JsonProperty("rated_at") val ratedAt: String? = getDateTime(APIHolder.unixTime)
) : MediaObject(title, year, ids)

@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand All @@ -577,7 +578,7 @@ class SimklApi : SyncAPI() {
@JsonProperty("year") year: Int?,
@JsonProperty("ids") ids: Ids?,
@JsonProperty("to") val to: String,
@JsonProperty("watched_at") val watchedAt: String? = getDateTime(unixTime)
@JsonProperty("watched_at") val watchedAt: String? = getDateTime(APIHolder.unixTime)
) : MediaObject(title, year, ids)

@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down Expand Up @@ -862,7 +863,7 @@ class SimklApi : SyncAPI() {
newStatus: AbstractSyncStatus
): Boolean {
val parsedId = readIdFromString(id)
lastScoreTime = unixTime
lastScoreTime = APIHolder.unixTime
val simklStatus = newStatus as? SimklSyncStatus

val builder = SimklScoreBuilder.Builder()
Expand Down