GG-19546 Fixed creation of user by admin. (#168)

gridgain · Jun 19, 2019 · 37a121c · 37a121c
1 parent 1d2119d
commit 37a121c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/modules/web-console/frontend/app/components/dialog-admin-create-user/controller.ts b/modules/web-console/frontend/app/components/dialog-admin-create-user/controller.ts
@@ -70,10 +70,10 @@ export class DialogAdminCreateUser {
                 this.IgniteMessages.showInfo(`User ${this.data.email} created`);
                 this.close({});
             })
-            .catch((res) => {
+            .catch((err) => {
                 this.loading.finish('createUser');
-                this.IgniteMessages.showError(null, res.data);
-                this.setServerError(res.data);
+                this.IgniteMessages.showError(null, err);
+                this.setServerError(err.message);
             });
     }
 }
diff --git a/modules/web-console/frontend/app/core/admin/Admin.data.js b/modules/web-console/frontend/app/core/admin/Admin.data.js
@@ -106,6 +106,6 @@ export default class IgniteAdminData {
     registerUser(userInfo) {
         return this.$http.put('/api/v1/admin/users', userInfo)
             .then(({ data }) => data)
-            .catch(this.Messages.showError);
+            .catch(({data}) => {throw data;});
     }
 }
diff --git a/...nsole-server/src/main/java/org/apache/ignite/console/repositories/AccountsRepository.java b/...nsole-server/src/main/java/org/apache/ignite/console/repositories/AccountsRepository.java
@@ -55,7 +55,7 @@ public AccountsRepository(Ignite ignite, TransactionManager txMgr) {
         this.txMgr = txMgr;
 
         accountsTbl = new Table<Account>(ignite, "accounts")
-            .addUniqueIndex(Account::getUsername, (acc) -> "Account with email '" + acc.getUsername() + "' already registered")
+            .addUniqueIndex(a -> a.getUsername().trim().toLowerCase(), (acc) -> "Account with email '" + acc.getUsername() + "' already registered")
             .addUniqueIndex(Account::getToken, (acc) -> "Account with token '" + acc.getToken() + "' already registered");
     }
 
@@ -117,9 +117,6 @@ public boolean ensureFirstUser() {
      */
     public Account create(Account account) throws AuthenticationServiceException {
         try (Transaction tx = txMgr.txStart()) {
-            if (accountsTbl.getByIndex(account.getUsername()) != null)
-                throw new IgniteException("Account with email already exists: " + account.getUsername());
-
             account.setAdmin(ensureFirstUser());
 
             save(account);

diff --git a/.../web-console-server/src/main/java/org/apache/ignite/console/services/AccountsService.java b/.../web-console-server/src/main/java/org/apache/ignite/console/services/AccountsService.java
@@ -246,16 +246,6 @@ public Account save(UUID accId, ChangeUserRequest changes) {
         try (Transaction tx = txMgr.txStart()) {
             Account acc = accountsRepo.getById(accId);
 
-            String oldEmail = acc.getEmail();
-            String newEmail = changes.getEmail();
-
-            if (!oldEmail.equals(newEmail)) {
-                Account accByEmail = accountsRepo.getByEmail(oldEmail);
-
-                if (!acc.getId().equals(accByEmail.getId()))
-                    throw new IllegalStateException("User with this email already registered");
-            }
-
             String oldTok = acc.getToken();
 
             acc.update(changes);