From f289746c2f2d8db5f644e7f11491869f0eedf0e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Tue, 22 Dec 2020 09:49:49 +0100
Subject: [PATCH] Use ownCloud client base url to perform oidc discovery

---
 .../lib/resources/oauth/services/OIDCService.kt     |  3 ++-
 .../oauth/services/implementation/OCOIDCService.kt  | 13 ++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/services/OIDCService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/services/OIDCService.kt
index 6716baf5..d877370f 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/services/OIDCService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/services/OIDCService.kt
@@ -23,11 +23,12 @@
  */
 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.resources.oauth.responses.OIDCDiscoveryResponse
 
 interface OIDCService {
 
-    fun getOIDCServerDiscovery(baseUrl: String): RemoteOperationResult<OIDCDiscoveryResponse>
+    fun getOIDCServerDiscovery(ownCloudClient: OwnCloudClient): RemoteOperationResult<OIDCDiscoveryResponse>
 
 }
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/services/implementation/OCOIDCService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/services/implementation/OCOIDCService.kt
index 294f6d5f..ab74ba4b 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/services/implementation/OCOIDCService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/services/implementation/OCOIDCService.kt
@@ -23,9 +23,7 @@
  */
 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.authentication.OwnCloudCredentialsFactory
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.resources.oauth.GetOIDCDiscoveryRemoteOperation
 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 {
 
-    override fun getOIDCServerDiscovery(baseUrl: String): RemoteOperationResult<OIDCDiscoveryResponse> =
-        GetOIDCDiscoveryRemoteOperation().execute(createClientFromPath(baseUrl))
-
-    private fun createClientFromPath(path: String): OwnCloudClient =
-        OwnCloudClient(Uri.parse(path)).apply {
-            credentials = OwnCloudCredentialsFactory.getAnonymousCredentials()
-        }
+    override fun getOIDCServerDiscovery(
+        ownCloudClient: OwnCloudClient
+    ): RemoteOperationResult<OIDCDiscoveryResponse> =
+        GetOIDCDiscoveryRemoteOperation().execute(ownCloudClient)
 
 }