From 122756ebfa7fec9eea4d7c1ba8820d74b3f740c3 Mon Sep 17 00:00:00 2001
From: Yarik Borisenko <73733920+DarkGreeZly@users.noreply.github.com>
Date: Tue, 23 May 2023 23:50:16 +0300
Subject: [PATCH 1/2] Update user-service.js

---
 server/services/user-service.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/services/user-service.js b/server/services/user-service.js
index 6374462..8aebf72 100644
--- a/server/services/user-service.js
+++ b/server/services/user-service.js
@@ -1,3 +1,4 @@
+import {v4 as uuidv4} from 'uuid';
 const bcrypt = require('bcrypt')
 const User = require('../models/user-model')
 const Role = require('../models/role-model')
@@ -15,13 +16,17 @@ class UserService {
         if (password !== rePassword) {
             throw new Error({status: 400, message: 'Паролі не співпадають.'})
         }
+        let uniq_key = await User.findOne({uuid4()});
+        while(uniq_key) {
+            uniq_key = await User.findOne({uuid4()});
+        }
         const hashPassword = await bcrypt.hash(password, 5)
         const {value} = new Role({value: role})
-        const user = new User({email, fullName, login, password: hashPassword, role: value})
+        const user = new User({email, fullName, login, password: hashPassword, role: value, uniq_key: uniq_key})
         return await user.save()
     }
     async updateUser () {}
     async deleteUser () {}
 }
 
-module.exports = new UserService()
\ No newline at end of file
+module.exports = new UserService()

From bba90e37f0b7976f403a1c880f40fbf7f59d5640 Mon Sep 17 00:00:00 2001
From: Yarik Borisenko <73733920+DarkGreeZly@users.noreply.github.com>
Date: Wed, 24 May 2023 11:17:10 +0300
Subject: [PATCH 2/2] Update user-service.js

---
 server/services/user-service.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/services/user-service.js b/server/services/user-service.js
index 8aebf72..09c588c 100644
--- a/server/services/user-service.js
+++ b/server/services/user-service.js
@@ -16,13 +16,15 @@ class UserService {
         if (password !== rePassword) {
             throw new Error({status: 400, message: 'Паролі не співпадають.'})
         }
-        let uniq_key = await User.findOne({uuid4()});
+        let uniq_id = uuid4();
+        let uniq_key = await User.findOne({uniq_id});
         while(uniq_key) {
-            uniq_key = await User.findOne({uuid4()});
+            uniq_id = uuid4();
+            uniq_key = await User.findOne({uniq_id});
         }
         const hashPassword = await bcrypt.hash(password, 5)
         const {value} = new Role({value: role})
-        const user = new User({email, fullName, login, password: hashPassword, role: value, uniq_key: uniq_key})
+        const user = new User({email, fullName, login, password: hashPassword, role: value, uniq_key: uniq_id})
         return await user.save()
     }
     async updateUser () {}