feat: adapt token renewal process to the new setup for Kiteworks servers

Author: joragua

owncloudApp/src/main/java/com/owncloud/android/presentation/authentication/AccountAuthenticator.java

@@ -5,9 +5,10 @@
  * @author Christian Schabesberger
  * @author David González Verdugo
  * @author Juan Carlos Garrote Gascón
+ * @author Jorge Aguado Recio
  *
  * Copyright (C) 2012  Bartek Przybylski
- * Copyright (C) 2024 ownCloud GmbH.
+ * Copyright (C) 2025 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -346,13 +347,23 @@ private String refreshToken(
         String clientIdForRequest = null;
         String clientSecretForRequest = null;
 
+        boolean isKiteworksServer = Boolean.parseBoolean(accountManager.getUserData(account, AccountUtils.Constants.KEY_IS_KITEWORKS_SERVER));
+
         if (clientId == null) {
             Timber.d("Client Id not stored. Let's use the hardcoded one");
-            clientId = mContext.getString(R.string.oauth2_client_id);
+            if (isKiteworksServer) {
+                clientId = mContext.getString(R.string.kiteworks_client_id);
+            } else {
+                clientId = mContext.getString(R.string.oauth2_client_id);
+            }
         }
         if (clientSecret == null) {
             Timber.d("Client Secret not stored. Let's use the hardcoded one");
-            clientSecret = mContext.getString(R.string.oauth2_client_secret);
+            if (isKiteworksServer) {
+                clientSecret = mContext.getString(R.string.kiteworks_client_secret);
+            } else {
+                clientSecret = mContext.getString(R.string.oauth2_client_secret);
+            }
         }
 
         if (oidcServerConfigurationUseCaseResult.isSuccess()) {
@@ -376,7 +387,12 @@ private String refreshToken(
 
         String clientAuth = OAuthUtils.Companion.getClientAuth(clientSecret, clientId);
 
-        String scope = mContext.getResources().getString(R.string.oauth2_openid_scope);
+        String scope;
+        if (isKiteworksServer) {
+            scope = mContext.getResources().getString(R.string.kiteworks_openid_scope);
+        } else {
+            scope = mContext.getResources().getString(R.string.oauth2_openid_scope);
+        }
 
         TokenRequest oauthTokenRequest = new TokenRequest.RefreshToken(
                 baseUrl,

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/ConnectionValidator.kt

@@ -59,6 +59,8 @@ class ConnectionValidator(
 
             client.account = baseClient.account
             client.credentials = baseClient.credentials
+            client.isKiteworksServer = baseClient.isKiteworksServer
+
             while (validationRetryCount < VALIDATION_RETRY_COUNT) {
                 Timber.d("validationRetryCount %d", validationRetryCount)
                 var successCounter = 0

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java

@@ -144,7 +144,8 @@ private int saveExecuteHttpMethod(HttpBaseMethod method) throws Exception {
 
             HttpUrl originalUrl = method.getHttpUrl();
             String encodedPath = originalUrl.encodedPath();
-            if (mIsKiteworksServer && !encodedPath.startsWith(WELL_KNOWN_PATH) && !encodedPath.equals(OAUTH_TOKEN_PATH)) {
+            if (mIsKiteworksServer && !encodedPath.startsWith(WELL_KNOWN_PATH) && !encodedPath.equals(OAUTH_TOKEN_PATH)
+                    && !encodedPath.contains(KWDAV_PATH)) {
                 HttpUrl newUrl = originalUrl.newBuilder().encodedPath(KWDAV_PATH + encodedPath).build();
                 method.setUrl(newUrl);
             }