From 9d3f04e014620a877f79f82d6d4f01ec5f2370b1 Mon Sep 17 00:00:00 2001
From: gsmithun4 <gsmithun4@gmail.com>
Date: Thu, 10 Jul 2025 23:09:29 +0530
Subject: [PATCH] fix

---
 .vscode/settings.json                               | 4 ++--
 server/src/modules/auth/util.service.ts             | 4 ++--
 server/src/modules/users/repositories/repository.ts | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index ac6e6079cc..904ccaed80 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,8 +8,8 @@
         "typescript",
         "typescriptreact"
     ],
-    "eslint.format.enable": true,
-    "editor.formatOnSave": true,
+    "eslint.format.enable": false,
+    "editor.formatOnSave": false,
     "json.schemas": [
         {
             "fileMatch": [
diff --git a/server/src/modules/auth/util.service.ts b/server/src/modules/auth/util.service.ts
index db01ee4c0e..ef708cbc6e 100644
--- a/server/src/modules/auth/util.service.ts
+++ b/server/src/modules/auth/util.service.ts
@@ -7,7 +7,7 @@ import { LicenseUserService } from '@modules/licensing/services/user.service';
 import { RolesUtilService } from '@modules/roles/util.service';
 import { OrganizationUser } from '../../entities/organization_user.entity';
 import { generateNextNameAndSlug } from 'src/helpers/utils.helper';
-const uuid = require('uuid');
+import * as uuid from 'uuid';
 import { Organization } from '../../entities/organization.entity';
 import { EntityManager } from 'typeorm';
 import {
@@ -121,7 +121,7 @@ export class AuthUtilService implements IAuthUtilService {
     try {
       const signedJwt = this.sessionUtilService.verifyToken(token);
       return signedJwt;
-    } catch (err) {
+    } catch {
       return null;
     }
   }
diff --git a/server/src/modules/users/repositories/repository.ts b/server/src/modules/users/repositories/repository.ts
index bbc4acaefd..0feacea3d5 100644
--- a/server/src/modules/users/repositories/repository.ts
+++ b/server/src/modules/users/repositories/repository.ts
@@ -98,8 +98,8 @@ export class UserRepository extends Repository<User> {
       const existingUser = await manager.findOne(User, { where: { email: user.email } });
 
       if (existingUser) {
-        Object.assign(existingUser, user);
-        return manager.update(User, { id: existingUser.id }, user);
+        await manager.update(User, { id: existingUser.id }, user);
+        return manager.findOne(User, { where: { id: existingUser.id } });
       } else {
         const newUser = manager.create(User, user);
         return manager.save(User, newUser);