Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit d683da3

Browse files
committed
Support refresh token with own idP
1 parent 44967be commit d683da3

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class HttpConstants {
5656
public static final String HEADER_GRANT_TYPE = "grant_type";
5757
public static final String HEADER_REDIRECT_URI = "redirect_uri";
5858
public static final String HEADER_CODE_VERIFIER = "code_verifier";
59+
public static final String HEADER_REFRESH_TOKEN = "refresh_token";
5960

6061
/***********************************************************************************************************
6162
************************************************ CONTENT TYPES ********************************************

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import com.owncloud.android.lib.common.http.HttpConstants.HEADER_AUTHORIZATION_C
3232
import com.owncloud.android.lib.common.http.HttpConstants.HEADER_CODE_VERIFIER
3333
import com.owncloud.android.lib.common.http.HttpConstants.HEADER_GRANT_TYPE
3434
import com.owncloud.android.lib.common.http.HttpConstants.HEADER_REDIRECT_URI
35+
import com.owncloud.android.lib.common.http.HttpConstants.HEADER_REFRESH_TOKEN
3536
import com.owncloud.android.lib.common.http.HttpConstants.HTTP_OK
3637
import com.owncloud.android.lib.common.http.methods.nonwebdav.PostMethod
3738
import com.owncloud.android.lib.common.operations.RemoteOperation
@@ -46,7 +47,7 @@ import timber.log.Timber
4647
import java.net.URL
4748

4849
/**
49-
* Get OIDC Discovery
50+
* Perform token request
5051
*
5152
* @author Abel García de Prada
5253
*/
@@ -67,6 +68,7 @@ class TokenRequestRemoteOperation(
6768
.add(HEADER_GRANT_TYPE, tokenRequestParams.grantType)
6869
.add(HEADER_REDIRECT_URI, tokenRequestParams.redirectUri)
6970
.add(HEADER_CODE_VERIFIER, tokenRequestParams.codeVerifier)
71+
.add(HEADER_REFRESH_TOKEN, tokenRequestParams.refreshToken.orEmpty())
7072
.build()
7173

7274
val postMethod = PostMethod(URL(uriBuilder.toString()), requestBody)

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/params/TokenRequestParams.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class TokenRequestParams(
2828
val authorizationCode: String,
2929
val grantType: String,
3030
val redirectUri: String,
31+
val refreshToken: String? = null,
3132
val codeVerifier: String,
3233
val clientAuth: String
3334
)

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/responses/TokenResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ data class TokenResponse(
3434
@Json(name = "expires_in")
3535
val expiresIn: Int,
3636
@Json(name = "refresh_token")
37-
val refreshToken: String,
37+
val refreshToken: String?,
3838
@Json(name = "token_type")
3939
val tokenType: String,
4040
@Json(name = "user_id")

0 commit comments

Comments
 (0)