flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-07-17 23:15:35 +00:00
Code Issues Releases Wiki Activity

Use ownCloud client base url to perform oidc discovery

Browse Source
This commit is contained in:
Abel García de Prada 2020-12-22 09:49:49 +01:00
parent 0fc3f7668d
commit f289746c2f
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/services/OIDCService.kt
View File

@ -23,11 +23,12 @@
*/ */
package com.owncloud.android.lib.resources.oauth.services package com.owncloud.android.lib.resources.oauth.services
import com.owncloud.android.lib.common.OwnCloudClient
import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult
import com.owncloud.android.lib.resources.oauth.responses.OIDCDiscoveryResponse import com.owncloud.android.lib.resources.oauth.responses.OIDCDiscoveryResponse
interface OIDCService { interface OIDCService {
fun getOIDCServerDiscovery(baseUrl: String): RemoteOperationResult<OIDCDiscoveryResponse> fun getOIDCServerDiscovery(ownCloudClient: OwnCloudClient): RemoteOperationResult<OIDCDiscoveryResponse>
} }

13
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/services/implementation/OCOIDCService.kt
View File

@ -23,9 +23,7 @@
*/ */
package com.owncloud.android.lib.resources.oauth.services.implementation package com.owncloud.android.lib.resources.oauth.services.implementation
import android.net.Uri
import com.owncloud.android.lib.common.OwnCloudClient import com.owncloud.android.lib.common.OwnCloudClient
import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory
import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult
import com.owncloud.android.lib.resources.oauth.GetOIDCDiscoveryRemoteOperation import com.owncloud.android.lib.resources.oauth.GetOIDCDiscoveryRemoteOperation
import com.owncloud.android.lib.resources.oauth.responses.OIDCDiscoveryResponse import com.owncloud.android.lib.resources.oauth.responses.OIDCDiscoveryResponse
@ -33,12 +31,9 @@ import com.owncloud.android.lib.resources.oauth.services.OIDCService
class OCOIDCService() : OIDCService { class OCOIDCService() : OIDCService {
override fun getOIDCServerDiscovery(baseUrl: String): RemoteOperationResult<OIDCDiscoveryResponse> = override fun getOIDCServerDiscovery(
GetOIDCDiscoveryRemoteOperation().execute(createClientFromPath(baseUrl)) ownCloudClient: OwnCloudClient
): RemoteOperationResult<OIDCDiscoveryResponse> =
private fun createClientFromPath(path: String): OwnCloudClient = GetOIDCDiscoveryRemoteOperation().execute(ownCloudClient)
OwnCloudClient(Uri.parse(path)).apply {
credentials = OwnCloudCredentialsFactory.getAnonymousCredentials()
}
} }