jellyfin/jellyfin-androidtv
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-androidtv.git synced 2024-11-30 09:30:54 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Remove hasPassword support

Browse Source
This commit is contained in:
Niels van Velzen 2024-06-21 21:25:05 +02:00 committed by Niels van Velzen
parent 52d69f33fe
commit 16ceaf642d
5 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/jellyfin/androidtv/auth/model/AuthenticationStoreUser.kt
View File

@ -11,7 +11,6 @@ import java.time.Instant
data class AuthenticationStoreUser(
val name: String,
@SerialName("last_used") val lastUsed: Long = Instant.now().toEpochMilli(),
@SerialName("require_password") val requirePassword: Boolean = true,
@SerialName("image_tag") val imageTag: String? = null,
@SerialName("access_token") val accessToken: String? = null,
)

3
app/src/main/java/org/jellyfin/androidtv/auth/model/User.kt
View File

@ -10,7 +10,6 @@ sealed class User {
abstract val serverId: UUID
abstract val name: String
abstract val accessToken: String?
abstract val requirePassword: Boolean
abstract val imageTag: String?
abstract fun withToken(accessToken: String): User
@ -34,7 +33,6 @@ data class PrivateUser(
override val serverId: UUID,
override val name: String,
override val accessToken: String?,
override val requirePassword: Boolean,
override val imageTag: String?,
val lastUsed: Long,
) : User() {
@ -49,7 +47,6 @@ data class PublicUser(
override val serverId: UUID,
override val name: String,
override val accessToken: String?,
override val requirePassword: Boolean,
override val imageTag: String?,
) : User() {
override fun withToken(accessToken: String) = copy(accessToken = accessToken)

5
app/src/main/java/org/jellyfin/androidtv/auth/repository/AuthenticationRepository.kt
View File

@ -74,8 +74,6 @@ class AuthenticationRepositoryImpl(
val authStoreUser = authenticationStore.getUser(server.id, user.id)
// Try login with access token
return if (authStoreUser?.accessToken != null) authenticateToken(server, user.withToken(authStoreUser.accessToken))
// Try login without password
else if (!user.requirePassword) authenticateCredential(server, user.name, "")
// Require login
else flowOf(RequireSignInState)
}
@ -124,7 +122,6 @@ class AuthenticationRepositoryImpl(
serverId = server.id,
name = userInfo.name!!,
accessToken = result.accessToken,
requirePassword = userInfo.hasPassword,
imageTag = userInfo.primaryImageTag,
lastUsed = Instant.now().toEpochMilli(),
)
@ -166,12 +163,10 @@ class AuthenticationRepositoryImpl(
val updatedUser = currentUser?.copy(
name = userInfo.name!!,
lastUsed = Instant.now().toEpochMilli(),
requirePassword = userInfo.hasPassword,
imageTag = userInfo.primaryImageTag,
accessToken = accessToken,
) ?: AuthenticationStoreUser(
name = userInfo.name!!,
requirePassword = userInfo.hasPassword,
imageTag = userInfo.primaryImageTag,
accessToken = accessToken,
)

1
app/src/main/java/org/jellyfin/androidtv/auth/repository/ServerUserRepository.kt
View File

@ -35,7 +35,6 @@ class ServerUserRepositoryImpl(
serverId = server.id,
name = userInfo.name,
accessToken = authInfo?.accessToken,
requirePassword = userInfo.requirePassword,
imageTag = userInfo.imageTag,
lastUsed = userInfo.lastUsed,
)

1
app/src/main/java/org/jellyfin/androidtv/util/sdk/ModelExtensions.kt
View File

@ -25,7 +25,6 @@ fun UserDto.toPublicUser(): PublicUser? {
name = name ?: return null,
serverId = serverId?.toUUIDOrNull() ?: return null,
accessToken = null,
requirePassword = hasPassword,
imageTag = primaryImageTag
)
}