flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 02:17:41 +00:00
Code Issues Releases Wiki Activity

Apply suggestions from CR

Browse Source
This commit is contained in:
Abel García de Prada 2021-01-13 15:53:08 +01:00
parent 44a13f9878
commit 0d09540f9b
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/GetOIDCDiscoveryRemoteOperation.kt
View File

@ -45,8 +45,6 @@ import java.net.URL
class GetOIDCDiscoveryRemoteOperation : RemoteOperation<OIDCDiscoveryResponse>() { class GetOIDCDiscoveryRemoteOperation : RemoteOperation<OIDCDiscoveryResponse>() {
override fun run(client: OwnCloudClient): RemoteOperationResult<OIDCDiscoveryResponse> { override fun run(client: OwnCloudClient): RemoteOperationResult<OIDCDiscoveryResponse> {
var result: RemoteOperationResult<OIDCDiscoveryResponse>
try { try {
val uriBuilder = client.baseUri.buildUpon().apply { val uriBuilder = client.baseUri.buildUpon().apply {
appendPath(WELL_KNOWN_PATH) // avoid starting "/" in this method appendPath(WELL_KNOWN_PATH) // avoid starting "/" in this method
@ -68,22 +66,23 @@ class GetOIDCDiscoveryRemoteOperation : RemoteOperation<OIDCDiscoveryResponse>()
val moshi: Moshi = Moshi.Builder().build() val moshi: Moshi = Moshi.Builder().build()
val jsonAdapter: JsonAdapter<OIDCDiscoveryResponse> = moshi.adapter(OIDCDiscoveryResponse::class.java) val jsonAdapter: JsonAdapter<OIDCDiscoveryResponse> = moshi.adapter(OIDCDiscoveryResponse::class.java)
val oidcDiscoveryResponse: OIDCDiscoveryResponse? = jsonAdapter.fromJson(responseBody) val oidcDiscoveryResponse: OIDCDiscoveryResponse? = jsonAdapter.fromJson(responseBody)
Timber.d("Get OIDC Discovery completed and parsed to [$oidcDiscoveryResponse]")
result = RemoteOperationResult(RemoteOperationResult.ResultCode.OK) return RemoteOperationResult<OIDCDiscoveryResponse>(RemoteOperationResult.ResultCode.OK).apply {
result.data = oidcDiscoveryResponse data = oidcDiscoveryResponse
}
Timber.d("Get OIDC Discovery completed and parsed to $oidcDiscoveryResponse")
} else { } else {
result = RemoteOperationResult(getMethod)
Timber.e("Failed response while getting OIDC server discovery from the server status code: $status; response message: $responseBody") Timber.e("Failed response while getting OIDC server discovery from the server status code: $status; response message: $responseBody")
return RemoteOperationResult<OIDCDiscoveryResponse>(getMethod)
} }
} catch (e: Exception) { } catch (e: Exception) {
result = RemoteOperationResult(e)
Timber.e(e, "Exception while getting OIDC server discovery") Timber.e(e, "Exception while getting OIDC server discovery")
}
return result return RemoteOperationResult<OIDCDiscoveryResponse>(e)
}
} }
companion object { companion object {

18
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/TokenRequestRemoteOperation.kt
View File

@ -49,8 +49,6 @@ class TokenRequestRemoteOperation(
) : RemoteOperation<TokenResponse>() { ) : RemoteOperation<TokenResponse>() {
override fun run(client: OwnCloudClient): RemoteOperationResult<TokenResponse> { override fun run(client: OwnCloudClient): RemoteOperationResult<TokenResponse> {
var result: RemoteOperationResult<TokenResponse>
try { try {
val requestBody = tokenRequestParams.toRequestBody() val requestBody = tokenRequestParams.toRequestBody()
@ -69,21 +67,21 @@ class TokenRequestRemoteOperation(
val moshi: Moshi = Moshi.Builder().build() val moshi: Moshi = Moshi.Builder().build()
val jsonAdapter: JsonAdapter<TokenResponse> = moshi.adapter(TokenResponse::class.java) val jsonAdapter: JsonAdapter<TokenResponse> = moshi.adapter(TokenResponse::class.java)
val tokenResponse: TokenResponse? = jsonAdapter.fromJson(responseBody) val tokenResponse: TokenResponse? = jsonAdapter.fromJson(responseBody)
result = RemoteOperationResult(RemoteOperationResult.ResultCode.OK)
result.data = tokenResponse
Timber.d("Get tokens completed and parsed to $tokenResponse") Timber.d("Get tokens completed and parsed to $tokenResponse")
return RemoteOperationResult<TokenResponse>(RemoteOperationResult.ResultCode.OK).apply {
data = tokenResponse
}
} else { } else {
result = RemoteOperationResult(postMethod)
Timber.e("Failed response while getting tokens from the server status code: $status; response message: $responseBody") Timber.e("Failed response while getting tokens from the server status code: $status; response message: $responseBody")
return RemoteOperationResult<TokenResponse>(postMethod)
} }
} catch (e: Exception) { } catch (e: Exception) {
result = RemoteOperationResult(e)
Timber.e(e, "Exception while getting tokens") Timber.e(e, "Exception while getting tokens")
} return RemoteOperationResult<TokenResponse>(e)
return result }
} }
} }