From 7bfac2b95a6318699f64fe043509931f4128891c Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Fri, 29 May 2020 14:12:55 +0300
Subject: [PATCH] chore(authentication): multiple roles

CB-109
---
 .../Users/CreateUserDialog/CreateUserDialog.tsx    |  6 +++---
 .../CreateUserDialog/CreateUserDialogController.ts | 14 ++++++++++++--
 .../src/Administration/UsersManagerService.ts      |  6 ++++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/webapp/packages/authentication/src/Administration/Users/CreateUserDialog/CreateUserDialog.tsx b/webapp/packages/authentication/src/Administration/Users/CreateUserDialog/CreateUserDialog.tsx
index cd28ab1f64..4e3b534e7e 100644
--- a/webapp/packages/authentication/src/Administration/Users/CreateUserDialog/CreateUserDialog.tsx
+++ b/webapp/packages/authentication/src/Administration/Users/CreateUserDialog/CreateUserDialog.tsx
@@ -71,7 +71,7 @@ export const CreateUserDialog: DialogComponent<null, null> = observer(
       []
     );
     const handleRoleChange = useCallback(
-      (value: string) => controller.credentials.role = value,
+      (value: string) => controller.credentials.roles = value,
       []
     );
 
@@ -117,8 +117,8 @@ export const CreateUserDialog: DialogComponent<null, null> = observer(
               <InputField
                 type='role'
                 name='text'
-                value={controller.credentials.role}
-                placeholder={controller.roles.join(', ')}
+                value={controller.credentials.roles}
+                placeholder={controller.roles.join(' ')}
                 onChange={handleRoleChange}
                 disabled={controller.isCreating}
                 mod='surface'
diff --git a/webapp/packages/authentication/src/Administration/Users/CreateUserDialog/CreateUserDialogController.ts b/webapp/packages/authentication/src/Administration/Users/CreateUserDialog/CreateUserDialogController.ts
index 3c2bcba7b0..3095a430d0 100644
--- a/webapp/packages/authentication/src/Administration/Users/CreateUserDialog/CreateUserDialogController.ts
+++ b/webapp/packages/authentication/src/Administration/Users/CreateUserDialog/CreateUserDialogController.ts
@@ -24,7 +24,7 @@ export class CreateUserDialogController implements IInitializableController, IDe
   @observable credentials = {
     login: '',
     password: '',
-    role: '',
+    roles: '',
   };
 
   @computed get roles() {
@@ -61,7 +61,17 @@ export class CreateUserDialogController implements IInitializableController, IDe
       const user = await this.usersManagerService.create(this.credentials.login, false);
       isUserCreated = !!user;
       await this.usersManagerService.updateCredentials(user.userId, { password: this.credentials.password });
-      await this.usersManagerService.grantRole(user.userId, this.credentials.role);
+      if (this.credentials.roles) {
+        const roles = this.credentials.roles
+          .trim()
+          .replace(/\s+/g, ' ')
+          .split(' ');
+
+        for (const role of roles) {
+          await this.usersManagerService.grantRole(user.userId, role);
+        }
+      }
+      await this.usersManagerService.users.refresh(user.userId);
       this.close();
     } catch (exception) {
       if (isUserCreated) {
diff --git a/webapp/packages/authentication/src/Administration/UsersManagerService.ts b/webapp/packages/authentication/src/Administration/UsersManagerService.ts
index 042cad6fe3..4ff6569245 100644
--- a/webapp/packages/authentication/src/Administration/UsersManagerService.ts
+++ b/webapp/packages/authentication/src/Administration/UsersManagerService.ts
@@ -36,9 +36,11 @@ export class UsersManagerService {
     return user as AdminUserInfo;
   }
 
-  async grantRole(userId: string, roleId: string) {
+  async grantRole(userId: string, roleId: string, update?: boolean) {
     await this.graphQLService.gql.grantUserRole({ userId, roleId });
-    await this.users.refresh(userId);
+    if (update) {
+      await this.users.refresh(userId);
+    }
   }
 
   async delete(userId: string, update?: boolean) {