Merge pull request #4661 from owncloud/feature/add_account_id_to_user

[FEATURE REQUEST] Add account id to the user

Author: joragua

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Table of Contents
 
+* [Changelog for unreleased](#changelog-for-owncloud-android-client-unreleased-unreleased)
 * [Changelog for 4.6.2](#changelog-for-owncloud-android-client-462-2025-08-13)
 * [Changelog for 4.6.1](#changelog-for-owncloud-android-client-461-2025-08-01)
 * [Changelog for 4.6.0](#changelog-for-owncloud-android-client-460-2025-07-22)
@@ -29,6 +30,28 @@
 * [Changelog for 2.18.1](#changelog-for-owncloud-android-client-2181-2021-07-20)
 * [Changelog for 2.18.0](#changelog-for-owncloud-android-client-2180-2021-05-24)
 * [Changelog for 2.17 versions and below](#changelog-for-217-versions-and-below)
+# Changelog for ownCloud Android Client [unreleased] (UNRELEASED)
+
+The following sections list the changes in ownCloud Android Client unreleased relevant to
+ownCloud admins and users.
+
+[unreleased]: https://github.com/owncloud/android/compare/v4.6.2...master
+
+## Summary
+
+* Enhancement - Add account ID to the user information: [#4605](https://github.com/owncloud/android/issues/4605)
+
+## Details
+
+* Enhancement - Add account ID to the user information: [#4605](https://github.com/owncloud/android/issues/4605)
+
+   The account ID has been added to the Account Manager only for Infinite Scale
+   users. This information will be used to fetch all permissions related to space
+   management.
+
+   https://github.com/owncloud/android/issues/4605
+   https://github.com/owncloud/android/pull/4661
+
 # Changelog for ownCloud Android Client [4.6.2] (2025-08-13)
 
 The following sections list the changes in ownCloud Android Client 4.6.2 relevant to

changelog/unreleased/4661

@@ -0,0 +1,7 @@
+Enhancement: Add account ID to the user information
+
+The account ID has been added to the Account Manager only for Infinite Scale users.
+This information will be used to fetch all permissions related to space management.
+
+https://github.com/owncloud/android/issues/4605
+https://github.com/owncloud/android/pull/4661

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt

@@ -7,7 +7,7 @@
  * @author Aitor Ballesteros Pavón
  * @author Jorge Aguado Recio
  *
- * 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,
@@ -109,6 +109,7 @@ import com.owncloud.android.domain.user.usecases.GetUserInfoAsyncUseCase
 import com.owncloud.android.domain.user.usecases.GetUserQuotasUseCase
 import com.owncloud.android.domain.user.usecases.GetUserQuotasAsStreamUseCase
 import com.owncloud.android.domain.user.usecases.RefreshUserQuotaFromServerAsyncUseCase
+import com.owncloud.android.domain.user.usecases.GetUserIdAsyncUseCase
 import com.owncloud.android.domain.webfinger.usecases.GetOwnCloudInstanceFromWebFingerUseCase
 import com.owncloud.android.domain.webfinger.usecases.GetOwnCloudInstancesFromAuthenticatedWebFingerUseCase
 import com.owncloud.android.usecases.accounts.RemoveAccountUseCase
@@ -259,6 +260,7 @@ val useCaseModule = module {
     factoryOf(::GetStoredQuotaAsStreamUseCase)
     factoryOf(::GetStoredQuotaUseCase)
     factoryOf(::GetUserAvatarAsyncUseCase)
+    factoryOf(::GetUserIdAsyncUseCase)
     factoryOf(::GetUserInfoAsyncUseCase)
     factoryOf(::GetUserQuotasAsStreamUseCase)
     factoryOf(::GetUserQuotasUseCase)

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt

@@ -5,8 +5,9 @@
  * @author Abel García de Prada
  * @author Juan Carlos Garrote Gascón
  * @author David Crespo Ríos
+ * @author Jorge Aguado Recio
  *
- * 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,
@@ -101,6 +102,6 @@ val viewModelModule = module {
         get()) }
     viewModel { ReceiveExternalFilesViewModel(get(), get(), get(), get()) }
     viewModel { (accountName: String, showPersonalSpace: Boolean) ->
-        SpacesListViewModel(get(), get(), get(), get(), get(), get(), get(), accountName, showPersonalSpace)
+        SpacesListViewModel(get(), get(), get(), get(), get(), get(), get(), get(), accountName, showPersonalSpace)
     }
 }

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/SpacesListFragment.kt

@@ -5,7 +5,7 @@
  * @author Jorge Aguado Recio
  * @author Aitor Ballesteros Pavón
  *
- * 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,
@@ -44,8 +44,10 @@ import com.owncloud.android.extensions.toDrawableRes
 import com.owncloud.android.extensions.toSubtitleStringRes
 import com.owncloud.android.extensions.toTitleStringRes
 import com.owncloud.android.presentation.capabilities.CapabilityViewModel
+import com.owncloud.android.presentation.common.UIResult
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
+import timber.log.Timber
 
 class SpacesListFragment : SpacesListAdapter.SpacesListAdapterListener, Fragment(), SearchView.OnQueryTextListener {
     private var _binding: SpacesListFragmentBinding? = null
@@ -120,6 +122,22 @@ class SpacesListFragment : SpacesListAdapter.SpacesListAdapterListener, Fragment
                 setFragmentResult(REQUEST_KEY_CLICK_SPACE, bundleOf(BUNDLE_KEY_CLICK_SPACE to it))
             }
         }
+
+        collectLatestLifecycleFlow(spacesListViewModel.userId) { event ->
+            event?.let {
+                val accountName = requireArguments().getString(BUNDLE_ACCOUNT_NAME)
+                when (val uiResult = event.peekContent()) {
+                    is UIResult.Success -> {
+                        Timber.d ("The account id for $accountName is: ${uiResult.data}")
+                    }
+                    is UIResult.Loading -> { }
+                    is UIResult.Error -> {
+                        Timber.e(uiResult.error, "Failed to retrieve user id for account $accountName")
+                    }
+                }
+            }
+        }
+
     }
 
     private fun showOrHideEmptyView(spacesList: List<OCSpace>) {

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/SpacesListViewModel.kt

@@ -4,7 +4,7 @@
  * @author Juan Carlos Garrote Gascón
  * @author Jorge Aguado Recio
  *
- * 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,
@@ -33,6 +33,10 @@ import com.owncloud.android.domain.spaces.usecases.GetPersonalAndProjectSpacesWi
 import com.owncloud.android.domain.spaces.usecases.GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase
 import com.owncloud.android.domain.spaces.usecases.GetProjectSpacesWithSpecialsForAccountAsStreamUseCase
 import com.owncloud.android.domain.spaces.usecases.RefreshSpacesFromServerAsyncUseCase
+import com.owncloud.android.domain.user.usecases.GetUserIdAsyncUseCase
+import com.owncloud.android.domain.utils.Event
+import com.owncloud.android.extensions.ViewModelExt.runUseCaseWithResult
+import com.owncloud.android.presentation.common.UIResult
 import com.owncloud.android.providers.CoroutinesDispatcherProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -46,6 +50,7 @@ class SpacesListViewModel(
     private val getProjectSpacesWithSpecialsForAccountAsStreamUseCase: GetProjectSpacesWithSpecialsForAccountAsStreamUseCase,
     private val getFileByRemotePathUseCase: GetFileByRemotePathUseCase,
     private val getStoredCapabilitiesUseCase: GetStoredCapabilitiesUseCase,
+    private val getUserIdAsyncUseCase: GetUserIdAsyncUseCase,
     private val coroutinesDispatcherProvider: CoroutinesDispatcherProvider,
     private val accountName: String,
     private val showPersonalSpace: Boolean,
@@ -55,10 +60,16 @@ class SpacesListViewModel(
         MutableStateFlow(SpacesListUiState(spaces = emptyList(), refreshing = false, error = null, searchFilter = ""))
     val spacesList: StateFlow<SpacesListUiState> = _spacesList
 
+    private val _userId = MutableStateFlow<Event<UIResult<String>>?>(null)
+    val userId: StateFlow<Event<UIResult<String>>?> = _userId
+
     init {
         viewModelScope.launch(coroutinesDispatcherProvider.io) {
             refreshSpacesFromServer()
             val capabilities = getStoredCapabilitiesUseCase(GetStoredCapabilitiesUseCase.Params(accountName))
+            if (capabilities?.isSpacesAllowed() == true) {
+                getUserId(accountName)
+            }
             val isMultiPersonal = capabilities?.spaces?.hasMultiplePersonalSpaces
             val spacesListFlow = if (isMultiPersonal == true) getPersonalSpacesWithSpecialsForAccountAsStreamUseCase(
                 GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase.Params(accountName = accountName)
@@ -102,6 +113,16 @@ class SpacesListViewModel(
         _spacesList.update { it.copy(searchFilter = newSearchFilter) }
     }
 
+    private fun getUserId(
+        accountName: String
+    ) = runUseCaseWithResult(
+        coroutineDispatcher = coroutinesDispatcherProvider.io,
+        showLoading = false,
+        flow = _userId,
+        useCase = getUserIdAsyncUseCase,
+        useCaseParams = GetUserIdAsyncUseCase.Params(accountName = accountName)
+    )
+
     data class SpacesListUiState(
         val spaces: List<OCSpace>,
         val rootFolderFromSelectedSpace: OCFile? = null,

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java

@@ -225,6 +225,8 @@ public static class Constants {
 
         public static final String KEY_IS_KITEWORKS_SERVER = "is_kiteworks_server";
 
+        public static final String KEY_ACCOUNT_UUID = "oc_uuid";
+
         public static final int ACCOUNT_VERSION = 1;
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserIdOperation.kt

@@ -0,0 +1,73 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * 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,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.lib.resources.users
+
+import com.owncloud.android.lib.common.OwnCloudClient
+import com.owncloud.android.lib.common.http.HttpConstants
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod
+import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.Moshi
+import timber.log.Timber
+import java.net.URL
+
+class GetRemoteUserIdOperation: RemoteOperation<String>() {
+    override fun run(client: OwnCloudClient): RemoteOperationResult<String> {
+        var result: RemoteOperationResult<String>
+        try {
+            val getMethod = GetMethod(URL(client.baseUri.toString() + GRAPH_ME_ENDPOINT))
+
+            val status = client.executeHttpMethod(getMethod)
+
+            val response = getMethod.getResponseBodyAsString()
+
+            if (status == HttpConstants.HTTP_OK) {
+                Timber.d("Successful response: $response")
+
+                val moshi: Moshi = Moshi.Builder().build()
+                val adapter: JsonAdapter<GraphMeResponse> = moshi.adapter(GraphMeResponse::class.java)
+
+                result = RemoteOperationResult(ResultCode.OK)
+                result.data = getMethod.getResponseBodyAsString().let { adapter.fromJson(it)!!.id }
+
+                Timber.d("Get user id completed and parsed to ${result.data}")
+            } else {
+                result = RemoteOperationResult(getMethod)
+                Timber.e("Failed response while getting user id; status code: $status, response: $response")
+            }
+        } catch (e: Exception) {
+            result = RemoteOperationResult(e)
+            Timber.e(e, "Exception while getting oCIS user id")
+        }
+        return result
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class GraphMeResponse(val id: String)
+
+    companion object {
+        private const val GRAPH_ME_ENDPOINT = "/graph/v1.0/me"
+    }
+
+}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/services/UserService.kt

@@ -34,4 +34,5 @@ interface UserService : Service {
     fun getUserInfo(): RemoteOperationResult<RemoteUserInfo>
     fun getUserQuota(): RemoteOperationResult<GetRemoteUserQuotaOperation.RemoteQuota>
     fun getUserAvatar(avatarDimension: Int): RemoteOperationResult<RemoteAvatarData>
+    fun getUserId(): RemoteOperationResult<String>
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/services/implementation/OCUserService.kt

@@ -29,6 +29,7 @@ package com.owncloud.android.lib.resources.users.services.implementation
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.resources.users.GetRemoteUserAvatarOperation
+import com.owncloud.android.lib.resources.users.GetRemoteUserIdOperation
 import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation
 import com.owncloud.android.lib.resources.users.GetRemoteUserQuotaOperation
 import com.owncloud.android.lib.resources.users.RemoteAvatarData
@@ -45,4 +46,7 @@ class OCUserService(override val client: OwnCloudClient) : UserService {
     override fun getUserAvatar(avatarDimension: Int): RemoteOperationResult<RemoteAvatarData> =
         GetRemoteUserAvatarOperation(avatarDimension).execute(client)
 
+    override fun getUserId(): RemoteOperationResult<String> =
+        GetRemoteUserIdOperation().execute(client)
+
 }