From ba03f92a94aa804574edc29f6ca4e77f629f09c8 Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Mon, 9 Jan 2023 10:07:55 +0100
Subject: [PATCH 01/23] add backend routes for delete and edit

---
 .../Deskstar/Controllers/UserController.cs    | 114 +++++++++++++++++-
 .../Deskstar/Usecases/UserUsecases.cs         |  77 +++++++++++-
 2 files changed, 184 insertions(+), 7 deletions(-)

diff --git a/src/deskstar-backend/Deskstar/Controllers/UserController.cs b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
index 477faee5..c5e7601b 100644
--- a/src/deskstar-backend/Deskstar/Controllers/UserController.cs
+++ b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
@@ -13,17 +13,18 @@ namespace Deskstar.Controllers;
 [Produces("application/json")]
 public class UserController : ControllerBase
 {
-
     private readonly IUserUsecases _userUsecases;
     private readonly ILogger<UserController> _logger;
     private readonly IAutoMapperConfiguration _autoMapperConfiguration;
 
-    public UserController(ILogger<UserController> logger, IUserUsecases userUsecases, IAutoMapperConfiguration autoMapperConfiguration)
+    public UserController(ILogger<UserController> logger, IUserUsecases userUsecases,
+        IAutoMapperConfiguration autoMapperConfiguration)
     {
         _logger = logger;
         _userUsecases = userUsecases;
         _autoMapperConfiguration = autoMapperConfiguration;
     }
+
     /// <summary>
     /// Returns all users for a specific company
     /// </summary>
@@ -65,6 +66,7 @@ public IActionResult Get()
             return Problem(statusCode: 500);
         }
     }
+
     /// <summary>
     /// Returns user specific information
     /// </summary>
@@ -212,6 +214,7 @@ public IActionResult DeclineUser(string userId)
             return Problem(statusCode: 500);
         }
     }
+
     /// <summary>
     /// Update user information
     /// </summary>
@@ -232,14 +235,13 @@ public IActionResult DeclineUser(string userId)
     public IActionResult UpdateUser(UserProfileDto userDto)
     {
         var userId = RequestInteractions.ExtractIdFromRequest(Request);
-
         try
         {
             var mapper = _autoMapperConfiguration.GetConfiguration().CreateMapper();
             var user = mapper.Map<UserProfileDto, User>(userDto);
+            
+            _userUsecases.UpdateUser(userId, user);
 
-            _userUsecases.UpdateUser(user);
-
             return Ok();
         }
         catch (EntityNotFoundException e)
@@ -253,4 +255,106 @@ public IActionResult UpdateUser(UserProfileDto userDto)
             return Problem(statusCode: 500);
         }
     }
+    
+    /// <summary>
+    /// Update given user information
+    /// </summary>
+    /// <returns> empty response </returns>
+    /// <remarks>
+    /// Sample request:
+    ///     Post /edit
+    /// </remarks>
+    ///
+    /// <response code="200">Empty Response</response>
+    /// <response code="400">Bad Request</response>
+    /// <response code="403">Forbid</response>
+    /// <response code="404">Not Found</response>
+    /// <response code="500">Internal Server Error</response>
+    [HttpPost("edit")]
+    [Authorize(Policy = "Admin")]
+    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status403Forbidden)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+    public IActionResult UpdateGivenUser(UserProfileDto userDto)
+    {
+        var adminId = RequestInteractions.ExtractIdFromRequest(Request);
+        try
+        {
+            var mapper = _autoMapperConfiguration.GetConfiguration().CreateMapper();
+            var user = mapper.Map<UserProfileDto, User>(userDto);
+            _userUsecases.UpdateUser(adminId,user);
+            return Ok();
+        }
+        catch (ArgumentInvalidException e)
+        {
+            _logger.LogError(e, e.Message);
+            return BadRequest(e.Message);
+        }
+        catch (InsufficientPermissionException e)
+        {
+            _logger.LogError(e, e.Message);
+            return Forbid(e.Message);
+        }
+        catch (EntityNotFoundException e)
+        {
+            _logger.LogError(e, e.Message);
+            return NotFound(e.Message);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, e.Message);
+            return Problem(statusCode: 500);
+        }
+    }
+    
+    /// <summary>
+    /// Delete given user
+    /// </summary>
+    /// <returns> empty response </returns>
+    /// <remarks>
+    /// Sample request:
+    ///     Post /delete/{userId}
+    /// </remarks>
+    ///
+    /// <response code="200">Empty Response</response>
+    /// <response code="404">Not Found</response>
+    /// <response code="500">Internal Server Error</response>
+    [HttpPost("/delete/{userId}")]
+    [Authorize(Policy = "Admin")]
+    [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status403Forbidden)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+    public IActionResult DeleteGivenUser(string userId)
+    {
+        var adminId = RequestInteractions.ExtractIdFromRequest(Request);
+        try
+        {
+           _userUsecases.DeleteUser(adminId, userId);
+            return Ok();
+        }
+        catch (ArgumentInvalidException e)
+        {
+            _logger.LogError(e, e.Message);
+            return BadRequest(e.Message);
+        }
+        catch (InsufficientPermissionException e)
+        {
+            _logger.LogError(e, e.Message);
+            return Forbid(e.Message);
+        }
+        catch (EntityNotFoundException e)
+        {
+            _logger.LogError(e, e.Message);
+            return NotFound(e.Message);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, e.Message);
+            return Problem(statusCode: 500);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
index 5a480bb8..8e2a7ad2 100644
--- a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
+++ b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
@@ -8,10 +8,13 @@ namespace Deskstar.Usecases;
 public interface IUserUsecases
 {
     public List<User> ReadAllUsers(Guid adminId);
-    public Guid UpdateUser(User user);
     public User ReadSpecificUser(Guid userId);
+    
+    public Guid UpdateUser(string requestUserId, User user);
     public Guid ApproveUser(Guid adminId, string userId);
     public Guid DeclineUser(Guid adminId, string userId);
+    public Guid UpdateUser(Guid adminId, User user);
+    public Guid DeleteUser(Guid adminId, string userId);
 }
 
 public class UserUsecases : IUserUsecases
@@ -100,13 +103,83 @@ public List<User> ReadAllUsers(Guid adminId)
         return _context.Users.Where(user => user.CompanyId == admin.CompanyId).ToList();
     }
 
-    public Guid UpdateUser(User user)
+    
+    public Guid UpdateUser(string requestUserId, User user)
+    {
+        Guid guid;
+        try
+        {
+            guid = new Guid(requestUserId);
+        }
+        catch (Exception e) when (e is FormatException or ArgumentNullException or OverflowException)
+        {
+            _logger.LogError(e, e.Message);
+            throw new ArgumentInvalidException($"'{requestUserId}' is not a valid UserId");
+        }
+
+        if (!guid.Equals(user.UserId))
+        {
+            throw new ArgumentInvalidException($"'{requestUserId}' is not equals with given userObject");
+        }
+        
+        return SaveUpdateUser(user);
+    }
+    
+    public Guid UpdateUser(Guid adminId, User user)
+    {
+        var userDbInstance = _context.Users.SingleOrDefault(u => u.UserId == user.UserId);
+        if (userDbInstance == null)
+            throw new EntityNotFoundException($"There is no user with id '{user.UserId}'");
+        CheckSameCompany(adminId,user.UserId);
+        return SaveUpdateUser(user);
+    }
+    private Guid SaveUpdateUser( User user)
     {
         var userDbInstance = _context.Users.SingleOrDefault(u => u.UserId == user.UserId);
         if (userDbInstance == null)
             throw new EntityNotFoundException($"There is no user with id '{user.UserId}'");
         _context.Users.Update(user);
         _context.SaveChanges();
+        //ToDo: uncomment
+        var body = $"Hello {user.FirstName},</br> " +
+                   "your account details have been updated.</br> " +
+                   "Please check if this was ok.</br>"+
+                   "If not get in touch with your company admin.</br>" +
+                   "</br> " +
+                   "Regards,</br> " +
+                   "Deskstar Team";
+        //EmailHelper.SendEmail(_logger, user.MailAddress, "Your Deskstar account details have been updated!", body);
         return user.UserId;
     }
+    
+    public Guid DeleteUser(Guid adminId,string userId)
+    {
+        Guid guid;
+        try
+        {
+            guid = new Guid(userId);
+        }
+        catch (Exception e) when (e is FormatException or ArgumentNullException or OverflowException)
+        {
+            _logger.LogError(e, e.Message);
+            throw new ArgumentInvalidException($"'{userId}' is not a valid UserId");
+        }
+        
+        var userDbInstance = _context.Users.SingleOrDefault(u => u.UserId == guid);
+        if (userDbInstance == null)
+            throw new EntityNotFoundException($"There is no user with id '{userId}'");
+        CheckSameCompany(adminId,guid);
+        var body = $"Hello {userDbInstance.FirstName},</br> " +
+                   "your account has been releted by your Company admin.</br> " +
+                   "If you think this was an mistake, get in touch with your company admin.</br>" +
+                   "</br> " +
+                   "Regards,</br> " +
+                   "Deskstar Team";
+        //ToDo: uncomment
+        //EmailHelper.SendEmail(_logger, user.MailAddress, "Your Deskstar account details have been updated!", body);
+        _context.Users.Remove(userDbInstance);
+        _context.SaveChanges();
+        
+        return guid;
+    }
 }
\ No newline at end of file

From e02bb19a5eb12923ebdcd45236424bfeec2047cb Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Mon, 9 Jan 2023 11:20:27 +0100
Subject: [PATCH 02/23] added tests

---
 .../Deskstar/Usecases/UserUsecases.cs         |  1 -
 .../Teststar.Tests/Tests/UserUsecasesTests.cs | 66 ++++++++++++++++++-
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
index 8e2a7ad2..09ae2a27 100644
--- a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
+++ b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
@@ -102,7 +102,6 @@ public List<User> ReadAllUsers(Guid adminId)
             throw new EntityNotFoundException($"There is no admin with id '{adminId}'");
         return _context.Users.Where(user => user.CompanyId == admin.CompanyId).ToList();
     }
-
     
     public Guid UpdateUser(string requestUserId, User user)
     {
diff --git a/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs b/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs
index 6bd2c618..b3f6267a 100644
--- a/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs
+++ b/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs
@@ -234,7 +234,7 @@ public void UpdateUser_WhenValidUserIsProvided_ShouldUpdateUser()
         var userUsecases = new UserUsecases(logger.Object, db);
 
         //act
-        var result = userUsecases.UpdateUser(user);
+        var result = userUsecases.UpdateUser(user.UserId,user);
 
         //assert
         Assert.That(result == user.UserId);
@@ -255,9 +255,31 @@ public void UpdateUser_WhenInvalidUserIsProvided_ShouldThrowEntityNotFoundExcept
         var userUsecases = new UserUsecases(logger.Object, db);
 
         //act + assert
-        Assert.Throws<EntityNotFoundException>(() => userUsecases.UpdateUser(new User()));
+        Assert.Throws<EntityNotFoundException>(() => userUsecases.UpdateUser(new Guid(),new User()));
 
     }
+    [Test]
+    public void UpdateUser_AsAdmin_WhenValidUserIsProvided_ShouldUpdateUser()
+    {
+        //setup
+        using var db = new DataContext();
+        User user, admin;
+        bool isUserApproved = true;
+
+        SetupSingleUser(db, isUserApproved, out user, out admin);
+
+        //arrange
+        var logger = new Mock<ILogger<UserUsecases>>();
+        var userUsecases = new UserUsecases(logger.Object, db);
+
+        //act
+        var result = userUsecases.UpdateUser(admin.UserId,user);
+
+        //assert
+        Assert.That(result == user.UserId);
+
+    }
+    
     [Test]
     public void ReadAllUsers_WhenValidUserIdIsProvided_ShouldReturnListOfAllUsersInTheSameCompany()
     {
@@ -298,6 +320,46 @@ public void ReadAllUsers_WhenInvalidUserIdIsProvided_ShouldThrowEntityNotFoundEx
         Assert.Throws<EntityNotFoundException>(() => userUsecases.ReadAllUsers(new Guid()));
 
     }
+    
+    [Test]
+    public void DeleteUser_WhenValidUserIsProvided_ShouldUpdateUser()
+    {
+        //setup
+        using var db = new DataContext();
+        User user, admin;
+        const bool isUserApproved = true;
+
+        SetupSingleUser(db, isUserApproved, out user, out admin);
+
+        //arrange
+        var logger = new Mock<ILogger<UserUsecases>>();
+        var userUsecases = new UserUsecases(logger.Object, db);
+
+        //act
+        var result = userUsecases.DeleteUser(admin.UserId,user.UserId.ToString());
+
+        //assert
+        Assert.That(result, Is.EqualTo(user.UserId));
+        Assert.That(!db.Users.Any(u => u.UserId==user.UserId));
+
+    }
+    [Test]
+    public void DeleteUser_WhenNonValidUserIsProvided_ShouldUpdateUser()
+    {
+        //setup
+        using var db = new DataContext();
+        User user, admin;
+        const bool isUserApproved = true;
+
+        SetupSingleUser(db, isUserApproved, out user, out admin);
+
+        //arrange
+        var logger = new Mock<ILogger<UserUsecases>>();
+        var userUsecases = new UserUsecases(logger.Object, db);
+        
+        //assert
+        Assert.Throws<EntityNotFoundException>(() => userUsecases.DeleteUser(admin.UserId,Guid.NewGuid().ToString()));
+    }
 
     private void SetupSingleUser(DataContext db, bool userApproved, out User user, out User admin)
     {

From 2d8544b6d4229584142128e193d7a18e229b8389 Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Mon, 9 Jan 2023 12:01:47 +0100
Subject: [PATCH 03/23] added frontend

---
 .../Deskstar/Controllers/UserController.cs    |  2 +-
 src/deskstar-frontend/lib/api/UserService.ts  | 26 +++++++++++
 src/deskstar-frontend/pages/users/index.tsx   | 44 +++++++++++++++----
 3 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/src/deskstar-backend/Deskstar/Controllers/UserController.cs b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
index c5e7601b..01f2e266 100644
--- a/src/deskstar-backend/Deskstar/Controllers/UserController.cs
+++ b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
@@ -321,7 +321,7 @@ public IActionResult UpdateGivenUser(UserProfileDto userDto)
     /// <response code="200">Empty Response</response>
     /// <response code="404">Not Found</response>
     /// <response code="500">Internal Server Error</response>
-    [HttpPost("/delete/{userId}")]
+    [HttpDelete("/delete/{userId}")]
     [Authorize(Policy = "Admin")]
     [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
diff --git a/src/deskstar-frontend/lib/api/UserService.ts b/src/deskstar-frontend/lib/api/UserService.ts
index 6100e1d1..275e4aac 100644
--- a/src/deskstar-frontend/lib/api/UserService.ts
+++ b/src/deskstar-frontend/lib/api/UserService.ts
@@ -54,6 +54,32 @@ export function declineUser(
   });
 }
 
+export function deleteUser(
+  session: Session,
+  userId: string
+): Promise<Response> {
+  return fetch(BACKEND_URL + `/users/delete/${userId}`, {
+    method: "DELETE",
+    headers: {
+      Authorization: `Bearer ${session.accessToken}`,
+    },
+  });
+}
+
+export function editUser(
+  session: Session,
+  user: IUser
+  ): Promise<Response> {
+  return fetch(BACKEND_URL + `/users/edit`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${session.accessToken}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(user)
+  });
+}
+
 type UserResponse = {
   userId: string;
   firstName: string;
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index 6fd4d5d4..64c7fffb 100644
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -5,12 +5,12 @@ import { IUser } from "../../types/users";
 import { useSession } from "next-auth/react";
 import { useRouter } from "next/router";
 import { useState, useEffect } from "react";
-import { getUsers } from "../../lib/api/UserService";
+import { getUsers, deleteUser, editUser } from "../../lib/api/UserService";
 import { authOptions } from "../api/auth/[...nextauth]";
 import { unstable_getServerSession } from "next-auth";
 
 export default function UsersOverview({ users }: { users: IUser[] }) {
-  const { data: session } = useSession();
+  let { data: session } = useSession();
   const [calledRouter, setCalledRouter] = useState(false);
   const router = useRouter();
 
@@ -26,6 +26,10 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     }
   }, [router, session, calledRouter]);
 
+  if (session == null) {
+    return;
+  }
+
   const onPermissionUpdate = async (user: IUser): Promise<void> => {
     //TODO: Implement
     if (user.isAdmin) console.log(`Demoting user ${user.userId}...`);
@@ -37,16 +41,15 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     console.log(`Editing user ${user.userId}...`);
   };
 
-  const onDelete = async (user: IUser): Promise<void> => {
-    //TODO: Implement
+  async function onDelete(user: IUser) {
+    //Show aller
+  }
+  const doDelete = async (user: IUser) => {
     console.log(`Deleting user ${user.userId}...`);
+    if (session == null) return;
+    deleteUser(session, user.userId);
   };
 
-  if (!session?.user?.isAdmin) {
-    //TODO: Add loading animation
-    return <div>Loading...</div>;
-  }
-
   return (
     <>
       <Head>
@@ -59,6 +62,29 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
         onEdit={onEdit}
         onDelete={onDelete}
       />
+      <div className="alert alert-warning shadow-lg">
+        <div>
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            className="stroke-current flex-shrink-0 h-6 w-6"
+            fill="none"
+            viewBox="0 0 24 24"
+          >
+            <path
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="2"
+              d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+            />
+          </svg>
+          <span>Warning: This can't be undone!</span>
+          <div className="flex-none">
+            <button className="btn btn-sm btn-ghost" onClick={() => doDelete}>
+              DELETE
+            </button>
+          </div>
+        </div>
+      </div>
     </>
   );
 }

From 1042e2a821c90a1bc503c660976c217365367a10 Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Mon, 9 Jan 2023 12:18:13 +0100
Subject: [PATCH 04/23] fix git attributes

---
 .gitattributes                              | 1 +
 src/deskstar-frontend/pages/users/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..94f480de
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
\ No newline at end of file
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index 64c7fffb..c78a02bb 100644
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -77,7 +77,7 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
               d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
             />
           </svg>
-          <span>Warning: This can't be undone!</span>
+          <span>Warning: This can&apos;t be undone!</span>
           <div className="flex-none">
             <button className="btn btn-sm btn-ghost" onClick={() => doDelete}>
               DELETE

From d6061443038ca7e8df86d20f72291ab6f00fdae0 Mon Sep 17 00:00:00 2001
From: xilef45 <felix.l.lang@fau.de>
Date: Mon, 9 Jan 2023 15:51:19 +0100
Subject: [PATCH 05/23] added modals

---
 .../components/ConfirmModal.tsx               | 44 +++++++++++++++++++
 .../components/EditUserModal.tsx              | 41 +++++++++++++++++
 src/deskstar-frontend/pages/users/index.tsx   | 35 +++++----------
 3 files changed, 97 insertions(+), 23 deletions(-)
 create mode 100644 src/deskstar-frontend/components/ConfirmModal.tsx
 create mode 100644 src/deskstar-frontend/components/EditUserModal.tsx

diff --git a/src/deskstar-frontend/components/ConfirmModal.tsx b/src/deskstar-frontend/components/ConfirmModal.tsx
new file mode 100644
index 00000000..3c8d7777
--- /dev/null
+++ b/src/deskstar-frontend/components/ConfirmModal.tsx
@@ -0,0 +1,44 @@
+import { useState } from 'react';
+import { Dialog } from '@headlessui/react';
+import React from 'react';
+
+export default function ConfirmModal({
+    title,
+    description,
+    text, 
+     warn,
+     buttonText,
+     action
+  }: {
+    title: string;
+    description: string;
+    text: string;
+    warn: boolean;
+    buttonText: string;
+    action: Function;
+  }) {
+  let [isOpen, setIsOpen] = useState(true);
+  let buttonClass="";
+  if( warn)
+    buttonClass+="btn-warning";
+
+  return (
+    <Dialog open={isOpen} onClose={() => setIsOpen(false)}>
+      <Dialog.Panel>
+        <Dialog.Title>{title}</Dialog.Title>
+        <Dialog.Description>
+        {description}
+        </Dialog.Description>
+        <p>
+            {warn&&(
+        <svg xmlns="http://www.w3.org/2000/svg" className="stroke-current flex-shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" /></svg>
+            )}
+            {text}
+        </p>
+        <button className={buttonClass} onClick={() => {setIsOpen(false); action();}}>{buttonText}</button>
+        
+        <button onClick={() => setIsOpen(false)}>Cancel</button>
+      </Dialog.Panel>
+    </Dialog>
+  )
+}
\ No newline at end of file
diff --git a/src/deskstar-frontend/components/EditUserModal.tsx b/src/deskstar-frontend/components/EditUserModal.tsx
new file mode 100644
index 00000000..69de112a
--- /dev/null
+++ b/src/deskstar-frontend/components/EditUserModal.tsx
@@ -0,0 +1,41 @@
+import { useState } from 'react';
+import { Dialog } from '@headlessui/react';
+import {IUser} from "../types/users";
+import Input from "./forms/Input";
+
+import React from 'react';
+
+export default function EditUserModal({
+    user,
+    action,
+  }: {
+    user: IUser;
+    action: Function;
+  }) {
+  let [isOpen, setIsOpen] = useState(true)
+
+  const [firstName, setFirstName] = useState("");
+  const [lastName, setLastName] = useState("");
+  const [email, setEmail] = useState("");
+
+  return (
+    <Dialog open={isOpen} onClose={() => setIsOpen(false)}>
+      <Dialog.Panel>
+        <Dialog.Title>Edit {user.firstName} {user.lastName} </Dialog.Title>
+        <div>
+            <div>
+            <Input name="first name" onChange={(e) => { setFirstName(e.target.value) }} value={user.firstName} placeholder="first name" />
+            <Input name="last name" onChange={(e) => { setLastName(e.target.value) }} value={user.lastName} placeholder="last name" />
+            </div>
+            <br/>
+            <div>
+            <Input name="E-Mail" onChange={(e) => { setEmail(e.target.value) }} value={user.firstName} placeholder="E-Mail" />
+                
+            </div>
+        </div>
+        <button className="btn-success" onClick={() => {setIsOpen(false); action(firstName,lastName, email);}}>Save</button>
+        <button onClick={() => setIsOpen(false)}>Cancel</button>
+      </Dialog.Panel>
+    </Dialog>
+  )
+}
\ No newline at end of file
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index c78a02bb..37191864 100644
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -8,11 +8,16 @@ import { useState, useEffect } from "react";
 import { getUsers, deleteUser, editUser } from "../../lib/api/UserService";
 import { authOptions } from "../api/auth/[...nextauth]";
 import { unstable_getServerSession } from "next-auth";
+import  ConfirmModal from "../../components/ConfirmModal";
+import  EditUserModal  from "../../components/EditUserModal";
+
 
 export default function UsersOverview({ users }: { users: IUser[] }) {
   let { data: session } = useSession();
   const [calledRouter, setCalledRouter] = useState(false);
   const router = useRouter();
+  
+  const [user, setUser] = useState<IUser>();
 
   // page is only accessable as admin
   useEffect(() => {
@@ -39,6 +44,7 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
   const onEdit = async (user: IUser): Promise<void> => {
     //TODO: Implement
     console.log(`Editing user ${user.userId}...`);
+    setUser(user);
   };
 
   async function onDelete(user: IUser) {
@@ -49,6 +55,10 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     if (session == null) return;
     deleteUser(session, user.userId);
   };
+  const saveEdit= async (user:IUser)=>{
+    console.log(`Edit user ${user.userId}...`);
+    //send edit
+  }
 
   return (
     <>
@@ -62,29 +72,8 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
         onEdit={onEdit}
         onDelete={onDelete}
       />
-      <div className="alert alert-warning shadow-lg">
-        <div>
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            className="stroke-current flex-shrink-0 h-6 w-6"
-            fill="none"
-            viewBox="0 0 24 24"
-          >
-            <path
-              strokeLinecap="round"
-              strokeLinejoin="round"
-              strokeWidth="2"
-              d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
-            />
-          </svg>
-          <span>Warning: This can&apos;t be undone!</span>
-          <div className="flex-none">
-            <button className="btn btn-sm btn-ghost" onClick={() => doDelete}>
-              DELETE
-            </button>
-          </div>
-        </div>
-      </div>
+      <ConfirmModal title="Delete User"  description="This can&apos;t be undone!" text="" warn buttonText="DELETE" action={doDelete}></ConfirmModal>
+      {/*<EditUserModal user={user} action={saveEdit}/>*/}
     </>
   );
 }

From c8a2cd9efc31492f54badf965479d07f3dc1051a Mon Sep 17 00:00:00 2001
From: Moritz Reich <m.reich.1@campus.tu-berlin.de>
Date: Mon, 9 Jan 2023 15:31:06 +0000
Subject: [PATCH 06/23] optimized design and modal

Signed-off-by: Moritz Reich <m.reich.1@campus.tu-berlin.de>
---
 .../components/ConfirmModal.tsx               | 112 ++++++++++++------
 src/deskstar-frontend/pages/users/index.tsx   |  41 +++++--
 2 files changed, 102 insertions(+), 51 deletions(-)

diff --git a/src/deskstar-frontend/components/ConfirmModal.tsx b/src/deskstar-frontend/components/ConfirmModal.tsx
index 3c8d7777..89df2f9b 100644
--- a/src/deskstar-frontend/components/ConfirmModal.tsx
+++ b/src/deskstar-frontend/components/ConfirmModal.tsx
@@ -1,44 +1,80 @@
-import { useState } from 'react';
-import { Dialog } from '@headlessui/react';
-import React from 'react';
+import { useState } from "react";
+import { Dialog } from "@headlessui/react";
+import React from "react";
 
 export default function ConfirmModal({
-    title,
-    description,
-    text, 
-     warn,
-     buttonText,
-     action
-  }: {
-    title: string;
-    description: string;
-    text: string;
-    warn: boolean;
-    buttonText: string;
-    action: Function;
-  }) {
-  let [isOpen, setIsOpen] = useState(true);
-  let buttonClass="";
-  if( warn)
-    buttonClass+="btn-warning";
+  title,
+  description,
+  text,
+  warn,
+  buttonText,
+  action,
+  isOpen,
+  setIsOpen,
+}: {
+  title: string;
+  description: string;
+  text: string;
+  warn: boolean;
+  buttonText: string;
+  action: () => void;
+  isOpen: boolean;
+  setIsOpen: (isOpen: boolean) => void;
+}) {
+  let buttonClass = "btn ";
+  if (warn) buttonClass += "btn-warning";
 
   return (
     <Dialog open={isOpen} onClose={() => setIsOpen(false)}>
-      <Dialog.Panel>
-        <Dialog.Title>{title}</Dialog.Title>
-        <Dialog.Description>
-        {description}
-        </Dialog.Description>
-        <p>
-            {warn&&(
-        <svg xmlns="http://www.w3.org/2000/svg" className="stroke-current flex-shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" /></svg>
-            )}
-            {text}
-        </p>
-        <button className={buttonClass} onClick={() => {setIsOpen(false); action();}}>{buttonText}</button>
-        
-        <button onClick={() => setIsOpen(false)}>Cancel</button>
-      </Dialog.Panel>
+      <div className="fixed inset-0 bg-black/30" aria-hidden="true" />
+      <div className="fixed inset-0 flex items-center justify-center p-4 ">
+        <Dialog.Panel
+          className={"card bg-white dark:bg-gray-300 dark:text-black w-96"}
+        >
+          <div className="card-body">
+            <Dialog.Title className="card-title flex justify-between">
+              <p>{title}</p>
+
+              {warn && (
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  className="stroke-current flex-shrink-0 h-10 w-10"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+                  />
+                </svg>
+              )}
+            </Dialog.Title>
+            <Dialog.Description className={"py-4"}>
+              <p>{description}</p>
+
+              <p>{text}</p>
+
+              <div className="card-actions justify-end mt-4">
+                <button
+                  className={buttonClass}
+                  onClick={() => {
+                    setIsOpen(false);
+                    action();
+                  }}
+                >
+                  {buttonText}
+                </button>
+
+                <button className="btn" onClick={() => setIsOpen(false)}>
+                  Cancel
+                </button>
+              </div>
+            </Dialog.Description>
+          </div>
+        </Dialog.Panel>
+      </div>
     </Dialog>
-  )
-}
\ No newline at end of file
+  );
+}
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index 37191864..a1df0e48 100644
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -8,17 +8,18 @@ import { useState, useEffect } from "react";
 import { getUsers, deleteUser, editUser } from "../../lib/api/UserService";
 import { authOptions } from "../api/auth/[...nextauth]";
 import { unstable_getServerSession } from "next-auth";
-import  ConfirmModal from "../../components/ConfirmModal";
-import  EditUserModal  from "../../components/EditUserModal";
-
+import ConfirmModal from "../../components/ConfirmModal";
+import EditUserModal from "../../components/EditUserModal";
 
 export default function UsersOverview({ users }: { users: IUser[] }) {
   let { data: session } = useSession();
   const [calledRouter, setCalledRouter] = useState(false);
   const router = useRouter();
-  
+
   const [user, setUser] = useState<IUser>();
 
+  const [isDeleteUserModalOpen, setDeleteUserModalOpen] = useState(false);
+
   // page is only accessable as admin
   useEffect(() => {
     if (!calledRouter && session && !session?.user.isAdmin) {
@@ -47,18 +48,23 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     setUser(user);
   };
 
+  async function doDelete() {
+    if (user) {
+      console.log(`Deleting user ${user.userId}...`);
+      if (session == null) return;
+      deleteUser(session, user.userId);
+    }
+  }
+
   async function onDelete(user: IUser) {
-    //Show aller
+    setUser(user);
+    setDeleteUserModalOpen(true);
   }
-  const doDelete = async (user: IUser) => {
-    console.log(`Deleting user ${user.userId}...`);
-    if (session == null) return;
-    deleteUser(session, user.userId);
-  };
-  const saveEdit= async (user:IUser)=>{
+
+  const saveEdit = async (user: IUser) => {
     console.log(`Edit user ${user.userId}...`);
     //send edit
-  }
+  };
 
   return (
     <>
@@ -72,7 +78,16 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
         onEdit={onEdit}
         onDelete={onDelete}
       />
-      <ConfirmModal title="Delete User"  description="This can&apos;t be undone!" text="" warn buttonText="DELETE" action={doDelete}></ConfirmModal>
+      <ConfirmModal
+        title="Delete User"
+        description="This can't be undone!"
+        text=""
+        warn
+        buttonText="DELETE"
+        action={doDelete}
+        isOpen={isDeleteUserModalOpen}
+        setIsOpen={setDeleteUserModalOpen}
+      ></ConfirmModal>
       {/*<EditUserModal user={user} action={saveEdit}/>*/}
     </>
   );

From c5d934bf1743a860ed2de5300139ca1c12569d4e Mon Sep 17 00:00:00 2001
From: Moritz Reich <m.reich.1@campus.tu-berlin.de>
Date: Mon, 9 Jan 2023 15:32:16 +0000
Subject: [PATCH 07/23] fixed crlf error in devcontainer

Signed-off-by: Moritz Reich <m.reich.1@campus.tu-berlin.de>
---
 .devcontainer/devcontainer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 34e603fe..4672f8be 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -29,6 +29,7 @@
 
   // Use 'postCreateCommand' to run commands after the container is created.
   "postCreateCommand": "dotnet tool install --global dotnet-ef",
+  "postStartCommand": "git config core.autocrlf true",
   "remoteEnv": {
     "PATH": "${containerEnv:PATH}:/home/vscode/.dotnet/tools"
   }

From 79a48e40f63f7f30f86d98bc5be279268089b164 Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Tue, 10 Jan 2023 09:24:40 +0100
Subject: [PATCH 08/23] fix issues

---
 .../Deskstar/Controllers/UserController.cs    |  2 +-
 .../components/ConfirmModal.tsx               | 71 ++++++++++---------
 src/deskstar-frontend/pages/users/index.tsx   |  3 +
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/deskstar-backend/Deskstar/Controllers/UserController.cs b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
index 01f2e266..27b5f7ca 100644
--- a/src/deskstar-backend/Deskstar/Controllers/UserController.cs
+++ b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
@@ -321,7 +321,7 @@ public IActionResult UpdateGivenUser(UserProfileDto userDto)
     /// <response code="200">Empty Response</response>
     /// <response code="404">Not Found</response>
     /// <response code="500">Internal Server Error</response>
-    [HttpDelete("/delete/{userId}")]
+    [HttpDelete("delete/{userId}")]
     [Authorize(Policy = "Admin")]
     [ProducesResponseType(typeof(void), StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
diff --git a/src/deskstar-frontend/components/ConfirmModal.tsx b/src/deskstar-frontend/components/ConfirmModal.tsx
index 89df2f9b..4369bc3e 100644
--- a/src/deskstar-frontend/components/ConfirmModal.tsx
+++ b/src/deskstar-frontend/components/ConfirmModal.tsx
@@ -33,43 +33,46 @@ export default function ConfirmModal({
         >
           <div className="card-body">
             <Dialog.Title className="card-title flex justify-between">
-              <p>{title}</p>
-
-              {warn && (
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  className="stroke-current flex-shrink-0 h-10 w-10"
-                  fill="none"
-                  viewBox="0 0 24 24"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth="2"
-                    d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
-                  />
-                </svg>
-              )}
+              <div>
+                <p>{title}</p>
+                {warn && (
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    className="stroke-current flex-shrink-0 h-10 w-10"
+                    fill="none"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      strokeLinecap="round"
+                      strokeLinejoin="round"
+                      strokeWidth="2"
+                      d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+                    />
+                  </svg>
+                )}
+              </div>
             </Dialog.Title>
             <Dialog.Description className={"py-4"}>
-              <p>{description}</p>
-
-              <p>{text}</p>
-
-              <div className="card-actions justify-end mt-4">
-                <button
-                  className={buttonClass}
-                  onClick={() => {
-                    setIsOpen(false);
-                    action();
-                  }}
-                >
-                  {buttonText}
-                </button>
+              <div>
+                <div>
+                  <p>{description}</p>
+                  <p>{text}</p>
+                </div>
+                <div className="card-actions justify-end mt-4">
+                  <button
+                    className={buttonClass}
+                    onClick={() => {
+                      setIsOpen(false);
+                      action();
+                    }}
+                  >
+                    {buttonText}
+                  </button>
 
-                <button className="btn" onClick={() => setIsOpen(false)}>
-                  Cancel
-                </button>
+                  <button className="btn" onClick={() => setIsOpen(false)}>
+                    Cancel
+                  </button>
+                </div>
               </div>
             </Dialog.Description>
           </div>
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index a1df0e48..47ad4cb7 100644
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -13,6 +13,7 @@ import EditUserModal from "../../components/EditUserModal";
 
 export default function UsersOverview({ users }: { users: IUser[] }) {
   let { data: session } = useSession();
+
   const [calledRouter, setCalledRouter] = useState(false);
   const router = useRouter();
 
@@ -54,6 +55,8 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
       if (session == null) return;
       deleteUser(session, user.userId);
     }
+    // reload page
+    router.reload();
   }
 
   async function onDelete(user: IUser) {

From 4074c6cd122451952d38866423082566936f871e Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Tue, 10 Jan 2023 10:37:14 +0100
Subject: [PATCH 09/23] ui fixes

---
 .../components/EditUserModal.tsx              | 112 +++++++++++++-----
 .../components/forms/Input.tsx                |   2 +-
 src/deskstar-frontend/pages/users/index.tsx   |  32 +++--
 3 files changed, 102 insertions(+), 44 deletions(-)

diff --git a/src/deskstar-frontend/components/EditUserModal.tsx b/src/deskstar-frontend/components/EditUserModal.tsx
index 69de112a..a64cbce3 100644
--- a/src/deskstar-frontend/components/EditUserModal.tsx
+++ b/src/deskstar-frontend/components/EditUserModal.tsx
@@ -1,41 +1,91 @@
-import { useState } from 'react';
-import { Dialog } from '@headlessui/react';
-import {IUser} from "../types/users";
+import { useState } from "react";
+import { Dialog } from "@headlessui/react";
+import { IUser } from "../types/users";
 import Input from "./forms/Input";
-
-import React from 'react';
+import React from "react";
 
 export default function EditUserModal({
-    user,
-    action,
-  }: {
-    user: IUser;
-    action: Function;
-  }) {
-  let [isOpen, setIsOpen] = useState(true)
-
+  user,
+  action,
+  isOpen,
+  setIsOpen,
+}: {
+  user?: IUser;
+  action: Function;
+  isOpen: boolean;
+  setIsOpen: (isOpen: boolean) => void;
+}) {
   const [firstName, setFirstName] = useState("");
   const [lastName, setLastName] = useState("");
   const [email, setEmail] = useState("");
 
   return (
     <Dialog open={isOpen} onClose={() => setIsOpen(false)}>
-      <Dialog.Panel>
-        <Dialog.Title>Edit {user.firstName} {user.lastName} </Dialog.Title>
-        <div>
-            <div>
-            <Input name="first name" onChange={(e) => { setFirstName(e.target.value) }} value={user.firstName} placeholder="first name" />
-            <Input name="last name" onChange={(e) => { setLastName(e.target.value) }} value={user.lastName} placeholder="last name" />
-            </div>
-            <br/>
-            <div>
-            <Input name="E-Mail" onChange={(e) => { setEmail(e.target.value) }} value={user.firstName} placeholder="E-Mail" />
-                
-            </div>
-        </div>
-        <button className="btn-success" onClick={() => {setIsOpen(false); action(firstName,lastName, email);}}>Save</button>
-        <button onClick={() => setIsOpen(false)}>Cancel</button>
-      </Dialog.Panel>
+      <div className="fixed inset-0 bg-black/30" aria-hidden="true" />
+      <div className="fixed inset-0 flex items-center justify-center p-4 ">
+        <Dialog.Panel
+          className={"card bg-white dark:bg-gray-300 dark:text-black w-96"}
+        >
+          <div className="card-body">
+            <Dialog.Title className="card-title flex justify-between">
+              <div>
+                Edit {user?.firstName} {user?.lastName}{" "}
+              </div>
+            </Dialog.Title>
+            <Dialog.Description className={"py-4"}>
+              <div>
+                <div>
+                  <Input
+                    name="first name"
+                    onChange={(e) => {
+                      setFirstName(e.target.value);
+                    }}
+                    placeholder={user?.firstName}
+                    value={firstName}
+                  />
+                  <Input
+                    name="last name"
+                    onChange={(e) => {
+                      setLastName(e.target.value);
+                    }}
+                    value={lastName}
+                    placeholder={user?.lastName}
+                  />
+                </div>
+                <div>
+                  <Input
+                    name="E-Mail"
+                    onChange={(e) => {
+                      setEmail(e.target.value);
+                    }}
+                    value={email}
+                    placeholder={user?.email}
+                  />
+                </div>
+              </div>
+              <div className="card-actions justify-end mt-4">
+                <button
+                  className="btn btn-success"
+                  onClick={() => {
+                    setIsOpen(false);
+                    if (user != null) {
+                      user.firstName = firstName;
+                      user.lastName = lastName;
+                      user.email = email;
+                      action(user);
+                    }
+                  }}
+                >
+                  Save
+                </button>
+                <button className="btn" onClick={() => setIsOpen(false)}>
+                  Cancel
+                </button>
+              </div>
+            </Dialog.Description>
+          </div>
+        </Dialog.Panel>
+      </div>
     </Dialog>
-  )
-}
\ No newline at end of file
+  );
+}
diff --git a/src/deskstar-frontend/components/forms/Input.tsx b/src/deskstar-frontend/components/forms/Input.tsx
index b5d16647..e6aab785 100644
--- a/src/deskstar-frontend/components/forms/Input.tsx
+++ b/src/deskstar-frontend/components/forms/Input.tsx
@@ -5,7 +5,7 @@ type InputProps = {
   onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
   value: string;
   className?: string;
-  placeholder: string;
+  placeholder?: string;
   type?: string;
 };
 
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index 47ad4cb7..9aef9c7d 100644
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -20,6 +20,7 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
   const [user, setUser] = useState<IUser>();
 
   const [isDeleteUserModalOpen, setDeleteUserModalOpen] = useState(false);
+  const [isEditUserModalOpen, setEditUserModalOpen] = useState(false);
 
   // page is only accessable as admin
   useEffect(() => {
@@ -44,11 +45,15 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
   };
 
   const onEdit = async (user: IUser): Promise<void> => {
-    //TODO: Implement
-    console.log(`Editing user ${user.userId}...`);
     setUser(user);
+    setEditUserModalOpen(true);
   };
 
+  async function onDelete(user: IUser): Promise<void> {
+    setUser(user);
+    setDeleteUserModalOpen(true);
+  }
+
   async function doDelete() {
     if (user) {
       console.log(`Deleting user ${user.userId}...`);
@@ -59,16 +64,14 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     router.reload();
   }
 
-  async function onDelete(user: IUser) {
-    setUser(user);
-    setDeleteUserModalOpen(true);
+  async function doEdit() {
+    if (user) {
+      console.log(`Edit user ${user.userId}...`);
+      if (session == null) return;
+      editUser(session, user);
+    }
   }
 
-  const saveEdit = async (user: IUser) => {
-    console.log(`Edit user ${user.userId}...`);
-    //send edit
-  };
-
   return (
     <>
       <Head>
@@ -82,7 +85,7 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
         onDelete={onDelete}
       />
       <ConfirmModal
-        title="Delete User"
+        title={"Delete User" + user?.firstName + " " + user?.lastName + "?"}
         description="This can't be undone!"
         text=""
         warn
@@ -91,7 +94,12 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
         isOpen={isDeleteUserModalOpen}
         setIsOpen={setDeleteUserModalOpen}
       ></ConfirmModal>
-      {/*<EditUserModal user={user} action={saveEdit}/>*/}
+      <EditUserModal
+        user={user}
+        action={doEdit}
+        isOpen={isEditUserModalOpen}
+        setIsOpen={setEditUserModalOpen}
+      />
     </>
   );
 }

From 90d833c9aa83c478207fd4d493c6d458062e788d Mon Sep 17 00:00:00 2001
From: Moritz Reich <m.reich.1@campus.tu-berlin.de>
Date: Wed, 11 Jan 2023 11:34:26 +0000
Subject: [PATCH 10/23] changed to lf

---
 src/deskstar-backend/Deskstar/Controllers/UserController.cs | 0
 src/deskstar-frontend/components/ConfirmModal.tsx           | 0
 src/deskstar-frontend/components/EditUserModal.tsx          | 0
 src/deskstar-frontend/components/forms/Input.tsx            | 0
 src/deskstar-frontend/pages/users/index.tsx                 | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 src/deskstar-backend/Deskstar/Controllers/UserController.cs
 mode change 100644 => 100755 src/deskstar-frontend/components/ConfirmModal.tsx
 mode change 100644 => 100755 src/deskstar-frontend/components/EditUserModal.tsx
 mode change 100644 => 100755 src/deskstar-frontend/components/forms/Input.tsx
 mode change 100644 => 100755 src/deskstar-frontend/pages/users/index.tsx

diff --git a/src/deskstar-backend/Deskstar/Controllers/UserController.cs b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
old mode 100644
new mode 100755
diff --git a/src/deskstar-frontend/components/ConfirmModal.tsx b/src/deskstar-frontend/components/ConfirmModal.tsx
old mode 100644
new mode 100755
diff --git a/src/deskstar-frontend/components/EditUserModal.tsx b/src/deskstar-frontend/components/EditUserModal.tsx
old mode 100644
new mode 100755
diff --git a/src/deskstar-frontend/components/forms/Input.tsx b/src/deskstar-frontend/components/forms/Input.tsx
old mode 100644
new mode 100755
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
old mode 100644
new mode 100755

From 954742f2c0076f2b3bed187b3554622b387752fa Mon Sep 17 00:00:00 2001
From: Moritz Reich <m.reich.1@campus.tu-berlin.de>
Date: Wed, 11 Jan 2023 12:25:55 +0000
Subject: [PATCH 11/23] fixed delete user

Signed-off-by: Moritz Reich <m.reich.1@campus.tu-berlin.de>
---
 src/deskstar-frontend/components/ConfirmModal.tsx | 4 ++--
 src/deskstar-frontend/lib/api/UserService.ts      | 9 +++------
 src/deskstar-frontend/pages/users/index.tsx       | 6 +++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/deskstar-frontend/components/ConfirmModal.tsx b/src/deskstar-frontend/components/ConfirmModal.tsx
index 4369bc3e..5b0d0f8f 100755
--- a/src/deskstar-frontend/components/ConfirmModal.tsx
+++ b/src/deskstar-frontend/components/ConfirmModal.tsx
@@ -32,7 +32,7 @@ export default function ConfirmModal({
           className={"card bg-white dark:bg-gray-300 dark:text-black w-96"}
         >
           <div className="card-body">
-            <Dialog.Title className="card-title flex justify-between">
+            <Dialog.Title as="div" className="card-title flex justify-between">
               <div>
                 <p>{title}</p>
                 {warn && (
@@ -52,7 +52,7 @@ export default function ConfirmModal({
                 )}
               </div>
             </Dialog.Title>
-            <Dialog.Description className={"py-4"}>
+            <Dialog.Description as="div" className={"py-4"}>
               <div>
                 <div>
                   <p>{description}</p>
diff --git a/src/deskstar-frontend/lib/api/UserService.ts b/src/deskstar-frontend/lib/api/UserService.ts
index 275e4aac..cdf7f459 100644
--- a/src/deskstar-frontend/lib/api/UserService.ts
+++ b/src/deskstar-frontend/lib/api/UserService.ts
@@ -54,7 +54,7 @@ export function declineUser(
   });
 }
 
-export function deleteUser(
+export async function deleteUser(
   session: Session,
   userId: string
 ): Promise<Response> {
@@ -66,17 +66,14 @@ export function deleteUser(
   });
 }
 
-export function editUser(
-  session: Session,
-  user: IUser
-  ): Promise<Response> {
+export function editUser(session: Session, user: IUser): Promise<Response> {
   return fetch(BACKEND_URL + `/users/edit`, {
     method: "POST",
     headers: {
       Authorization: `Bearer ${session.accessToken}`,
       "Content-Type": "application/json",
     },
-    body: JSON.stringify(user)
+    body: JSON.stringify(user),
   });
 }
 
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index 9aef9c7d..d65e1dd9 100755
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -58,10 +58,10 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     if (user) {
       console.log(`Deleting user ${user.userId}...`);
       if (session == null) return;
-      deleteUser(session, user.userId);
+      await deleteUser(session, user.userId);
+      // reload page
+      router.reload();
     }
-    // reload page
-    router.reload();
   }
 
   async function doEdit() {

From 8ae9171b6b10e47d4199e8913b9fe5807d71018b Mon Sep 17 00:00:00 2001
From: Moritz Reich <m.reich.1@campus.tu-berlin.de>
Date: Wed, 11 Jan 2023 12:33:48 +0000
Subject: [PATCH 12/23] update for the devcontainer to fix the permission
 issues

Signed-off-by: Moritz Reich <m.reich.1@campus.tu-berlin.de>
---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4672f8be..3ed5f7b8 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -29,7 +29,7 @@
 
   // Use 'postCreateCommand' to run commands after the container is created.
   "postCreateCommand": "dotnet tool install --global dotnet-ef",
-  "postStartCommand": "git config core.autocrlf true",
+  "postStartCommand": "git config core.autocrlf true && git config core.filemode false",
   "remoteEnv": {
     "PATH": "${containerEnv:PATH}:/home/vscode/.dotnet/tools"
   }

From c2c4fac0f0f2dcc3118dc436c71e06e4d436a7bd Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Wed, 11 Jan 2023 13:59:11 +0100
Subject: [PATCH 13/23] ui fixes

Co-Authored-By: Fiona <55480320+Faoilthiama@users.noreply.github.com>
---
 .../Deskstar/Usecases/UserUsecases.cs         | 30 +++++++++----------
 .../components/EditUserModal.tsx              |  5 ++--
 src/deskstar-frontend/pages/users/index.tsx   |  2 +-
 src/deskstar-frontend/yarn.lock               | 12 ++++++++
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
index cedd1861..3ee6f4a4 100644
--- a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
+++ b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
@@ -19,7 +19,7 @@ public interface IUserUsecases
 {
     public List<User> ReadAllUsers(Guid adminId);
     public User ReadSpecificUser(Guid userId);
-    
+
     public Guid UpdateUser(string requestUserId, User user);
     public Guid ApproveUser(Guid adminId, string userId);
     public Guid DeclineUser(Guid adminId, string userId);
@@ -129,7 +129,7 @@ public List<User> ReadAllUsers(Guid adminId)
             throw new EntityNotFoundException($"There is no admin with id '{adminId}'");
         return _context.Users.Where(user => user.CompanyId == admin.CompanyId).ToList();
     }
-    
+
     public Guid UpdateUser(string requestUserId, User user)
     {
         Guid guid;
@@ -147,38 +147,37 @@ public Guid UpdateUser(string requestUserId, User user)
         {
             throw new ArgumentInvalidException($"'{requestUserId}' is not equals with given userObject");
         }
-        
+
         return SaveUpdateUser(user);
     }
-    
+
     public Guid UpdateUser(Guid adminId, User user)
     {
         var userDbInstance = _context.Users.SingleOrDefault(u => u.UserId == user.UserId);
         if (userDbInstance == null)
             throw new EntityNotFoundException($"There is no user with id '{user.UserId}'");
-        CheckSameCompany(adminId,user.UserId);
+        CheckSameCompany(adminId, user.UserId);
         return SaveUpdateUser(user);
     }
-    private Guid SaveUpdateUser( User user)
+    private Guid SaveUpdateUser(User user)
     {
         var userDbInstance = _context.Users.SingleOrDefault(u => u.UserId == user.UserId);
         if (userDbInstance == null)
             throw new EntityNotFoundException($"There is no user with id '{user.UserId}'");
         _context.Users.Update(user);
         _context.SaveChanges();
-        //ToDo: uncomment
         var body = $"Hello {user.FirstName},</br> " +
                    "your account details have been updated.</br> " +
-                   "Please check if this was ok.</br>"+
+                   "Please check if this was ok.</br>" +
                    "If not get in touch with your company admin.</br>" +
                    "</br> " +
                    "Regards,</br> " +
                    "Deskstar Team";
-        //EmailHelper.SendEmail(_logger, user.MailAddress, "Your Deskstar account details have been updated!", body);
+        EmailHelper.SendEmail(_logger, user.MailAddress, "Your Deskstar account details have been updated!", body);
         return user.UserId;
     }
-    
-    public Guid DeleteUser(Guid adminId,string userId)
+
+    public Guid DeleteUser(Guid adminId, string userId)
     {
         Guid guid;
         try
@@ -190,22 +189,21 @@ public Guid DeleteUser(Guid adminId,string userId)
             _logger.LogError(e, e.Message);
             throw new ArgumentInvalidException($"'{userId}' is not a valid UserId");
         }
-        
+
         var userDbInstance = _context.Users.SingleOrDefault(u => u.UserId == guid);
         if (userDbInstance == null)
             throw new EntityNotFoundException($"There is no user with id '{userId}'");
-        CheckSameCompany(adminId,guid);
+        CheckSameCompany(adminId, guid);
         var body = $"Hello {userDbInstance.FirstName},</br> " +
                    "your account has been releted by your Company admin.</br> " +
                    "If you think this was an mistake, get in touch with your company admin.</br>" +
                    "</br> " +
                    "Regards,</br> " +
                    "Deskstar Team";
-        //ToDo: uncomment
-        //EmailHelper.SendEmail(_logger, user.MailAddress, "Your Deskstar account details have been updated!", body);
+        EmailHelper.SendEmail(_logger, user.MailAddress, "Your Deskstar account details have been updated!", body);
         _context.Users.Remove(userDbInstance);
         _context.SaveChanges();
-        
+
         return guid;
     }
 }
\ No newline at end of file
diff --git a/src/deskstar-frontend/components/EditUserModal.tsx b/src/deskstar-frontend/components/EditUserModal.tsx
index a64cbce3..9ab40771 100755
--- a/src/deskstar-frontend/components/EditUserModal.tsx
+++ b/src/deskstar-frontend/components/EditUserModal.tsx
@@ -24,15 +24,16 @@ export default function EditUserModal({
       <div className="fixed inset-0 bg-black/30" aria-hidden="true" />
       <div className="fixed inset-0 flex items-center justify-center p-4 ">
         <Dialog.Panel
+          as="div"
           className={"card bg-white dark:bg-gray-300 dark:text-black w-96"}
         >
           <div className="card-body">
-            <Dialog.Title className="card-title flex justify-between">
+            <Dialog.Title as="div" className="card-title flex justify-between">
               <div>
                 Edit {user?.firstName} {user?.lastName}{" "}
               </div>
             </Dialog.Title>
-            <Dialog.Description className={"py-4"}>
+            <Dialog.Description as="div" className={"py-4"}>
               <div>
                 <div>
                   <Input
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index d4829b58..52e249d1 100755
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -86,7 +86,7 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
         onDelete={onDelete}
       />
       <ConfirmModal
-        title={"Delete User" + user?.firstName + " " + user?.lastName + "?"}
+        title={"Delete User " + user?.firstName + " " + user?.lastName + "?"}
         description="This can't be undone!"
         text=""
         warn
diff --git a/src/deskstar-frontend/yarn.lock b/src/deskstar-frontend/yarn.lock
index 4070ea32..64b46856 100644
--- a/src/deskstar-frontend/yarn.lock
+++ b/src/deskstar-frontend/yarn.lock
@@ -496,6 +496,11 @@ client-only@0.0.1, client-only@^0.0.1:
   resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
 
+clsx@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
+  integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
+
 color-convert@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
@@ -1822,6 +1827,13 @@ react-is@^16.13.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
+react-toastify@^9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-9.1.1.tgz#9280caea4a13dc1739c350d90660a630807bf10b"
+  integrity sha512-pkFCla1z3ve045qvjEmn2xOJOy4ZciwRXm1oMPULVkELi5aJdHCN/FHnuqXq8IwGDLB7PPk2/J6uP9D8ejuiRw==
+  dependencies:
+    clsx "^1.1.1"
+
 react@18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"

From 8ecfdfc3a9aa2294bcc5a6eed353f34759672b68 Mon Sep 17 00:00:00 2001
From: Moritz Reich <m.reich.1@campus.tu-berlin.de>
Date: Wed, 11 Jan 2023 13:03:27 +0000
Subject: [PATCH 14/23] added await and made it async

Signed-off-by: Moritz Reich <m.reich.1@campus.tu-berlin.de>
---
 src/deskstar-frontend/lib/api/UserService.ts | 5 ++++-
 src/deskstar-frontend/pages/users/index.tsx  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/deskstar-frontend/lib/api/UserService.ts b/src/deskstar-frontend/lib/api/UserService.ts
index cdf7f459..b8920f82 100644
--- a/src/deskstar-frontend/lib/api/UserService.ts
+++ b/src/deskstar-frontend/lib/api/UserService.ts
@@ -66,7 +66,10 @@ export async function deleteUser(
   });
 }
 
-export function editUser(session: Session, user: IUser): Promise<Response> {
+export async function editUser(
+  session: Session,
+  user: IUser
+): Promise<Response> {
   return fetch(BACKEND_URL + `/users/edit`, {
     method: "POST",
     headers: {
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index 52e249d1..e78001cb 100755
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -69,7 +69,7 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     if (user) {
       console.log(`Edit user ${user.userId}...`);
       if (session == null) return;
-      editUser(session, user);
+      await editUser(session, user);
     }
   }
 

From c16fbf03d0192bf9f28bc30265f2123ddebb26eb Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Fri, 13 Jan 2023 11:12:03 +0100
Subject: [PATCH 15/23] connect backend frontend

---
 .../Deskstar/Controllers/UserController.cs    |  9 +++++
 .../Deskstar/Helper/EmailHelper.cs            |  8 +++-
 .../Models/AutoMapperConfiguration.cs         |  2 +-
 .../Deskstar/Models/UserProfileDto.cs         | 13 ++++++-
 .../Deskstar/Usecases/UserUsecases.cs         | 37 +++++++++----------
 src/deskstar-frontend/lib/api/UserService.ts  |  4 +-
 6 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/src/deskstar-backend/Deskstar/Controllers/UserController.cs b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
index 27b5f7ca..a510b21a 100755
--- a/src/deskstar-backend/Deskstar/Controllers/UserController.cs
+++ b/src/deskstar-backend/Deskstar/Controllers/UserController.cs
@@ -1,3 +1,12 @@
+/**
+ * UserController
+ *
+ * Version 1.0
+ *
+ * 2023-01-13
+ *
+ * MIT License
+ */
 using Deskstar.Core;
 using Deskstar.Models;
 using Deskstar.Entities;
diff --git a/src/deskstar-backend/Deskstar/Helper/EmailHelper.cs b/src/deskstar-backend/Deskstar/Helper/EmailHelper.cs
index 79a7a53e..55b7d6e8 100644
--- a/src/deskstar-backend/Deskstar/Helper/EmailHelper.cs
+++ b/src/deskstar-backend/Deskstar/Helper/EmailHelper.cs
@@ -18,6 +18,12 @@ public class EmailHelper
     private static int  _emailPort;
     private static string? _emailUsername;
     private static SmtpClient? _smtpClient;
+
+    private const string Footer = "Note: this is an automatic email notification. Do not reply to this email. <br/> " +
+                                  "<br/> " +
+                                  "Regards, <br/> " +
+                                  "<br/>" +
+                                  "Deskstar Team";
     public static bool SendEmail(ILogger logger, string userEmail, string subject, string message)
     {
         if(_smtpClient==null)
@@ -40,7 +46,7 @@ public static bool SendEmail(ILogger logger, string userEmail, string subject, s
 
         mailMessage.Subject = subject;
         mailMessage.IsBodyHtml = true;
-        mailMessage.Body = message;
+        mailMessage.Body = message+Footer;
         
         try
         {
diff --git a/src/deskstar-backend/Deskstar/Models/AutoMapperConfiguration.cs b/src/deskstar-backend/Deskstar/Models/AutoMapperConfiguration.cs
index 4d7ace30..1c3ca39f 100644
--- a/src/deskstar-backend/Deskstar/Models/AutoMapperConfiguration.cs
+++ b/src/deskstar-backend/Deskstar/Models/AutoMapperConfiguration.cs
@@ -13,7 +13,7 @@ public MapperConfiguration GetConfiguration()
         {
             var config = new MapperConfiguration(cfg =>
             {
-                UserProfileDto.createMappings(cfg);
+                UserProfileDto.CreateMappings(cfg);
                 UserProfileCompanyDto.createMappings(cfg);
                 DeskTypeDto.createMappings(cfg);
                 ExtendedBooking.createMappings(cfg);
diff --git a/src/deskstar-backend/Deskstar/Models/UserProfileDto.cs b/src/deskstar-backend/Deskstar/Models/UserProfileDto.cs
index 57824fe5..efc4fc91 100644
--- a/src/deskstar-backend/Deskstar/Models/UserProfileDto.cs
+++ b/src/deskstar-backend/Deskstar/Models/UserProfileDto.cs
@@ -1,3 +1,12 @@
+/**
+ * UserProfileDto
+ *
+ * Version 1.0
+ *
+ * 2023-01-03
+ *
+ * MIT License
+ */
 using AutoMapper;
 
 namespace Deskstar.Models
@@ -11,7 +20,7 @@ public UserProfileDto()
 
         }
 
-        public static void createMappings(IMapperConfigurationExpression cfg)
+        public static void CreateMappings(IMapperConfigurationExpression cfg)
         {
             cfg.CreateMap<Entities.User, UserProfileDto>()
                 .ForMember(dest => dest.Company, act => act.MapFrom(src => src.Company));
@@ -27,6 +36,6 @@ public static void createMappings(IMapperConfigurationExpression cfg)
         public bool IsApproved { get; set; }
         public bool IsCompanyAdmin { get; set; }
 
-        public UserProfileCompanyDto Company { get; set; } = null!;
+        public UserProfileCompanyDto? Company { get; set; }
     }
 }
diff --git a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
index 3ee6f4a4..2fbf1e21 100644
--- a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
+++ b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
@@ -1,5 +1,5 @@
 /**
- * Program
+ * UserUsecases
  *
  * Version 1.0
  *
@@ -70,10 +70,7 @@ public Guid ApproveUser(Guid adminId, string userId)
         var body = $"Hello {user.FirstName},</br> " +
                   $"your account has been approved by {ReadSpecificUser(adminId).FirstName}.</br> " +
                   "You can now log into the system.</br>" +
-                  "You can now book your first desk and get to work.</br>" +
-                  "</br> " +
-                  "Regards,</br> " +
-                  "Deskstar Team";
+                  "You can now book your first desk and get to work.</br>";
         EmailHelper.SendEmail(_logger, user.MailAddress, "Your Deskstar account has been approved!", body);
 
         return guid;
@@ -110,10 +107,7 @@ public Guid DeclineUser(Guid adminId, string userId)
 
         var body = $"Hello {user.FirstName},</br> " +
                   $"your account has been rejected.</br> " +
-                  "Please contact one of your company's admins if you think this was a mistake.</br>" +
-                  "</br> " +
-                  "Regards,</br> " +
-                  "Deskstar Team";
+                  "Please contact one of your company's admins if you think this was a mistake.</br>";
         EmailHelper.SendEmail(_logger, user.MailAddress, "Your Deskstar account has been rejected!", body);
 
         _context.Users.Remove(user);
@@ -161,18 +155,26 @@ public Guid UpdateUser(Guid adminId, User user)
     }
     private Guid SaveUpdateUser(User user)
     {
+        if(user.UserId == Guid.Empty)
+            throw new ArgumentInvalidException($"'{nameof(user.UserId)}' is empty");
+        if(user.FirstName == null|| user.FirstName.Length == 0)
+            throw new ArgumentInvalidException($"'{nameof(user.FirstName)}' is not set");
+        if(user.LastName == null|| user.LastName.Length == 0)
+            throw new ArgumentInvalidException($"'{nameof(user.LastName)}' is not set");
+        if(user.MailAddress == null|| user.MailAddress.Length == 0)
+            throw new ArgumentInvalidException($"'{nameof(user.MailAddress)}' is not set");
         var userDbInstance = _context.Users.SingleOrDefault(u => u.UserId == user.UserId);
         if (userDbInstance == null)
             throw new EntityNotFoundException($"There is no user with id '{user.UserId}'");
-        _context.Users.Update(user);
+        userDbInstance.FirstName = user.FirstName;
+        userDbInstance.LastName = user.LastName;
+        userDbInstance.MailAddress = user.MailAddress;
+        userDbInstance.IsCompanyAdmin = user.IsCompanyAdmin;
         _context.SaveChanges();
         var body = $"Hello {user.FirstName},</br> " +
                    "your account details have been updated.</br> " +
                    "Please check if this was ok.</br>" +
-                   "If not get in touch with your company admin.</br>" +
-                   "</br> " +
-                   "Regards,</br> " +
-                   "Deskstar Team";
+                   "If not get in touch with your company admin.</br>";
         EmailHelper.SendEmail(_logger, user.MailAddress, "Your Deskstar account details have been updated!", body);
         return user.UserId;
     }
@@ -196,11 +198,8 @@ public Guid DeleteUser(Guid adminId, string userId)
         CheckSameCompany(adminId, guid);
         var body = $"Hello {userDbInstance.FirstName},</br> " +
                    "your account has been releted by your Company admin.</br> " +
-                   "If you think this was an mistake, get in touch with your company admin.</br>" +
-                   "</br> " +
-                   "Regards,</br> " +
-                   "Deskstar Team";
-        EmailHelper.SendEmail(_logger, user.MailAddress, "Your Deskstar account details have been updated!", body);
+                   "If you think this was an mistake, get in touch with your company admin.</br>";
+        EmailHelper.SendEmail(_logger, userDbInstance.MailAddress, "Your Deskstar account details have been updated!", body);
         _context.Users.Remove(userDbInstance);
         _context.SaveChanges();
 
diff --git a/src/deskstar-frontend/lib/api/UserService.ts b/src/deskstar-frontend/lib/api/UserService.ts
index b8920f82..c7882300 100644
--- a/src/deskstar-frontend/lib/api/UserService.ts
+++ b/src/deskstar-frontend/lib/api/UserService.ts
@@ -70,13 +70,15 @@ export async function editUser(
   session: Session,
   user: IUser
 ): Promise<Response> {
+  var body=JSON.stringify(user);
+  body=body.replace("email", "mailAddress").replace("isAdmin", "isCompanyAdmin").replace("company", "companyId");
   return fetch(BACKEND_URL + `/users/edit`, {
     method: "POST",
     headers: {
       Authorization: `Bearer ${session.accessToken}`,
       "Content-Type": "application/json",
     },
-    body: JSON.stringify(user),
+    body: body,
   });
 }
 

From bbde78ca0040747efffac258275cf9fe1eb82dce Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Fri, 13 Jan 2023 11:57:43 +0100
Subject: [PATCH 16/23] ui improvments

---
 .../components/ConfirmModal.tsx               |  1 -
 src/deskstar-frontend/pages/users/index.tsx   | 69 ++++++++++++++++---
 2 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/deskstar-frontend/components/ConfirmModal.tsx b/src/deskstar-frontend/components/ConfirmModal.tsx
index 5b0d0f8f..bab63603 100755
--- a/src/deskstar-frontend/components/ConfirmModal.tsx
+++ b/src/deskstar-frontend/components/ConfirmModal.tsx
@@ -1,4 +1,3 @@
-import { useState } from "react";
 import { Dialog } from "@headlessui/react";
 import React from "react";
 
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index e78001cb..b78773e6 100755
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -20,8 +20,9 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
 
   const [user, setUser] = useState<IUser>();
 
-  const [isDeleteUserModalOpen, setDeleteUserModalOpen] = useState(false);
+  const [isMakeAdminModalOpen, setMakeAdminModalOpen] = useState(false);
   const [isEditUserModalOpen, setEditUserModalOpen] = useState(false);
+  const [isDeleteUserModalOpen, setDeleteUserModalOpen] = useState(false);
 
   // page is only accessable as admin
   useEffect(() => {
@@ -39,16 +40,15 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     return;
   }
 
-  const onPermissionUpdate = async (user: IUser): Promise<void> => {
-    //TODO: Implement
-    if (user.isAdmin) toast.success(`Demoting user ${user.userId}...`);
-    else toast.success(`Promoting user ${user.userId}...`);
-  };
+  async function onPermissionUpdate(user: IUser): Promise<void> {
+    setUser(user);
+    setMakeAdminModalOpen(true);
+  }
 
-  const onEdit = async (user: IUser): Promise<void> => {
+  async function onEdit(user: IUser): Promise<void> {
     setUser(user);
     setEditUserModalOpen(true);
-  };
+  }
 
   async function onDelete(user: IUser): Promise<void> {
     setUser(user);
@@ -59,17 +59,50 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     if (user) {
       console.log(`Deleting user ${user.userId}...`);
       if (session == null) return;
-      await deleteUser(session, user.userId);
+      let result = await deleteUser(session, user.userId);
+      if (result.ok) {
+        toast.success(`User ${user.firstName} ${user.lastName} deleted!`);
+      } else {
+        toast.error(
+          `User ${user.firstName} ${user.lastName} could not be deleted!`
+        );
+      }
       // reload page
       router.reload();
     }
   }
+  async function doUpdate() {
+    if (user) {
+      console.log(`Make user ${user.userId} admin ...`);
+      if (session == null) return;
+      if (user.isAdmin) {
+        user.isAdmin = false;
+      } else {
+        user.isAdmin = true;
+      }
+      let result = await editUser(session, user);
+      if (result.ok) {
+        toast.success(`User ${user.firstName} ${user.lastName} updated!`);
+      } else {
+        toast.error(
+          `User ${user.firstName} ${user.lastName} could not be updated!`
+        );
+      }
+    }
+  }
 
   async function doEdit() {
     if (user) {
       console.log(`Edit user ${user.userId}...`);
       if (session == null) return;
-      await editUser(session, user);
+      let result = await editUser(session, user);
+      if (result.ok) {
+        toast.success(`User ${user.firstName} ${user.lastName} updated!`);
+      } else {
+        toast.error(
+          `User ${user.firstName} ${user.lastName} could not be updated!`
+        );
+      }
     }
   }
 
@@ -95,6 +128,22 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
         isOpen={isDeleteUserModalOpen}
         setIsOpen={setDeleteUserModalOpen}
       ></ConfirmModal>
+      <ConfirmModal
+        title={
+          "Change admin rights for User " +
+          user?.firstName +
+          " " +
+          user?.lastName +
+          "?"
+        }
+        description="Please confirm that you want to update the privileges this user an admin."
+        text=""
+        warn
+        buttonText="UPDATE PRIVILEGES"
+        action={doUpdate}
+        isOpen={isMakeAdminModalOpen}
+        setIsOpen={setMakeAdminModalOpen}
+      ></ConfirmModal>
       <EditUserModal
         user={user}
         action={doEdit}

From 51c220ca2ac38d9414649c3ea05d79b2dbf055eb Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Fri, 13 Jan 2023 12:01:20 +0100
Subject: [PATCH 17/23] edit issue fixed

---
 src/deskstar-frontend/components/EditUserModal.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/deskstar-frontend/components/EditUserModal.tsx b/src/deskstar-frontend/components/EditUserModal.tsx
index 9ab40771..0141089b 100755
--- a/src/deskstar-frontend/components/EditUserModal.tsx
+++ b/src/deskstar-frontend/components/EditUserModal.tsx
@@ -70,9 +70,9 @@ export default function EditUserModal({
                   onClick={() => {
                     setIsOpen(false);
                     if (user != null) {
-                      user.firstName = firstName;
-                      user.lastName = lastName;
-                      user.email = email;
+                      if (!(firstName == "")) user.firstName = firstName;
+                      if (!(lastName == "")) user.lastName = lastName;
+                      if (!(email == "")) user.email = email;
                       action(user);
                     }
                   }}

From ba1b6f414b611e2cb83755542b21581f771f233a Mon Sep 17 00:00:00 2001
From: xilef45 <88111260+xilef45@users.noreply.github.com>
Date: Fri, 13 Jan 2023 12:02:55 +0100
Subject: [PATCH 18/23] Update index.tsx

---
 src/deskstar-frontend/pages/users/index.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index b78773e6..4f3e1177 100755
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -57,7 +57,6 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
 
   async function doDelete() {
     if (user) {
-      console.log(`Deleting user ${user.userId}...`);
       if (session == null) return;
       let result = await deleteUser(session, user.userId);
       if (result.ok) {
@@ -73,7 +72,6 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
   }
   async function doUpdate() {
     if (user) {
-      console.log(`Make user ${user.userId} admin ...`);
       if (session == null) return;
       if (user.isAdmin) {
         user.isAdmin = false;
@@ -93,7 +91,6 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
 
   async function doEdit() {
     if (user) {
-      console.log(`Edit user ${user.userId}...`);
       if (session == null) return;
       let result = await editUser(session, user);
       if (result.ok) {

From 895184e9406cb6ab1ec2757f5b243846b5e88531 Mon Sep 17 00:00:00 2001
From: Moritz Reich <m.reich.1@campus.tu-berlin.de>
Date: Mon, 16 Jan 2023 10:12:38 +0000
Subject: [PATCH 19/23] fixed edit user and improve data flow

Signed-off-by: Moritz Reich <m.reich.1@campus.tu-berlin.de>
---
 src/deskstar-backend/Deskstar/run.sh          |  2 +-
 .../components/ConfirmModal.tsx               | 12 ++-
 .../components/EditUserModal.tsx              | 45 +++++++----
 src/deskstar-frontend/lib/api/UserService.ts  | 13 +++-
 src/deskstar-frontend/pages/users/index.tsx   | 76 ++++++++++++-------
 5 files changed, 98 insertions(+), 50 deletions(-)

diff --git a/src/deskstar-backend/Deskstar/run.sh b/src/deskstar-backend/Deskstar/run.sh
index 14607b42..1e87ef29 100755
--- a/src/deskstar-backend/Deskstar/run.sh
+++ b/src/deskstar-backend/Deskstar/run.sh
@@ -10,4 +10,4 @@
 
 dotnet restore
 dotnet publish -c Dev -o out
-dotnet bin/Dev/net6.0/Deskstar.dll
\ No newline at end of file
+dotnet bin/Dev/net6.0/Deskstar.dll
diff --git a/src/deskstar-frontend/components/ConfirmModal.tsx b/src/deskstar-frontend/components/ConfirmModal.tsx
index bab63603..e3da3f16 100755
--- a/src/deskstar-frontend/components/ConfirmModal.tsx
+++ b/src/deskstar-frontend/components/ConfirmModal.tsx
@@ -1,5 +1,5 @@
 import { Dialog } from "@headlessui/react";
-import React from "react";
+import React, { useState } from "react";
 
 export default function ConfirmModal({
   title,
@@ -20,6 +20,8 @@ export default function ConfirmModal({
   isOpen: boolean;
   setIsOpen: (isOpen: boolean) => void;
 }) {
+  const [isLoading, setIsLoading] = useState(false);
+
   let buttonClass = "btn ";
   if (warn) buttonClass += "btn-warning";
 
@@ -59,10 +61,14 @@ export default function ConfirmModal({
                 </div>
                 <div className="card-actions justify-end mt-4">
                   <button
+                    disabled={isLoading}
                     className={buttonClass}
-                    onClick={() => {
+                    onClick={async () => {
+                      setIsLoading(true);
+                      await action();
+
                       setIsOpen(false);
-                      action();
+                      setIsLoading(false);
                     }}
                   >
                     {buttonText}
diff --git a/src/deskstar-frontend/components/EditUserModal.tsx b/src/deskstar-frontend/components/EditUserModal.tsx
index 0141089b..b49a1271 100755
--- a/src/deskstar-frontend/components/EditUserModal.tsx
+++ b/src/deskstar-frontend/components/EditUserModal.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { Dialog } from "@headlessui/react";
 import { IUser } from "../types/users";
 import Input from "./forms/Input";
@@ -6,18 +6,25 @@ import React from "react";
 
 export default function EditUserModal({
   user,
-  action,
+  setUser,
   isOpen,
   setIsOpen,
 }: {
   user?: IUser;
-  action: Function;
+  setUser: (newUser: IUser) => Promise<void>;
   isOpen: boolean;
   setIsOpen: (isOpen: boolean) => void;
 }) {
-  const [firstName, setFirstName] = useState("");
-  const [lastName, setLastName] = useState("");
-  const [email, setEmail] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [firstName, setFirstName] = useState(user?.firstName);
+  const [lastName, setLastName] = useState(user?.lastName);
+  const [email, setEmail] = useState(user?.email);
+
+  useEffect(() => {
+    setFirstName(user?.firstName);
+    setLastName(user?.lastName);
+    setEmail(user?.email);
+  }, [user]);
 
   return (
     <Dialog open={isOpen} onClose={() => setIsOpen(false)}>
@@ -42,14 +49,14 @@ export default function EditUserModal({
                       setFirstName(e.target.value);
                     }}
                     placeholder={user?.firstName}
-                    value={firstName}
+                    value={firstName ?? ""}
                   />
                   <Input
                     name="last name"
                     onChange={(e) => {
                       setLastName(e.target.value);
                     }}
-                    value={lastName}
+                    value={lastName ?? ""}
                     placeholder={user?.lastName}
                   />
                 </div>
@@ -59,22 +66,28 @@ export default function EditUserModal({
                     onChange={(e) => {
                       setEmail(e.target.value);
                     }}
-                    value={email}
+                    value={email ?? ""}
                     placeholder={user?.email}
                   />
                 </div>
               </div>
               <div className="card-actions justify-end mt-4">
                 <button
+                  disabled={isLoading}
                   className="btn btn-success"
-                  onClick={() => {
-                    setIsOpen(false);
-                    if (user != null) {
-                      if (!(firstName == "")) user.firstName = firstName;
-                      if (!(lastName == "")) user.lastName = lastName;
-                      if (!(email == "")) user.email = email;
-                      action(user);
+                  onClick={async () => {
+                    setIsLoading(true);
+                    if (user) {
+                      await setUser({
+                        ...user,
+                        firstName: firstName ?? user.firstName,
+                        lastName: lastName ?? user.lastName,
+                        email: email ?? user.email,
+                      });
+                      setIsOpen(false);
                     }
+
+                    setIsLoading(false);
                   }}
                 >
                   Save
diff --git a/src/deskstar-frontend/lib/api/UserService.ts b/src/deskstar-frontend/lib/api/UserService.ts
index c7882300..73a33593 100644
--- a/src/deskstar-frontend/lib/api/UserService.ts
+++ b/src/deskstar-frontend/lib/api/UserService.ts
@@ -70,15 +70,20 @@ export async function editUser(
   session: Session,
   user: IUser
 ): Promise<Response> {
-  var body=JSON.stringify(user);
-  body=body.replace("email", "mailAddress").replace("isAdmin", "isCompanyAdmin").replace("company", "companyId");
-  return fetch(BACKEND_URL + `/users/edit`, {
+  return await fetch(BACKEND_URL + `/users/edit`, {
     method: "POST",
     headers: {
       Authorization: `Bearer ${session.accessToken}`,
       "Content-Type": "application/json",
     },
-    body: body,
+    body: JSON.stringify({
+      UserId: user.userId,
+      LastName: user.lastName,
+      FirstName: user.firstName,
+      mailAddress: user.email,
+      isCompanyAdmin: user.isAdmin,
+      companyId: user.company,
+    }),
   });
 }
 
diff --git a/src/deskstar-frontend/pages/users/index.tsx b/src/deskstar-frontend/pages/users/index.tsx
index 4f3e1177..c94c10e2 100755
--- a/src/deskstar-frontend/pages/users/index.tsx
+++ b/src/deskstar-frontend/pages/users/index.tsx
@@ -15,6 +15,8 @@ import EditUserModal from "../../components/EditUserModal";
 export default function UsersOverview({ users }: { users: IUser[] }) {
   let { data: session } = useSession();
 
+  const [userList, setUserList] = useState(users);
+
   const [calledRouter, setCalledRouter] = useState(false);
   const router = useRouter();
 
@@ -40,17 +42,17 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     return;
   }
 
-  async function onPermissionUpdate(user: IUser): Promise<void> {
+  async function onPermissionUpdate(user: IUser) {
     setUser(user);
     setMakeAdminModalOpen(true);
   }
 
-  async function onEdit(user: IUser): Promise<void> {
+  async function onEdit(user: IUser) {
     setUser(user);
     setEditUserModalOpen(true);
   }
 
-  async function onDelete(user: IUser): Promise<void> {
+  async function onDelete(user: IUser) {
     setUser(user);
     setDeleteUserModalOpen(true);
   }
@@ -59,28 +61,41 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     if (user) {
       if (session == null) return;
       let result = await deleteUser(session, user.userId);
+
       if (result.ok) {
         toast.success(`User ${user.firstName} ${user.lastName} deleted!`);
+
+        // Remove the user from userList
+        setUserList(userList.filter((u) => user.userId !== u.userId));
       } else {
         toast.error(
           `User ${user.firstName} ${user.lastName} could not be deleted!`
         );
       }
-      // reload page
-      router.reload();
     }
   }
-  async function doUpdate() {
+
+  async function doChangePermissions() {
     if (user) {
       if (session == null) return;
-      if (user.isAdmin) {
-        user.isAdmin = false;
-      } else {
-        user.isAdmin = true;
-      }
-      let result = await editUser(session, user);
+
+      // Toggle isAdmin
+      const newUser = {
+        ...user,
+        isAdmin: !user.isAdmin,
+      };
+
+      setUser(newUser);
+
+      let result = await editUser(session, newUser);
+
       if (result.ok) {
         toast.success(`User ${user.firstName} ${user.lastName} updated!`);
+
+        // Change the user in userList
+        setUserList(
+          userList.map((u) => (newUser.userId === u.userId ? newUser : u))
+        );
       } else {
         toast.error(
           `User ${user.firstName} ${user.lastName} could not be updated!`
@@ -89,17 +104,26 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
     }
   }
 
-  async function doEdit() {
-    if (user) {
-      if (session == null) return;
-      let result = await editUser(session, user);
-      if (result.ok) {
-        toast.success(`User ${user.firstName} ${user.lastName} updated!`);
-      } else {
-        toast.error(
-          `User ${user.firstName} ${user.lastName} could not be updated!`
-        );
-      }
+  async function doEdit(newUser: IUser) {
+    if (session == null) return;
+
+    let result = await editUser(session, newUser);
+
+    if (result.ok) {
+      setUser(newUser);
+
+      toast.success(`User ${newUser.firstName} ${newUser.lastName} updated!`);
+
+      // Change the user in userList
+      setUserList(
+        userList.map((user) =>
+          user.userId === newUser.userId ? newUser : user
+        )
+      );
+    } else {
+      toast.error(
+        `User ${newUser.firstName} ${newUser.lastName} could not be updated!`
+      );
     }
   }
 
@@ -110,7 +134,7 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
       </Head>
       <h1 className="text-3xl font-bold text-center my-10">Users Overview</h1>
       <UsersTable
-        users={users}
+        users={userList}
         onPermissionUpdate={onPermissionUpdate}
         onEdit={onEdit}
         onDelete={onDelete}
@@ -137,13 +161,13 @@ export default function UsersOverview({ users }: { users: IUser[] }) {
         text=""
         warn
         buttonText="UPDATE PRIVILEGES"
-        action={doUpdate}
+        action={doChangePermissions}
         isOpen={isMakeAdminModalOpen}
         setIsOpen={setMakeAdminModalOpen}
       ></ConfirmModal>
       <EditUserModal
         user={user}
-        action={doEdit}
+        setUser={doEdit}
         isOpen={isEditUserModalOpen}
         setIsOpen={setEditUserModalOpen}
       />

From e3606b1e9837167e373ef580dca1f033abf47596 Mon Sep 17 00:00:00 2001
From: Moritz Reich <m.reich.1@campus.tu-berlin.de>
Date: Mon, 16 Jan 2023 10:12:50 +0000
Subject: [PATCH 20/23] added github copilot

Signed-off-by: Moritz Reich <m.reich.1@campus.tu-berlin.de>
---
 .devcontainer/devcontainer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3ed5f7b8..550fa6b5 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -19,7 +19,8 @@
         "eamodio.gitlens",
         "bradlc.vscode-tailwindcss",
         "ms-vscode.vscode-typescript",
-        "ms-playwright.playwright"
+        "ms-playwright.playwright",
+        "github.copilot"
       ]
     }
   },

From b05ebea033f0f55b877bb0b73368cd147226a1a3 Mon Sep 17 00:00:00 2001
From: Fiona <fiona.sternberg@fau.de>
Date: Mon, 16 Jan 2023 14:26:12 +0100
Subject: [PATCH 21/23] add simple mail validation

Co-Authored-By: Felix <88111260+xilef45@users.noreply.github.com>
---
 .../Deskstar/Helper/EmailHelper.cs            | 33 +++++++++++-------
 .../Deskstar/Usecases/AuthUsecases.cs         | 34 +++++++++++++++----
 .../Deskstar/Usecases/UserUsecases.cs         | 13 ++++---
 .../components/EditUserModal.tsx              |  1 +
 .../components/RegisterPanel.tsx              |  1 +
 5 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/src/deskstar-backend/Deskstar/Helper/EmailHelper.cs b/src/deskstar-backend/Deskstar/Helper/EmailHelper.cs
index 55b7d6e8..ec3cefb4 100644
--- a/src/deskstar-backend/Deskstar/Helper/EmailHelper.cs
+++ b/src/deskstar-backend/Deskstar/Helper/EmailHelper.cs
@@ -7,15 +7,16 @@
  *
  * MIT License
  */
+
 using System.Net.Mail;
 
 namespace Deskstar.Helper;
 
 public class EmailHelper
 {
-    private static string?  _emailPassword;
-    private static string?  _emailHost;
-    private static int  _emailPort;
+    private static string? _emailPassword;
+    private static string? _emailHost;
+    private static int _emailPort;
     private static string? _emailUsername;
     private static SmtpClient? _smtpClient;
 
@@ -24,30 +25,37 @@ public class EmailHelper
                                   "Regards, <br/> " +
                                   "<br/>" +
                                   "Deskstar Team";
+
     public static bool SendEmail(ILogger logger, string userEmail, string subject, string message)
     {
-        if(_smtpClient==null)
+        if (_smtpClient == null)
         {
             if (_emailPassword == null || _emailHost == null || _emailUsername == null)
             {
                 logger.LogError("Email credentials not set");
-                return false; 
+                return false;
             }
+
             _smtpClient = new SmtpClient(_emailHost, _emailPort);
             _smtpClient.Credentials = new System.Net.NetworkCredential(_emailUsername, _emailPassword);
             _smtpClient.EnableSsl = true;
             _smtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
             _smtpClient.UseDefaultCredentials = false;
         }
-        
+
+        if (userEmail.Contains("@acme.com"))
+        {
+            return true;
+        }
+
         var mailMessage = new MailMessage();
         mailMessage.From = new MailAddress(_emailUsername!);
         mailMessage.To.Add(new MailAddress(userEmail));
 
         mailMessage.Subject = subject;
         mailMessage.IsBodyHtml = true;
-        mailMessage.Body = message+Footer;
-        
+        mailMessage.Body = message + Footer;
+
         try
         {
             _smtpClient.Send(mailMessage);
@@ -57,26 +65,27 @@ public static bool SendEmail(ILogger logger, string userEmail, string subject, s
         {
             logger.LogError(ex, ex.Message);
         }
+
         return false;
     }
-    
+
     public static void SetMailPassword(string? password)
     {
         _emailPassword = password;
     }
+
     public static void SetMailHost(string host)
     {
         _emailHost = host;
     }
-    
+
     public static void SetMailPort(int port)
     {
         _emailPort = port;
     }
-    
+
     public static void SetMailUsername(string username)
     {
         _emailUsername = username;
     }
-    
 }
\ No newline at end of file
diff --git a/src/deskstar-backend/Deskstar/Usecases/AuthUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/AuthUsecases.cs
index 6e4770dc..7d53f8c4 100644
--- a/src/deskstar-backend/Deskstar/Usecases/AuthUsecases.cs
+++ b/src/deskstar-backend/Deskstar/Usecases/AuthUsecases.cs
@@ -8,6 +8,8 @@
 using Deskstar.Entities;
 using Microsoft.AspNetCore.Cryptography.KeyDerivation;
 using Microsoft.AspNetCore.Identity;
+using System.Text.RegularExpressions;
+using Deskstar.Core.Exceptions;
 
 namespace Deskstar.Usecases
 {
@@ -35,11 +37,15 @@ public LoginResponse CheckCredentials(string mail, string password)
         {
             try
             {
-                var user = _context.Users.Single(u => u.MailAddress == mail);
-                if (!user.IsApproved)
+                var registerUser
+ = _context.Users.Single(u => u.MailAddress == mail);
+                if (!registerUser
+.IsApproved)
                     return new LoginResponse
                     {Message = LoginReturn.NotYetApproved};
-                if (_hasher.VerifyHashedPassword(user, user.Password, password)
+                if (_hasher.VerifyHashedPassword(registerUser
+, registerUser
+.Password, password)
                     == PasswordVerificationResult.Success)
                     return new LoginResponse
                         {Message = LoginReturn.Ok};
@@ -56,8 +62,8 @@ public LoginResponse CheckCredentials(string mail, string password)
 
         public string CreateToken(IConfiguration configuration, String mail)
         {
-            var user = _getUser(mail);
-            if (user == User.Null)
+            var registerUser = _getUser(mail);
+            if (registerUser == User.Null)
             {
                 return "";
             }
@@ -70,8 +76,10 @@ public string CreateToken(IConfiguration configuration, String mail)
             {
                 Subject = new ClaimsIdentity(new[]
                 {
-                new Claim(JwtRegisteredClaimNames.NameId,user.UserId.ToString()),
-                user.IsCompanyAdmin?new Claim("IsCompanyAdmin","True" ):new Claim("IsNormalUser","True"),
+                new Claim(JwtRegisteredClaimNames.NameId,registerUser
+.UserId.ToString()),
+                registerUser
+.IsCompanyAdmin?new Claim("IsCompanyAdmin","True" ):new Claim("IsNormalUser","True"),
                 new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString())
              }),
                 Expires = DateTime.UtcNow.AddMinutes(30),
@@ -89,6 +97,18 @@ public string CreateToken(IConfiguration configuration, String mail)
 
         public RegisterResponse RegisterUser(RegisterUser registerUser)
         {
+            if (registerUser.FirstName == null || registerUser.FirstName.Length == 0)
+                throw new ArgumentInvalidException($"'{nameof(registerUser.FirstName)}' is not set");
+            if (registerUser.LastName == null || registerUser.LastName.Length == 0)
+                throw new ArgumentInvalidException($"'{nameof(registerUser.LastName)}' is not set");
+            if (registerUser.MailAddress == null || registerUser.MailAddress.Length == 0)
+                throw new ArgumentInvalidException($"'{nameof(registerUser.MailAddress)}' is not set");
+            if (registerUser.Password == null || registerUser.Password.Length == 0)
+                throw new ArgumentInvalidException($"'{nameof(registerUser.Password)}' is not set");
+            Regex rx = new Regex("(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\\])",
+            RegexOptions.IgnoreCase);
+            if (rx.Matches(registerUser.MailAddress).Count != 1) 
+                throw new ArgumentInvalidException("Mailaddress is not valid");
             if (_getUser(registerUser.MailAddress) != User.Null)
             {
                 return new RegisterResponse
diff --git a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
index 2fbf1e21..35caac09 100644
--- a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
+++ b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
@@ -12,6 +12,7 @@
 using Deskstar.Entities;
 using Deskstar.Helper;
 using Microsoft.EntityFrameworkCore;
+using System.Text.RegularExpressions;
 
 namespace Deskstar.Usecases;
 
@@ -155,14 +156,18 @@ public Guid UpdateUser(Guid adminId, User user)
     }
     private Guid SaveUpdateUser(User user)
     {
-        if(user.UserId == Guid.Empty)
+        if (user.UserId == Guid.Empty)
             throw new ArgumentInvalidException($"'{nameof(user.UserId)}' is empty");
-        if(user.FirstName == null|| user.FirstName.Length == 0)
+        if (user.FirstName == null || user.FirstName.Length == 0)
             throw new ArgumentInvalidException($"'{nameof(user.FirstName)}' is not set");
-        if(user.LastName == null|| user.LastName.Length == 0)
+        if (user.LastName == null || user.LastName.Length == 0)
             throw new ArgumentInvalidException($"'{nameof(user.LastName)}' is not set");
-        if(user.MailAddress == null|| user.MailAddress.Length == 0)
+        if (user.MailAddress == null || user.MailAddress.Length == 0)
             throw new ArgumentInvalidException($"'{nameof(user.MailAddress)}' is not set");
+        Regex rx = new Regex("(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\\])",
+            RegexOptions.IgnoreCase);
+        if (rx.Matches(user.MailAddress).Count != 1) 
+            throw new ArgumentInvalidException("Mailaddress is not valid");
         var userDbInstance = _context.Users.SingleOrDefault(u => u.UserId == user.UserId);
         if (userDbInstance == null)
             throw new EntityNotFoundException($"There is no user with id '{user.UserId}'");
diff --git a/src/deskstar-frontend/components/EditUserModal.tsx b/src/deskstar-frontend/components/EditUserModal.tsx
index b49a1271..dd7e0d23 100755
--- a/src/deskstar-frontend/components/EditUserModal.tsx
+++ b/src/deskstar-frontend/components/EditUserModal.tsx
@@ -63,6 +63,7 @@ export default function EditUserModal({
                 <div>
                   <Input
                     name="E-Mail"
+                    type="email"
                     onChange={(e) => {
                       setEmail(e.target.value);
                     }}
diff --git a/src/deskstar-frontend/components/RegisterPanel.tsx b/src/deskstar-frontend/components/RegisterPanel.tsx
index 40e008ca..9f8032f8 100644
--- a/src/deskstar-frontend/components/RegisterPanel.tsx
+++ b/src/deskstar-frontend/components/RegisterPanel.tsx
@@ -81,6 +81,7 @@ export default function RegisterPanel() {
         <Input
           name="email"
           value={email}
+          type="email"
           onChange={(e) => setEmail(e.target.value)}
           placeholder="Email"
         />

From 3a319ba3bd2fa344902a16784d6e81be1eede201 Mon Sep 17 00:00:00 2001
From: Fiona <fiona.sternberg@fau.de>
Date: Mon, 16 Jan 2023 14:40:07 +0100
Subject: [PATCH 22/23] update deletion of users

Co-Authored-By: Felix <88111260+xilef45@users.noreply.github.com>
---
 .../Deskstar/Entities/User.cs                 |   2 +
 ...230116133451_MarkUserAsDeleted.Designer.cs | 462 ++++++++++++++++++
 .../20230116133451_MarkUserAsDeleted.cs       |  26 +
 .../Migrations/DataContextModelSnapshot.cs    |   3 +
 .../Deskstar/Usecases/AuthUsecases.cs         |  10 +-
 .../Deskstar/Usecases/UserUsecases.cs         |  15 +-
 6 files changed, 507 insertions(+), 11 deletions(-)
 create mode 100644 src/deskstar-backend/Deskstar/Migrations/20230116133451_MarkUserAsDeleted.Designer.cs
 create mode 100644 src/deskstar-backend/Deskstar/Migrations/20230116133451_MarkUserAsDeleted.cs

diff --git a/src/deskstar-backend/Deskstar/Entities/User.cs b/src/deskstar-backend/Deskstar/Entities/User.cs
index 13f5fb47..24fc1847 100644
--- a/src/deskstar-backend/Deskstar/Entities/User.cs
+++ b/src/deskstar-backend/Deskstar/Entities/User.cs
@@ -19,6 +19,8 @@ public User()
         public bool IsApproved { get; set; }
         
         public bool IsCompanyAdmin { get; set; }
+        
+        public bool IsMarkedForDeletion { get; set; }
 
         public virtual Company Company { get; set; } = null!;
         public virtual ICollection<Booking> Bookings { get; set; }
diff --git a/src/deskstar-backend/Deskstar/Migrations/20230116133451_MarkUserAsDeleted.Designer.cs b/src/deskstar-backend/Deskstar/Migrations/20230116133451_MarkUserAsDeleted.Designer.cs
new file mode 100644
index 00000000..98569a98
--- /dev/null
+++ b/src/deskstar-backend/Deskstar/Migrations/20230116133451_MarkUserAsDeleted.Designer.cs
@@ -0,0 +1,462 @@
+// <auto-generated />
+using System;
+using Deskstar.DataAccess;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Deskstar.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("20230116133451_MarkUserAsDeleted")]
+    partial class MarkUserAsDeleted
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Deskstar.Entities.Booking", b =>
+                {
+                    b.Property<Guid>("BookingId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("BookingID")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid>("DeskId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeskID");
+
+                    b.Property<DateTime>("EndTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("StartTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("Timestamp")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp without time zone")
+                        .HasDefaultValueSql("CURRENT_TIMESTAMP(2)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("UserID");
+
+                    b.HasKey("BookingId");
+
+                    b.HasIndex("DeskId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Booking", (string)null);
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Building", b =>
+                {
+                    b.Property<Guid>("BuildingId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("BuildingID")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("BuildingName")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CompanyID");
+
+                    b.Property<string>("Location")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.HasKey("BuildingId");
+
+                    b.HasIndex("CompanyId");
+
+                    b.ToTable("Building", (string)null);
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Company", b =>
+                {
+                    b.Property<Guid>("CompanyId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("CompanyID")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("CompanyName")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.Property<bool?>("Logo")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("CompanyId");
+
+                    b.ToTable("Company", (string)null);
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Desk", b =>
+                {
+                    b.Property<Guid>("DeskId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeskID")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("DeskName")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.Property<Guid>("DeskTypeId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeskTypeID");
+
+                    b.Property<Guid>("RoomId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("RoomID");
+
+                    b.HasKey("DeskId");
+
+                    b.HasIndex("DeskTypeId");
+
+                    b.HasIndex("RoomId");
+
+                    b.ToTable("Desk", (string)null);
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.DeskType", b =>
+                {
+                    b.Property<Guid>("DeskTypeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeskTypeID")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CompanyID");
+
+                    b.Property<string>("DeskTypeName")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.HasKey("DeskTypeId");
+
+                    b.HasIndex("CompanyId");
+
+                    b.ToTable("DeskType", (string)null);
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Floor", b =>
+                {
+                    b.Property<Guid>("FloorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("FloorID")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid>("BuildingId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("BuildingID");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.HasKey("FloorId");
+
+                    b.HasIndex("BuildingId");
+
+                    b.ToTable("Floor", (string)null);
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Role", b =>
+                {
+                    b.Property<Guid>("RoleId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("RoleID")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CompanyID");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.HasKey("RoleId");
+
+                    b.HasIndex("CompanyId");
+
+                    b.ToTable("Role", (string)null);
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Room", b =>
+                {
+                    b.Property<Guid>("RoomId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("RoomID")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid>("FloorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("FloorID");
+
+                    b.Property<string>("RoomName")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.HasKey("RoomId");
+
+                    b.HasIndex("FloorId");
+
+                    b.ToTable("Room", (string)null);
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.User", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("UserID")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid>("CompanyId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CompanyID");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.Property<bool>("IsApproved")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValueSql("false");
+
+                    b.Property<bool>("IsCompanyAdmin")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValueSql("false");
+
+                    b.Property<bool>("IsMarkedForDeletion")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.Property<string>("MailAddress")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("character varying");
+
+                    b.HasKey("UserId");
+
+                    b.HasIndex("CompanyId");
+
+                    b.HasIndex(new[] { "MailAddress" }, "User_Mail")
+                        .IsUnique();
+
+                    b.ToTable("User", (string)null);
+                });
+
+            modelBuilder.Entity("UserRole", b =>
+                {
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("RoleID");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("UserID");
+
+                    b.HasKey("RoleId", "UserId")
+                        .HasName("UserRole_pk");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserRole", (string)null);
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Booking", b =>
+                {
+                    b.HasOne("Deskstar.Entities.Desk", "Desk")
+                        .WithMany("Bookings")
+                        .HasForeignKey("DeskId")
+                        .IsRequired()
+                        .HasConstraintName("Booking_Desk_null_fk");
+
+                    b.HasOne("Deskstar.Entities.User", "User")
+                        .WithMany("Bookings")
+                        .HasForeignKey("UserId")
+                        .IsRequired()
+                        .HasConstraintName("Booking_User_null_fk");
+
+                    b.Navigation("Desk");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Building", b =>
+                {
+                    b.HasOne("Deskstar.Entities.Company", "Company")
+                        .WithMany("Buildings")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("foreign_key_name");
+
+                    b.Navigation("Company");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Desk", b =>
+                {
+                    b.HasOne("Deskstar.Entities.DeskType", "DeskType")
+                        .WithMany("Desks")
+                        .HasForeignKey("DeskTypeId")
+                        .IsRequired()
+                        .HasConstraintName("Desk_DeskType_null_fk");
+
+                    b.HasOne("Deskstar.Entities.Room", "Room")
+                        .WithMany("Desks")
+                        .HasForeignKey("RoomId")
+                        .IsRequired()
+                        .HasConstraintName("Desk_Room_null_fk");
+
+                    b.Navigation("DeskType");
+
+                    b.Navigation("Room");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.DeskType", b =>
+                {
+                    b.HasOne("Deskstar.Entities.Company", "Company")
+                        .WithMany("DeskTypes")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("DeskType_Company_null_fk");
+
+                    b.Navigation("Company");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Floor", b =>
+                {
+                    b.HasOne("Deskstar.Entities.Building", "Building")
+                        .WithMany("Floors")
+                        .HasForeignKey("BuildingId")
+                        .IsRequired()
+                        .HasConstraintName("Floor_Building_null_fk");
+
+                    b.Navigation("Building");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Role", b =>
+                {
+                    b.HasOne("Deskstar.Entities.Company", "Company")
+                        .WithMany("Roles")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("Role_Company_null_fk");
+
+                    b.Navigation("Company");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Room", b =>
+                {
+                    b.HasOne("Deskstar.Entities.Floor", "Floor")
+                        .WithMany("Rooms")
+                        .HasForeignKey("FloorId")
+                        .IsRequired()
+                        .HasConstraintName("Room_Floor_null_fk");
+
+                    b.Navigation("Floor");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.User", b =>
+                {
+                    b.HasOne("Deskstar.Entities.Company", "Company")
+                        .WithMany("Users")
+                        .HasForeignKey("CompanyId")
+                        .IsRequired()
+                        .HasConstraintName("CompanyID_fk");
+
+                    b.Navigation("Company");
+                });
+
+            modelBuilder.Entity("UserRole", b =>
+                {
+                    b.HasOne("Deskstar.Entities.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .IsRequired()
+                        .HasConstraintName("UserRole_Role_null_fk");
+
+                    b.HasOne("Deskstar.Entities.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .IsRequired()
+                        .HasConstraintName("UserRole_User_null_fk");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Building", b =>
+                {
+                    b.Navigation("Floors");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Company", b =>
+                {
+                    b.Navigation("Buildings");
+
+                    b.Navigation("DeskTypes");
+
+                    b.Navigation("Roles");
+
+                    b.Navigation("Users");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Desk", b =>
+                {
+                    b.Navigation("Bookings");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.DeskType", b =>
+                {
+                    b.Navigation("Desks");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Floor", b =>
+                {
+                    b.Navigation("Rooms");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.Room", b =>
+                {
+                    b.Navigation("Desks");
+                });
+
+            modelBuilder.Entity("Deskstar.Entities.User", b =>
+                {
+                    b.Navigation("Bookings");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/deskstar-backend/Deskstar/Migrations/20230116133451_MarkUserAsDeleted.cs b/src/deskstar-backend/Deskstar/Migrations/20230116133451_MarkUserAsDeleted.cs
new file mode 100644
index 00000000..67e83f79
--- /dev/null
+++ b/src/deskstar-backend/Deskstar/Migrations/20230116133451_MarkUserAsDeleted.cs
@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Deskstar.Migrations
+{
+    public partial class MarkUserAsDeleted : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsMarkedForDeletion",
+                table: "User",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsMarkedForDeletion",
+                table: "User");
+        }
+    }
+}
diff --git a/src/deskstar-backend/Deskstar/Migrations/DataContextModelSnapshot.cs b/src/deskstar-backend/Deskstar/Migrations/DataContextModelSnapshot.cs
index 916fa573..8499c9bc 100644
--- a/src/deskstar-backend/Deskstar/Migrations/DataContextModelSnapshot.cs
+++ b/src/deskstar-backend/Deskstar/Migrations/DataContextModelSnapshot.cs
@@ -252,6 +252,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("boolean")
                         .HasDefaultValueSql("false");
 
+                    b.Property<bool>("IsMarkedForDeletion")
+                        .HasColumnType("boolean");
+
                     b.Property<string>("LastName")
                         .IsRequired()
                         .HasColumnType("character varying");
diff --git a/src/deskstar-backend/Deskstar/Usecases/AuthUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/AuthUsecases.cs
index 7d53f8c4..a50e570a 100644
--- a/src/deskstar-backend/Deskstar/Usecases/AuthUsecases.cs
+++ b/src/deskstar-backend/Deskstar/Usecases/AuthUsecases.cs
@@ -97,15 +97,15 @@ public string CreateToken(IConfiguration configuration, String mail)
 
         public RegisterResponse RegisterUser(RegisterUser registerUser)
         {
-            if (registerUser.FirstName == null || registerUser.FirstName.Length == 0)
+            if (string.IsNullOrEmpty(registerUser.FirstName))
                 throw new ArgumentInvalidException($"'{nameof(registerUser.FirstName)}' is not set");
-            if (registerUser.LastName == null || registerUser.LastName.Length == 0)
+            if (string.IsNullOrEmpty(registerUser.LastName))
                 throw new ArgumentInvalidException($"'{nameof(registerUser.LastName)}' is not set");
-            if (registerUser.MailAddress == null || registerUser.MailAddress.Length == 0)
+            if (string.IsNullOrEmpty(registerUser.MailAddress))
                 throw new ArgumentInvalidException($"'{nameof(registerUser.MailAddress)}' is not set");
-            if (registerUser.Password == null || registerUser.Password.Length == 0)
+            if (string.IsNullOrEmpty(registerUser.Password))
                 throw new ArgumentInvalidException($"'{nameof(registerUser.Password)}' is not set");
-            Regex rx = new Regex("(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\\])",
+            var rx = new Regex("(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\\])",
             RegexOptions.IgnoreCase);
             if (rx.Matches(registerUser.MailAddress).Count != 1) 
                 throw new ArgumentInvalidException("Mailaddress is not valid");
diff --git a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
index 35caac09..8fc0de69 100644
--- a/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
+++ b/src/deskstar-backend/Deskstar/Usecases/UserUsecases.cs
@@ -122,7 +122,9 @@ public List<User> ReadAllUsers(Guid adminId)
         var admin = _context.Users.SingleOrDefault(user => user.UserId == adminId);
         if (admin == null)
             throw new EntityNotFoundException($"There is no admin with id '{adminId}'");
-        return _context.Users.Where(user => user.CompanyId == admin.CompanyId).ToList();
+        return _context.Users.Where(user => user.CompanyId == admin.CompanyId)
+            .Where(user => !user.IsMarkedForDeletion)
+            .ToList();
     }
 
     public Guid UpdateUser(string requestUserId, User user)
@@ -158,13 +160,13 @@ private Guid SaveUpdateUser(User user)
     {
         if (user.UserId == Guid.Empty)
             throw new ArgumentInvalidException($"'{nameof(user.UserId)}' is empty");
-        if (user.FirstName == null || user.FirstName.Length == 0)
+        if (string.IsNullOrEmpty(user.FirstName))
             throw new ArgumentInvalidException($"'{nameof(user.FirstName)}' is not set");
-        if (user.LastName == null || user.LastName.Length == 0)
+        if (string.IsNullOrEmpty(user.LastName))
             throw new ArgumentInvalidException($"'{nameof(user.LastName)}' is not set");
-        if (user.MailAddress == null || user.MailAddress.Length == 0)
+        if (string.IsNullOrEmpty(user.MailAddress))
             throw new ArgumentInvalidException($"'{nameof(user.MailAddress)}' is not set");
-        Regex rx = new Regex("(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\\])",
+        var rx = new Regex("(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\\])",
             RegexOptions.IgnoreCase);
         if (rx.Matches(user.MailAddress).Count != 1) 
             throw new ArgumentInvalidException("Mailaddress is not valid");
@@ -205,7 +207,8 @@ public Guid DeleteUser(Guid adminId, string userId)
                    "your account has been releted by your Company admin.</br> " +
                    "If you think this was an mistake, get in touch with your company admin.</br>";
         EmailHelper.SendEmail(_logger, userDbInstance.MailAddress, "Your Deskstar account details have been updated!", body);
-        _context.Users.Remove(userDbInstance);
+        userDbInstance.IsMarkedForDeletion = true;
+        // _context.Users.Remove(userDbInstance);
         _context.SaveChanges();
 
         return guid;

From 58745884f4014920cf9100d9c4a6059daf1e292c Mon Sep 17 00:00:00 2001
From: Fiona <fiona.sternberg@fau.de>
Date: Mon, 16 Jan 2023 14:49:45 +0100
Subject: [PATCH 23/23] update tests

Co-Authored-By: Felix <88111260+xilef45@users.noreply.github.com>
---
 .../Teststar.Tests/Tests/UserUsecasesTests.cs | 62 ++++++++++++-------
 1 file changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs b/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs
index b3f6267a..aae44e63 100644
--- a/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs
+++ b/src/deskstar-backend/Teststar.Tests/Tests/UserUsecasesTests.cs
@@ -30,6 +30,7 @@ public void ReadSpecificUser_WhenInvalidUserIdIsGiven_ShouldThrowEntityNotFoundE
         //cleanup
         db.Database.EnsureDeleted();
     }
+
     [Test]
     public void ReadSpecificUser_WhenValidUserIdIsGiven_ShouldReturnUser()
     {
@@ -51,7 +52,6 @@ public void ReadSpecificUser_WhenValidUserIdIsGiven_ShouldReturnUser()
 
         //cleanup
         db.Database.EnsureDeleted();
-
     }
 
     [Test]
@@ -96,6 +96,7 @@ public void ApproveUser_WhenInvalidUserIdIsGiven_ShouldThrowArgumentInvalidExcep
         //cleanup
         db.Database.EnsureDeleted();
     }
+
     [Test]
     public void ApproveUser_WhenThereIsNoUserWithGivenId_ShouldThrowEntityNotFoundException()
     {
@@ -115,8 +116,10 @@ public void ApproveUser_WhenThereIsNoUserWithGivenId_ShouldThrowEntityNotFoundEx
         //cleanup
         db.Database.EnsureDeleted();
     }
+
     [Test]
-    public void ApproveUser_WhenValidUserIsGivenButAdminIsFromDifferentCompany_ShouldThrowInsufficientPermissionException()
+    public void
+        ApproveUser_WhenValidUserIsGivenButAdminIsFromDifferentCompany_ShouldThrowInsufficientPermissionException()
     {
         //setup
         using var db = new DataContext();
@@ -129,13 +132,16 @@ public void ApproveUser_WhenValidUserIsGivenButAdminIsFromDifferentCompany_Shoul
         var userUsecases = new UserUsecases(logger.Object, db);
 
         //act + assert
-        Assert.Throws<InsufficientPermissionException>(() => userUsecases.ApproveUser(admin.UserId, user.UserId.ToString()));
+        Assert.Throws<InsufficientPermissionException>(() =>
+            userUsecases.ApproveUser(admin.UserId, user.UserId.ToString()));
 
         //cleanup
         db.Database.EnsureDeleted();
     }
+
     [Test]
-    public void DeclineUser_WhenValidUserIsGivenButAdminIsFromDifferentCompany_ShouldThrowInsufficientPermissionException()
+    public void
+        DeclineUser_WhenValidUserIsGivenButAdminIsFromDifferentCompany_ShouldThrowInsufficientPermissionException()
     {
         //setup
         using var db = new DataContext();
@@ -148,7 +154,8 @@ public void DeclineUser_WhenValidUserIsGivenButAdminIsFromDifferentCompany_Shoul
         var userUsecases = new UserUsecases(logger.Object, db);
 
         //act + assert
-        Assert.Throws<InsufficientPermissionException>(() => userUsecases.DeclineUser(admin.UserId, user.UserId.ToString()));
+        Assert.Throws<InsufficientPermissionException>(() =>
+            userUsecases.DeclineUser(admin.UserId, user.UserId.ToString()));
 
         //cleanup
         db.Database.EnsureDeleted();
@@ -173,6 +180,7 @@ public void DeclineUser_WhenUserIsAlreadyApproved_ShouldThrowArgumentInvalidExce
         //cleanup
         db.Database.EnsureDeleted();
     }
+
     [Test]
     public void DeclineUser_WhenNoUserExistsWithGivenId_ShouldThrowEntityNotFoundException()
     {
@@ -234,12 +242,12 @@ public void UpdateUser_WhenValidUserIsProvided_ShouldUpdateUser()
         var userUsecases = new UserUsecases(logger.Object, db);
 
         //act
-        var result = userUsecases.UpdateUser(user.UserId,user);
+        var result = userUsecases.UpdateUser(user.UserId, user);
 
         //assert
         Assert.That(result == user.UserId);
-
     }
+
     [Test]
     public void UpdateUser_WhenInvalidUserIsProvided_ShouldThrowEntityNotFoundException()
     {
@@ -255,9 +263,9 @@ public void UpdateUser_WhenInvalidUserIsProvided_ShouldThrowEntityNotFoundExcept
         var userUsecases = new UserUsecases(logger.Object, db);
 
         //act + assert
-        Assert.Throws<EntityNotFoundException>(() => userUsecases.UpdateUser(new Guid(),new User()));
-
+        Assert.Throws<EntityNotFoundException>(() => userUsecases.UpdateUser(new Guid(), new User()));
     }
+
     [Test]
     public void UpdateUser_AsAdmin_WhenValidUserIsProvided_ShouldUpdateUser()
     {
@@ -273,13 +281,12 @@ public void UpdateUser_AsAdmin_WhenValidUserIsProvided_ShouldUpdateUser()
         var userUsecases = new UserUsecases(logger.Object, db);
 
         //act
-        var result = userUsecases.UpdateUser(admin.UserId,user);
+        var result = userUsecases.UpdateUser(admin.UserId, user);
 
         //assert
         Assert.That(result == user.UserId);
-
     }
-    
+
     [Test]
     public void ReadAllUsers_WhenValidUserIdIsProvided_ShouldReturnListOfAllUsersInTheSameCompany()
     {
@@ -300,8 +307,8 @@ public void ReadAllUsers_WhenValidUserIdIsProvided_ShouldReturnListOfAllUsersInT
         //assert
         Assert.That(result.Count != 0);
         Assert.That(result.Contains(user));
-
     }
+
     [Test]
     public void ReadAllUsers_WhenInvalidUserIdIsProvided_ShouldThrowEntityNotFoundException()
     {
@@ -318,9 +325,8 @@ public void ReadAllUsers_WhenInvalidUserIdIsProvided_ShouldThrowEntityNotFoundEx
 
         //act + assert
         Assert.Throws<EntityNotFoundException>(() => userUsecases.ReadAllUsers(new Guid()));
-
     }
-    
+
     [Test]
     public void DeleteUser_WhenValidUserIsProvided_ShouldUpdateUser()
     {
@@ -336,13 +342,13 @@ public void DeleteUser_WhenValidUserIsProvided_ShouldUpdateUser()
         var userUsecases = new UserUsecases(logger.Object, db);
 
         //act
-        var result = userUsecases.DeleteUser(admin.UserId,user.UserId.ToString());
+        var result = userUsecases.DeleteUser(admin.UserId, user.UserId.ToString());
 
         //assert
         Assert.That(result, Is.EqualTo(user.UserId));
-        Assert.That(!db.Users.Any(u => u.UserId==user.UserId));
-
+        Assert.That(db.Users.First(u => u.UserId == user.UserId).IsMarkedForDeletion);
     }
+
     [Test]
     public void DeleteUser_WhenNonValidUserIsProvided_ShouldUpdateUser()
     {
@@ -357,8 +363,12 @@ public void DeleteUser_WhenNonValidUserIsProvided_ShouldUpdateUser()
         var logger = new Mock<ILogger<UserUsecases>>();
         var userUsecases = new UserUsecases(logger.Object, db);
         
+        
+        //act
+        userUsecases.DeleteUser(admin.UserId, user.UserId.ToString());
+
         //assert
-        Assert.Throws<EntityNotFoundException>(() => userUsecases.DeleteUser(admin.UserId,Guid.NewGuid().ToString()));
+        Assert.That(db.Users.First(u => u.UserId == user.UserId).IsMarkedForDeletion);
     }
 
     private void SetupSingleUser(DataContext db, bool userApproved, out User user, out User admin)
@@ -397,6 +407,7 @@ private void SetupSingleUser(DataContext db, bool userApproved, out User user, o
         db.Users.Add(admin);
         db.SaveChanges();
     }
+
     private void SetupSingleUserInDifferentCompany(DataContext db, bool isApproved, out User user, out User admin)
     {
         var hasher = new PasswordHasher<User>();
@@ -440,36 +451,46 @@ private void SetupSingleUserInDifferentCompany(DataContext db, bool isApproved,
         db.Users.Add(admin);
         db.SaveChanges();
     }
-    private void setupMockData(DataContext moqDb, Guid companyID = new Guid(), Guid userID = new Guid(), Guid buildingID = new Guid(), Guid floorID = new Guid(), Guid roomID = new Guid(), Guid deskTypeID = new Guid(), Guid deskID = new Guid())
+
+    private void setupMockData(DataContext moqDb, Guid companyID = new Guid(), Guid userID = new Guid(),
+        Guid buildingID = new Guid(), Guid floorID = new Guid(), Guid roomID = new Guid(), Guid deskTypeID = new Guid(),
+        Guid deskID = new Guid())
     {
         if (companyID.ToString() == "00000000-0000-0000-0000-000000000000")
         {
             companyID = Guid.NewGuid();
         }
+
         if (userID.ToString() == "00000000-0000-0000-0000-000000000000")
         {
             userID = Guid.NewGuid();
         }
+
         if (buildingID.ToString() == "00000000-0000-0000-0000-000000000000")
         {
             buildingID = Guid.NewGuid();
         }
+
         if (floorID.ToString() == "00000000-0000-0000-0000-000000000000")
         {
             floorID = Guid.NewGuid();
         }
+
         if (roomID.ToString() == "00000000-0000-0000-0000-000000000000")
         {
             roomID = Guid.NewGuid();
         }
+
         if (deskTypeID.ToString() == "00000000-0000-0000-0000-000000000000")
         {
             deskTypeID = Guid.NewGuid();
         }
+
         if (deskID.ToString() == "00000000-0000-0000-0000-000000000000")
         {
             deskID = Guid.NewGuid();
         }
+
         var hasher = new PasswordHasher<User>();
         var company = new Company
         {
@@ -527,6 +548,5 @@ private void SetupSingleUserInDifferentCompany(DataContext db, bool isApproved,
         moqDb.Desks.Add(desk);
 
         moqDb.SaveChanges();
-
     }
 }
\ No newline at end of file