Skip to content

Session Import Race Condition #308

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
annrose2277-glitch wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −23
Open

Session Import Race Condition #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 24 additions & 23 deletions app/src/main/kotlin/com/arflix/tv/data/repository/AuthRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,42 +197,43 @@ class AuthRepository @Inject constructor(
val hasRefreshToken = !refreshToken.isNullOrBlank()
var session: UserSession? = null

// Supabase SDK requires main thread for initialization (lifecycle observers)
// First try: Load from SessionManager via Supabase SDK
try {
session = withTimeoutOrNull(2_500L) {
withContext(Dispatchers.Main) {
for (attempt in 1..3) {
// First try: Load from SessionManager via Supabase SDK
try {
session = withContext(Dispatchers.IO) {
supabase.auth.loadFromStorage(true)
supabase.auth.currentSessionOrNull()
}
} catch (e: Exception) {
}
} catch (e: Exception) {
}

// Second try: Import from cached tokens
if (session == null && hasAccessToken && hasRefreshToken) {
try {
session = withTimeoutOrNull(2_500L) {
withContext(Dispatchers.Main) {
// Second try: Import from cached tokens
if (session == null && hasAccessToken && hasRefreshToken) {
try {
session = withContext(Dispatchers.IO) {
supabase.auth.importAuthToken(accessToken ?: "", refreshToken ?: "", false, true)
supabase.auth.currentSessionOrNull()
}
if (session != null) {
// Save the imported session to SessionManager
storeSession(session)
}
} catch (e: Exception) {
}
if (session != null) {
// Save the imported session to SessionManager
storeSession(session)
}
} catch (e: Exception) {
}
}

// Third try: Refresh the session
if (session == null && hasRefreshToken) {
session = withTimeoutOrNull(3_000L) {
withContext(Dispatchers.Main) {
ensureValidSession()
// Third try: Refresh the session
if (session == null && hasRefreshToken) {
try {
session = withContext(Dispatchers.IO) {
ensureValidSession()
}
} catch (e: Exception) {
}
}

if (session != null) break
if (attempt < 3) kotlinx.coroutines.delay(500L)
}
if (hasAccessToken || hasRefreshToken || session != null || !cachedUserId.isNullOrBlank()) {
val userId = session?.user?.id ?: cachedUserId
Expand Down