mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-09-06 17:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new auth/revoke endpoint (#3416)

Browse source
This commit is contained in:
Joris Pelgröm 2023-03-16 00:15:16 +01:00 committed by GitHub
parent 1a7091a761
commit 421f38f1c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/src/main/java/io/homeassistant/companion/android/common/data/authentication/impl/AuthenticationRepositoryImpl.kt
View file

@ -76,11 +76,18 @@ class AuthenticationRepositoryImpl @AssistedInject constructor(
Log.e(TAG, "Unable to revoke session.")
return
}
authenticationService.revokeToken(
url.newBuilder().addPathSegments("auth/token").build(),
server.session.refreshToken!!,
AuthenticationService.REVOKE_ACTION
)
if (server.version?.isAtLeast(2022, 9, 0) == true) {
authenticationService.revokeToken(
url.newBuilder().addPathSegments("auth/revoke").build(),
server.session.refreshToken!!
)
} else {
authenticationService.revokeTokenLegacy(
url.newBuilder().addPathSegments("auth/token").build(),
server.session.refreshToken!!,
AuthenticationService.REVOKE_ACTION
)
}
serverManager.updateServer(
server.copy(
session = server.session.copy(

7
common/src/main/java/io/homeassistant/companion/android/common/data/authentication/impl/AuthenticationService.kt
View file

@ -38,6 +38,13 @@ interface AuthenticationService {
@FormUrlEncoded
@POST
suspend fun revokeToken(
@Url url: HttpUrl,
@Field("token") refreshToken: String
)
@FormUrlEncoded
@POST
suspend fun revokeTokenLegacy(
@Url url: HttpUrl,
@Field("token") refreshToken: String,
@Field("action") action: String