flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 07:56:19 +00:00
Code Issues Releases Wiki Activity

Webfinger calls won't follow redirections. Only working with 2XX

Browse Source
This commit is contained in:
Abel García de Prada 2023-03-31 09:41:57 +02:00
parent fa65c1a84d
commit 14baadd7ea
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/GetInstancesViaWebFingerOperation.kt
View File

@ -75,13 +75,17 @@ class GetInstancesViaWebFingerOperation(
val response = parseResponse(rawResponse) val response = parseResponse(rawResponse)
Timber.d("Successful WebFinger request: $response") Timber.d("Successful WebFinger request: $response")
val operationResult = RemoteOperationResult<List<String>>(RemoteOperationResult.ResultCode.OK) val operationResult = RemoteOperationResult<List<String>>(RemoteOperationResult.ResultCode.OK)
operationResult.data = response.links.map { it.href } operationResult.data = response.links?.map { it.href } ?: listOf()
return operationResult return operationResult
} }
override fun run(client: OwnCloudClient): RemoteOperationResult<List<String>> { override fun run(client: OwnCloudClient): RemoteOperationResult<List<String>> {
val requestUri = buildRequestUri() val requestUri = buildRequestUri()
val getMethod = GetMethod(URL(requestUri.toString())) val getMethod = GetMethod(URL(requestUri.toString()))
// First iteration won't follow redirections.
getMethod.followRedirects = false
return try { return try {
val status = client.executeHttpMethod(getMethod) val status = client.executeHttpMethod(getMethod)
val response = getMethod.getResponseBodyAsString()!! val response = getMethod.getResponseBodyAsString()!!

2
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/webfinger/responses/WebFingerResponse.kt
View File

@ -29,7 +29,7 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class WebFingerResponse( data class WebFingerResponse(
val subject: String, val subject: String,
val links: List<LinkItem> val links: List<LinkItem>?
) )
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)