From 37250fc55c64738612598832d749eacfb1373b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= Date: Tue, 9 Feb 2021 09:45:35 +0100 Subject: [PATCH] Apply CR suggestions --- .../resources/oauth/RegisterClientRemoteOperation.kt | 5 ++++- .../resources/oauth/params/ClientRegistrationParams.kt | 10 +++------- .../lib/resources/oauth/params/TokenRequestParams.kt | 10 ++++------ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/RegisterClientRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/RegisterClientRemoteOperation.kt index 720035a7..5d6482da 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/RegisterClientRemoteOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/RegisterClientRemoteOperation.kt @@ -47,7 +47,10 @@ class RegisterClientRemoteOperation( try { val requestBody = clientRegistrationParams.toRequestBody() - val postMethod = PostMethod(URL(clientRegistrationParams.registrationEndpoint), requestBody) + val postMethod = PostMethod( + url = URL(clientRegistrationParams.registrationEndpoint), + postRequestBody = requestBody + ) val status = client.executeHttpMethod(postMethod) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/params/ClientRegistrationParams.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/params/ClientRegistrationParams.kt index 454c5f6c..e26604a0 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/params/ClientRegistrationParams.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/params/ClientRegistrationParams.kt @@ -40,17 +40,13 @@ data class ClientRegistrationParams( val tokenEndpointAuthMethod: String, val applicationType: String ) { - fun toRequestBody(): RequestBody { - val jsonObject = JSONObject().apply { + fun toRequestBody(): RequestBody = + JSONObject().apply { put(PARAM_APPLICATION_TYPE, applicationType) put(PARAM_CLIENT_NAME, clientName) put(PARAM_REDIRECT_URIS, JSONArray(redirectUris)) put(PARAM_TOKEN_ENDPOINT_AUTH_METHOD, tokenEndpointAuthMethod) - } - - val mediaType = CONTENT_TYPE_JSON.toMediaType() - return jsonObject.toString().toRequestBody(mediaType) - } + }.toString().toRequestBody(CONTENT_TYPE_JSON.toMediaType()) companion object { private const val PARAM_APPLICATION_TYPE = "application_type" diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/params/TokenRequestParams.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/params/TokenRequestParams.kt index eef3823a..367af463 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/params/TokenRequestParams.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/params/TokenRequestParams.kt @@ -42,13 +42,12 @@ sealed class TokenRequestParams( val redirectUri: String ) : TokenRequestParams(tokenEndpoint, clientAuth, grantType) { - override fun toRequestBody(): RequestBody { - return FormBody.Builder() + override fun toRequestBody(): RequestBody = + FormBody.Builder() .add(HttpConstants.OAUTH_HEADER_AUTHORIZATION_CODE, authorizationCode) .add(HttpConstants.OAUTH_HEADER_GRANT_TYPE, grantType) .add(HttpConstants.OAUTH_HEADER_REDIRECT_URI, redirectUri) .build() - } } class RefreshToken( @@ -58,14 +57,13 @@ sealed class TokenRequestParams( val refreshToken: String? = null ) : TokenRequestParams(tokenEndpoint, clientAuth, grantType) { - override fun toRequestBody(): RequestBody { - return FormBody.Builder().apply { + override fun toRequestBody(): RequestBody = + FormBody.Builder().apply { add(HttpConstants.OAUTH_HEADER_GRANT_TYPE, grantType) if (!refreshToken.isNullOrBlank()) { add(HttpConstants.OAUTH_HEADER_REFRESH_TOKEN, refreshToken) } }.build() - } } }