From 60df8a14033fe1465320ce9970e3f44f78da8428 Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Tue, 2 Nov 2021 22:27:39 +0300
Subject: [PATCH] fix(plugin-authentication): CB-1355 users meta parameters

---
 .../src/Administration/Users/UserForm/UserFormController.ts   | 1 +
 .../src/Administration/Users/UserForm/UserInfo.tsx            | 2 +-
 .../src/Administration/Users/UsersTable/UserEditController.ts | 4 ++--
 webapp/packages/plugin-authentication/src/locales/en.ts       | 1 +
 webapp/packages/plugin-authentication/src/locales/it.ts       | 1 +
 webapp/packages/plugin-authentication/src/locales/ru.ts       | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts
index c4ce7ff5ca..bb1777d7ac 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts
@@ -296,6 +296,7 @@ export class UserFormController implements IInitializableController, IDestructib
 
   private async loadUser() {
     try {
+      this.credentials.metaParameters = this.user.metaParameters;
       this.credentials.login = this.user.userId;
       this.credentials.roles = new Map(this.user.grantedRoles.map(roleId => ([roleId, true])));
     } catch (exception) {
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserInfo.tsx b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserInfo.tsx
index 53252779ca..d6c005c7cf 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserInfo.tsx
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserInfo.tsx
@@ -109,7 +109,7 @@ export const UserInfo: TabContainerPanelComponent<IUserFormProps> = observer(fun
       <Loader state={userMetaParameters} inline>
         {() => userMetaParameters.data.length > 0 && styled(style)(
           <Group small gap vertical overflow>
-            <GroupTitle keepSize>{translate('authentication_user_credentials')}</GroupTitle>
+            <GroupTitle keepSize>{translate('authentication_user_meta_parameters')}</GroupTitle>
 
             <Container wrap gap>
               <ObjectPropertyInfoForm
diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEditController.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEditController.ts
index d0ebf63bc6..1a3c151e61 100644
--- a/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEditController.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/Users/UsersTable/UserEditController.ts
@@ -56,7 +56,7 @@ implements IInitializableController, IDestructibleController {
   private async loadUser() {
     try {
       // we create a copy to protect the current value from mutation
-      await this.usersResource.load(this.userId);
+      await this.usersResource.load(this.userId, ['includeMetaParameters']);
       await this.updateUser(this.userId);
     } catch (exception) {
       this.notificationService.logException(exception, `Can't load user ${this.userId}`);
@@ -67,6 +67,6 @@ implements IInitializableController, IDestructibleController {
     if (!ResourceKeyUtils.includes(key, this.userId)) {
       return;
     }
-    this.user = JSON.parse(JSON.stringify(await this.usersResource.load(this.userId)));
+    this.user = JSON.parse(JSON.stringify(await this.usersResource.load(this.userId, ['includeMetaParameters'])));
   }
 }
diff --git a/webapp/packages/plugin-authentication/src/locales/en.ts b/webapp/packages/plugin-authentication/src/locales/en.ts
index 03f9426f75..6f3a9b1d4f 100644
--- a/webapp/packages/plugin-authentication/src/locales/en.ts
+++ b/webapp/packages/plugin-authentication/src/locales/en.ts
@@ -35,6 +35,7 @@ export default [
 
   ['authentication_user_name', 'User name'],
   ['authentication_user_credentials', 'Credentials'],
+  ['authentication_user_meta_parameters', 'Parameters'],
   ['authentication_user_current_password', 'Current password'],
   ['authentication_user_new_password', 'New password'],
   ['authentication_user_password', 'User password'],
diff --git a/webapp/packages/plugin-authentication/src/locales/it.ts b/webapp/packages/plugin-authentication/src/locales/it.ts
index 34818ef585..a4de4b8893 100644
--- a/webapp/packages/plugin-authentication/src/locales/it.ts
+++ b/webapp/packages/plugin-authentication/src/locales/it.ts
@@ -27,6 +27,7 @@ export default [
   ['authentication_administration_user_create_failed', 'Errore di creazione nuovo utente'],
   ['authentication_user_name', 'Nome utente'],
   ['authentication_user_credentials', 'Credenziali'],
+  ['authentication_user_meta_parameters', 'Parameters'],
   ['authentication_user_current_password', 'Password corrente'],
   ['authentication_user_new_password', 'Nuova password'],
   ['authentication_user_password', 'Password utente'],
diff --git a/webapp/packages/plugin-authentication/src/locales/ru.ts b/webapp/packages/plugin-authentication/src/locales/ru.ts
index 8370c602fd..d880776fd6 100644
--- a/webapp/packages/plugin-authentication/src/locales/ru.ts
+++ b/webapp/packages/plugin-authentication/src/locales/ru.ts
@@ -34,6 +34,7 @@ export default [
 
   ['authentication_user_name', 'Имя'],
   ['authentication_user_credentials', 'Учетные данные'],
+  ['authentication_user_meta_parameters', 'Параметры'],
   ['authentication_user_current_password', 'Текущий пароль'],
   ['authentication_user_new_password', 'Новый пароль'],
   ['authentication_user_password', 'Пароль'],