Merge pull request #34112 from nextcloud/backport/33819/stable24

[stable24] Fix translation of user exists error server-side
nextcloud · Sep 22, 2022 · 6d81987 · 6d81987
2 parents 85b5d72 + d864ea3
commit 6d81987
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -350,7 +350,7 @@ public function addUser(
 
 		if ($this->userManager->userExists($userid)) {
 			$this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
-			throw new OCSException('User already exists', 102);
+			throw new OCSException($this->l10nFactory->get('provisioning_api')->t('User already exists'), 102);
 		}
 
 		if ($groups !== []) {

diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
@@ -267,6 +267,12 @@ public function testAddUserAlreadyExisting() {
 			->method('isAdmin')
 			->with('adminUser')
 			->willReturn(true);
+		$l10n = $this->createMock(IL10N::class);
+		$this->l10nFactory
+			->expects($this->once())
+			->method('get')
+			->with('provisioning_api')
+			->willReturn($l10n);
 
 		$this->api->addUser('AlreadyExistingUser', 'password', '', '', []);
 	}

diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js
@@ -30,7 +30,6 @@ import api from './api'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import logger from '../logger'
-import { showError } from '@nextcloud/dialogs'
 
 const orderGroups = function(groups, orderBy) {
 	/* const SORT_USERCOUNT = 1;
@@ -553,13 +552,6 @@ const actions = {
 				.then((response) => dispatch('addUserData', userid || response.data.ocs.data.id))
 				.catch((error) => { throw error })
 		}).catch((error) => {
-			const statusCode = error?.response?.data?.ocs?.meta?.statuscode
-
-			if (statusCode === 102) {
-				showError(t('settings', 'User already exists.'))
-				throw error
-			}
-
 			commit('API_FAILURE', { userid, error })
 			throw error
 		})