From da198c7706fbc244e644665a4e9b5026e929d9de Mon Sep 17 00:00:00 2001
From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Fri, 1 Dec 2017 12:17:27 +0100
Subject: Fix issue in users admin when editing user without scm accounts

---
 server/sonar-web/src/main/js/api/users.ts                       | 4 ++--
 server/sonar-web/src/main/js/apps/users/components/UserForm.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/sonar-web/src/main/js/api/users.ts b/server/sonar-web/src/main/js/api/users.ts
index f78343b5969..d04b71bcd55 100644
--- a/server/sonar-web/src/main/js/api/users.ts
+++ b/server/sonar-web/src/main/js/api/users.ts
@@ -33,7 +33,7 @@ export interface User {
   name: string;
   active: boolean;
   email?: string;
-  scmAccounts: string[];
+  scmAccounts?: string[];
   groups?: string[];
   tokensCount?: number;
   local: boolean;
@@ -90,7 +90,7 @@ export function updateUser(data: {
   email?: string;
   login: string;
   name?: string;
-  scmAccount: string[];
+  scmAccount?: string;
 }): Promise<User> {
   return postJSON('/api/users/update', data);
 }
diff --git a/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx b/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx
index 292d13f85c8..500594e7413 100644
--- a/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx
+++ b/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx
@@ -54,7 +54,7 @@ export default class UserForm extends React.PureComponent<Props, State> {
         login: user.login,
         name: user.name,
         password: '',
-        scmAccounts: user.scmAccounts,
+        scmAccounts: user.scmAccounts || [],
         submitting: false
       };
     } else {
@@ -124,7 +124,7 @@ export default class UserForm extends React.PureComponent<Props, State> {
       email: this.state.email || undefined,
       login: this.state.login,
       name: this.state.name,
-      scmAccount: uniq(this.state.scmAccounts)
+      scmAccount: uniq(this.state.scmAccounts).join(',')
     }).then(() => {
       this.props.onUpdateUsers();
       this.props.onClose();
-- 
cgit v1.2.3