From 98e17766b203734a1817eed94338e2d25f4395f7 Mon Sep 17 00:00:00 2001 From: transtrike Date: Sat, 13 Feb 2021 16:20:18 +0200 Subject: Project Restructure P.1 --- src/Web/DevHive.Web/Controllers/UserController.cs | 140 ++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 src/Web/DevHive.Web/Controllers/UserController.cs (limited to 'src/Web/DevHive.Web/Controllers/UserController.cs') diff --git a/src/Web/DevHive.Web/Controllers/UserController.cs b/src/Web/DevHive.Web/Controllers/UserController.cs new file mode 100644 index 0000000..109bbaa --- /dev/null +++ b/src/Web/DevHive.Web/Controllers/UserController.cs @@ -0,0 +1,140 @@ +using System; +using System.Threading.Tasks; +using AutoMapper; +using DevHive.Services.Models.Identity.User; +using DevHive.Web.Models.Identity.User; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using DevHive.Common.Models.Identity; +using DevHive.Services.Interfaces; +using Microsoft.Extensions.Hosting; + +namespace DevHive.Web.Controllers +{ + [ApiController] + [Route("/api/[controller]")] + public class UserController : ControllerBase + { + private readonly IUserService _userService; + private readonly IMapper _userMapper; + + public UserController(IUserService userService, IMapper mapper) + { + this._userService = userService; + this._userMapper = mapper; + } + + #region Authentication + [HttpPost] + [Route("Login")] + [AllowAnonymous] + public async Task Login([FromBody] LoginWebModel loginModel) + { + LoginServiceModel loginServiceModel = this._userMapper.Map(loginModel); + + TokenModel TokenModel = await this._userService.LoginUser(loginServiceModel); + TokenWebModel tokenWebModel = this._userMapper.Map(TokenModel); + + return new OkObjectResult(tokenWebModel); + } + + [HttpPost] + [Route("Register")] + [AllowAnonymous] + public async Task Register([FromBody] RegisterWebModel registerModel) + { + RegisterServiceModel registerServiceModel = this._userMapper.Map(registerModel); + + TokenModel TokenModel = await this._userService.RegisterUser(registerServiceModel); + TokenWebModel tokenWebModel = this._userMapper.Map(TokenModel); + + return new CreatedResult("Register", tokenWebModel); + } + #endregion + + #region Read + [HttpGet] + [Authorize(Roles = "User,Admin")] + public async Task GetById(Guid id, [FromHeader] string authorization) + { + if (!await this._userService.ValidJWT(id, authorization)) + return new UnauthorizedResult(); + + UserServiceModel userServiceModel = await this._userService.GetUserById(id); + UserWebModel userWebModel = this._userMapper.Map(userServiceModel); + + return new OkObjectResult(userWebModel); + } + + [HttpGet] + [Route("GetUser")] + [AllowAnonymous] + public async Task GetUser(string username) + { + UserServiceModel friendServiceModel = await this._userService.GetUserByUsername(username); + UserWebModel friend = this._userMapper.Map(friendServiceModel); + + return new OkObjectResult(friend); + } + #endregion + + #region Update + [HttpPut] + [Authorize(Roles = "User,Admin")] + public async Task Update(Guid id, [FromBody] UpdateUserWebModel updateUserWebModel, [FromHeader] string authorization) + { + if (!await this._userService.ValidJWT(id, authorization)) + return new UnauthorizedResult(); + + UpdateUserServiceModel updateUserServiceModel = this._userMapper.Map(updateUserWebModel); + updateUserServiceModel.Id = id; + + UserServiceModel userServiceModel = await this._userService.UpdateUser(updateUserServiceModel); + UserWebModel userWebModel = this._userMapper.Map(userServiceModel); + + return new AcceptedResult("UpdateUser", userWebModel); + } + + [HttpPut] + [Route("ProfilePicture")] + [Authorize(Roles = "User,Admin")] + public async Task UpdateProfilePicture(Guid userId, [FromForm] UpdateProfilePictureWebModel updateProfilePictureWebModel, [FromHeader] string authorization) + { + if (!await this._userService.ValidJWT(userId, authorization)) + return new UnauthorizedResult(); + + UpdateProfilePictureServiceModel updateProfilePictureServiceModel = this._userMapper.Map(updateProfilePictureWebModel); + updateProfilePictureServiceModel.UserId = userId; + + ProfilePictureServiceModel profilePictureServiceModel = await this._userService.UpdateProfilePicture(updateProfilePictureServiceModel); + ProfilePictureWebModel profilePictureWebModel = this._userMapper.Map(profilePictureServiceModel); + + return new AcceptedResult("UpdateProfilePicture", profilePictureWebModel); + } + #endregion + + #region Delete + [HttpDelete] + [Authorize(Roles = "User,Admin")] + public async Task Delete(Guid id, [FromHeader] string authorization) + { + if (!await this._userService.ValidJWT(id, authorization)) + return new UnauthorizedResult(); + + bool result = await this._userService.DeleteUser(id); + if (!result) + return new BadRequestObjectResult("Could not delete User"); + + return new OkResult(); + } + #endregion + + [HttpPost] + [Authorize(Roles = "User,Admin")] + [Route("SuperSecretPromotionToAdmin")] + public async Task SuperSecretPromotionToAdmin(Guid userId) + { + return new OkObjectResult(await this._userService.SuperSecretPromotionToAdmin(userId)); + } + } +} -- cgit v1.2.3 From c5b27c7eb62cc5428a0c01ffcf381f429d776122 Mon Sep 17 00:00:00 2001 From: transtrike Date: Sat, 13 Feb 2021 17:57:54 +0200 Subject: Removed all references --- src/Data/DevHive.Data.Models/Comment.cs | 2 +- .../DevHive.Data.Models/DevHive.Data.Models.csproj | 6 - .../DevHive.Data.Models/Interfaces/IComment.cs | 16 ++ .../DevHive.Data.Models/Interfaces/ILanguage.cs | 11 + src/Data/DevHive.Data.Models/Interfaces/IModel.cs | 9 + src/Data/DevHive.Data.Models/Interfaces/IPost.cs | 22 ++ .../Interfaces/IProfilePicture.cs | 13 + src/Data/DevHive.Data.Models/Interfaces/IRating.cs | 14 + src/Data/DevHive.Data.Models/Interfaces/IRole.cs | 10 + .../DevHive.Data.Models/Interfaces/ITechnology.cs | 11 + src/Data/DevHive.Data.Models/Interfaces/IUser.cs | 21 ++ src/Data/DevHive.Data.Models/Language.cs | 2 +- src/Data/DevHive.Data.Models/Post.cs | 2 +- src/Data/DevHive.Data.Models/ProfilePicture.cs | 2 +- src/Data/DevHive.Data.Models/Rating.cs | 4 +- src/Data/DevHive.Data.Models/Role.cs | 2 +- src/Data/DevHive.Data.Models/Technology.cs | 2 +- src/Data/DevHive.Data.Models/User.cs | 2 +- .../DevHive.Data.Tests/DevHive.Data.Tests.csproj | 8 - src/Data/DevHive.Data/DevHive.Data.csproj | 8 - .../DevHive.Data/Interfaces/ICommentRepository.cs | 16 ++ .../DevHive.Data/Interfaces/IFeedRepository.cs | 13 + .../DevHive.Data/Interfaces/ILanguageRepository.cs | 17 ++ .../DevHive.Data/Interfaces/IPostRepository.cs | 19 ++ .../DevHive.Data/Interfaces/IRatingRepository.cs | 13 + src/Data/DevHive.Data/Interfaces/IRepository.cs | 21 ++ .../DevHive.Data/Interfaces/IRoleRepository.cs | 15 + .../Interfaces/ITechnologyRepository.cs | 17 ++ .../DevHive.Data/Interfaces/IUserRepository.cs | 22 ++ .../DevHive.Data/Interfaces/Models/IComment.cs | 16 -- .../DevHive.Data/Interfaces/Models/ILanguage.cs | 11 - src/Data/DevHive.Data/Interfaces/Models/IModel.cs | 9 - src/Data/DevHive.Data/Interfaces/Models/IPost.cs | 22 -- .../Interfaces/Models/IProfilePicture.cs | 13 - src/Data/DevHive.Data/Interfaces/Models/IRating.cs | 14 - src/Data/DevHive.Data/Interfaces/Models/IRole.cs | 10 - .../DevHive.Data/Interfaces/Models/ITechnology.cs | 11 - src/Data/DevHive.Data/Interfaces/Models/IUser.cs | 21 -- .../Interfaces/Repositories/ICommentRepository.cs | 16 -- .../Interfaces/Repositories/IFeedRepository.cs | 13 - .../Interfaces/Repositories/ILanguageRepository.cs | 17 -- .../Interfaces/Repositories/IPostRepository.cs | 19 -- .../Interfaces/Repositories/IRatingRepository.cs | 13 - .../Interfaces/Repositories/IRepository.cs | 21 -- .../Interfaces/Repositories/IRoleRepository.cs | 15 - .../Repositories/ITechnologyRepository.cs | 17 -- .../Interfaces/Repositories/IUserRepository.cs | 22 -- src/DevHive.sln | 304 ++++++++++----------- .../DevHive.Services.Models.csproj | 4 +- .../Identity/Role/CreateRoleServiceModel.cs | 10 - .../Identity/Role/RoleServiceModel.cs | 7 - .../Identity/Role/UpdateRoleServiceModel.cs | 10 - .../Identity/User/BaseUserServiceModel.cs | 10 - .../Identity/User/FriendServiceModel.cs | 10 - .../Identity/User/LoginServiceModel.cs | 8 - .../Identity/User/ProfilePictureServiceModel.cs | 7 - .../Identity/User/RegisterServiceModel.cs | 15 - .../Identity/User/UpdateFriendServiceModel.cs | 10 - .../User/UpdateProfilePictureServiceModel.cs | 12 - .../Identity/User/UpdateUserServiceModel.cs | 26 -- .../Identity/User/UserServiceModel.cs | 23 -- .../Role/CreateRoleServiceModel.cs | 10 + .../Role/RoleServiceModel.cs | 7 + .../Role/UpdateRoleServiceModel.cs | 10 + .../User/BaseUserServiceModel.cs | 10 + .../User/FriendServiceModel.cs | 10 + .../User/LoginServiceModel.cs | 8 + .../User/ProfilePictureServiceModel.cs | 7 + .../User/RegisterServiceModel.cs | 15 + .../User/UpdateFriendServiceModel.cs | 10 + .../User/UpdateProfilePictureServiceModel.cs | 12 + .../User/UpdateUserServiceModel.cs | 26 ++ .../User/UserServiceModel.cs | 23 ++ .../DevHive.Services.Tests.csproj | 8 - .../DevHive.Services.Tests/RoleService.Tests.cs | 2 +- .../DevHive.Services.Tests/UserService.Tests.cs | 2 +- .../Configurations/Mapping/RoleMapings.cs | 2 +- .../Configurations/Mapping/UserMappings.cs | 2 +- .../DevHive.Services/DevHive.Services.csproj | 6 - .../DevHive.Services/Interfaces/IRoleService.cs | 2 +- .../DevHive.Services/Interfaces/IUserService.cs | 2 +- .../DevHive.Services/Services/RoleService.cs | 2 +- .../DevHive.Services/Services/UserService.cs | 2 +- .../DevHive.Web.Models/DevHive.Web.Models.csproj | 8 +- .../Identity/Role/CreateRoleWebModel.cs | 14 - .../Identity/Role/RoleWebModel.cs | 14 - .../Identity/Role/UpdateRoleWebModel.cs | 15 - .../Identity/User/BaseUserWebModel.cs | 34 --- .../Identity/User/LoginWebModel.cs | 20 -- .../Identity/User/ProfilePictureWebModel.cs | 7 - .../Identity/User/RegisterWebModel.cs | 14 - .../Identity/User/TokenWebModel.cs | 12 - .../Identity/User/UpdateProfilePictureWebModel.cs | 9 - .../Identity/User/UpdateUserWebModel.cs | 34 --- .../Identity/User/UserWebModel.cs | 33 --- .../Identity/User/UsernameWebModel.cs | 15 - .../Post/Rating/RatePostWebModel.cs | 11 - .../Post/Rating/ReadPostRatingWebModel.cs | 15 - .../DevHive.Web.Models/Rating/RatePostWebModel.cs | 11 + .../Rating/ReadPostRatingWebModel.cs | 15 + .../DevHive.Web.Models/Role/CreateRoleWebModel.cs | 14 + src/Web/DevHive.Web.Models/Role/RoleWebModel.cs | 14 + .../DevHive.Web.Models/Role/UpdateRoleWebModel.cs | 15 + .../DevHive.Web.Models/User/BaseUserWebModel.cs | 34 +++ src/Web/DevHive.Web.Models/User/LoginWebModel.cs | 20 ++ .../User/ProfilePictureWebModel.cs | 7 + .../DevHive.Web.Models/User/RegisterWebModel.cs | 14 + src/Web/DevHive.Web.Models/User/TokenWebModel.cs | 12 + .../User/UpdateProfilePictureWebModel.cs | 9 + .../DevHive.Web.Models/User/UpdateUserWebModel.cs | 34 +++ src/Web/DevHive.Web.Models/User/UserWebModel.cs | 33 +++ .../DevHive.Web.Models/User/UsernameWebModel.cs | 15 + src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj | 7 - src/Web/DevHive.Web.Tests/RoleController.Tests.cs | 4 +- src/Web/DevHive.Web.Tests/UserController.Tests.cs | 4 +- .../Configurations/Mapping/RoleMappings.cs | 4 +- .../Configurations/Mapping/UserMappings.cs | 4 +- src/Web/DevHive.Web/Controllers/RoleController.cs | 4 +- src/Web/DevHive.Web/Controllers/UserController.cs | 4 +- src/Web/DevHive.Web/DevHive.Web.csproj | 7 - 120 files changed, 855 insertions(+), 919 deletions(-) create mode 100644 src/Data/DevHive.Data.Models/Interfaces/IComment.cs create mode 100644 src/Data/DevHive.Data.Models/Interfaces/ILanguage.cs create mode 100644 src/Data/DevHive.Data.Models/Interfaces/IModel.cs create mode 100644 src/Data/DevHive.Data.Models/Interfaces/IPost.cs create mode 100644 src/Data/DevHive.Data.Models/Interfaces/IProfilePicture.cs create mode 100644 src/Data/DevHive.Data.Models/Interfaces/IRating.cs create mode 100644 src/Data/DevHive.Data.Models/Interfaces/IRole.cs create mode 100644 src/Data/DevHive.Data.Models/Interfaces/ITechnology.cs create mode 100644 src/Data/DevHive.Data.Models/Interfaces/IUser.cs create mode 100644 src/Data/DevHive.Data/Interfaces/ICommentRepository.cs create mode 100644 src/Data/DevHive.Data/Interfaces/IFeedRepository.cs create mode 100644 src/Data/DevHive.Data/Interfaces/ILanguageRepository.cs create mode 100644 src/Data/DevHive.Data/Interfaces/IPostRepository.cs create mode 100644 src/Data/DevHive.Data/Interfaces/IRatingRepository.cs create mode 100644 src/Data/DevHive.Data/Interfaces/IRepository.cs create mode 100644 src/Data/DevHive.Data/Interfaces/IRoleRepository.cs create mode 100644 src/Data/DevHive.Data/Interfaces/ITechnologyRepository.cs create mode 100644 src/Data/DevHive.Data/Interfaces/IUserRepository.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Models/IComment.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Models/ILanguage.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Models/IModel.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Models/IPost.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Models/IProfilePicture.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Models/IRating.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Models/IRole.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Models/ITechnology.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Models/IUser.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Repositories/ICommentRepository.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Repositories/IFeedRepository.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Repositories/ILanguageRepository.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Repositories/IPostRepository.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Repositories/IRatingRepository.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Repositories/IRepository.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Repositories/IRoleRepository.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Repositories/ITechnologyRepository.cs delete mode 100644 src/Data/DevHive.Data/Interfaces/Repositories/IUserRepository.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/Role/CreateRoleServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/Role/RoleServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/Role/UpdateRoleServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/User/BaseUserServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/User/FriendServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/User/LoginServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/User/ProfilePictureServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/User/RegisterServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/User/UpdateFriendServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/User/UpdateProfilePictureServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/User/UpdateUserServiceModel.cs delete mode 100644 src/Services/DevHive.Services.Models/Identity/User/UserServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/Role/CreateRoleServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/Role/RoleServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/Role/UpdateRoleServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/User/BaseUserServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/User/FriendServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/User/LoginServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/User/ProfilePictureServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/User/RegisterServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/User/UpdateFriendServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/User/UpdateProfilePictureServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/User/UpdateUserServiceModel.cs create mode 100644 src/Services/DevHive.Services.Models/User/UserServiceModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/Role/CreateRoleWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/Role/RoleWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/Role/UpdateRoleWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/User/BaseUserWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/User/LoginWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/User/ProfilePictureWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/User/RegisterWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/User/TokenWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/User/UpdateProfilePictureWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/User/UpdateUserWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/User/UserWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Identity/User/UsernameWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Post/Rating/RatePostWebModel.cs delete mode 100644 src/Web/DevHive.Web.Models/Post/Rating/ReadPostRatingWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/Rating/RatePostWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/Rating/ReadPostRatingWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/Role/CreateRoleWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/Role/RoleWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/Role/UpdateRoleWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/User/LoginWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/User/ProfilePictureWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/User/RegisterWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/User/TokenWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/User/UpdateProfilePictureWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/User/UserWebModel.cs create mode 100644 src/Web/DevHive.Web.Models/User/UsernameWebModel.cs (limited to 'src/Web/DevHive.Web/Controllers/UserController.cs') diff --git a/src/Data/DevHive.Data.Models/Comment.cs b/src/Data/DevHive.Data.Models/Comment.cs index e2bb21d..10a3aaf 100644 --- a/src/Data/DevHive.Data.Models/Comment.cs +++ b/src/Data/DevHive.Data.Models/Comment.cs @@ -1,5 +1,5 @@ using System; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { diff --git a/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj b/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj index ebf5f9c..628e361 100644 --- a/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj +++ b/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj @@ -1,11 +1,5 @@ - net5.0 - - - - - diff --git a/src/Data/DevHive.Data.Models/Interfaces/IComment.cs b/src/Data/DevHive.Data.Models/Interfaces/IComment.cs new file mode 100644 index 0000000..c8f1f6a --- /dev/null +++ b/src/Data/DevHive.Data.Models/Interfaces/IComment.cs @@ -0,0 +1,16 @@ +using System; +using DevHive.Data.Models; + +namespace DevHive.Data.Models.Interfaces +{ + public interface IComment : IModel + { + Post Post { get; set; } + + User Creator { get; set; } + + string Message { get; set; } + + DateTime TimeCreated { get; set; } + } +} diff --git a/src/Data/DevHive.Data.Models/Interfaces/ILanguage.cs b/src/Data/DevHive.Data.Models/Interfaces/ILanguage.cs new file mode 100644 index 0000000..06e11b4 --- /dev/null +++ b/src/Data/DevHive.Data.Models/Interfaces/ILanguage.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; +using DevHive.Data.Models; + +namespace DevHive.Data.Models.Interfaces +{ + public interface ILanguage : IModel + { + string Name { get; set; } + HashSet Users { get; set; } + } +} diff --git a/src/Data/DevHive.Data.Models/Interfaces/IModel.cs b/src/Data/DevHive.Data.Models/Interfaces/IModel.cs new file mode 100644 index 0000000..3226dce --- /dev/null +++ b/src/Data/DevHive.Data.Models/Interfaces/IModel.cs @@ -0,0 +1,9 @@ +using System; + +namespace DevHive.Data.Models.Interfaces +{ + public interface IModel + { + Guid Id { get; set; } + } +} diff --git a/src/Data/DevHive.Data.Models/Interfaces/IPost.cs b/src/Data/DevHive.Data.Models/Interfaces/IPost.cs new file mode 100644 index 0000000..b1f0cb7 --- /dev/null +++ b/src/Data/DevHive.Data.Models/Interfaces/IPost.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using DevHive.Data.Models; +using DevHive.Data.RelationModels; + +namespace DevHive.Data.Models.Interfaces +{ + public interface IPost : IModel + { + User Creator { get; set; } + + string Message { get; set; } + + DateTime TimeCreated { get; set; } + + List Comments { get; set; } + + // Rating Rating { get; set; } + + List Attachments { get; set; } + } +} diff --git a/src/Data/DevHive.Data.Models/Interfaces/IProfilePicture.cs b/src/Data/DevHive.Data.Models/Interfaces/IProfilePicture.cs new file mode 100644 index 0000000..550af24 --- /dev/null +++ b/src/Data/DevHive.Data.Models/Interfaces/IProfilePicture.cs @@ -0,0 +1,13 @@ +using System; +using DevHive.Data.Models; + +namespace DevHive.Data.Models.Interfaces +{ + public interface IProfilePicture : IModel + { + Guid UserId { get; set; } + User User { get; set; } + + string PictureURL { get; set; } + } +} diff --git a/src/Data/DevHive.Data.Models/Interfaces/IRating.cs b/src/Data/DevHive.Data.Models/Interfaces/IRating.cs new file mode 100644 index 0000000..1b081b0 --- /dev/null +++ b/src/Data/DevHive.Data.Models/Interfaces/IRating.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; +using DevHive.Data.Models; + +namespace DevHive.Data.Models.Interfaces +{ + public interface IRating : IModel + { + // Post Post { get; set; } + + int Rate { get; set; } + + // HashSet UsersThatRated { get; set; } + } +} diff --git a/src/Data/DevHive.Data.Models/Interfaces/IRole.cs b/src/Data/DevHive.Data.Models/Interfaces/IRole.cs new file mode 100644 index 0000000..3a87e12 --- /dev/null +++ b/src/Data/DevHive.Data.Models/Interfaces/IRole.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using DevHive.Data.Models; + +namespace DevHive.Data.Models.Interfaces +{ + public interface IRole + { + HashSet Users { get; set; } + } +} diff --git a/src/Data/DevHive.Data.Models/Interfaces/ITechnology.cs b/src/Data/DevHive.Data.Models/Interfaces/ITechnology.cs new file mode 100644 index 0000000..575aea6 --- /dev/null +++ b/src/Data/DevHive.Data.Models/Interfaces/ITechnology.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; +using DevHive.Data.Models; + +namespace DevHive.Data.Models.Interfaces +{ + public interface ITechnology : IModel + { + string Name { get; set; } + HashSet Users { get; set; } + } +} diff --git a/src/Data/DevHive.Data.Models/Interfaces/IUser.cs b/src/Data/DevHive.Data.Models/Interfaces/IUser.cs new file mode 100644 index 0000000..7606ba2 --- /dev/null +++ b/src/Data/DevHive.Data.Models/Interfaces/IUser.cs @@ -0,0 +1,21 @@ +using System.Collections.Generic; +using DevHive.Data.Models; +using DevHive.Data.RelationModels; + +namespace DevHive.Data.Models.Interfaces +{ + public interface IUser : IModel + { + string FirstName { get; set; } + + string LastName { get; set; } + + ProfilePicture ProfilePicture { get; set; } + + HashSet Languages { get; set; } + + HashSet Technologies { get; set; } + + HashSet Roles { get; set; } + } +} diff --git a/src/Data/DevHive.Data.Models/Language.cs b/src/Data/DevHive.Data.Models/Language.cs index 7ad8ff2..fdcfb07 100644 --- a/src/Data/DevHive.Data.Models/Language.cs +++ b/src/Data/DevHive.Data.Models/Language.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { diff --git a/src/Data/DevHive.Data.Models/Post.cs b/src/Data/DevHive.Data.Models/Post.cs index 3f3d8c9..5138d19 100644 --- a/src/Data/DevHive.Data.Models/Post.cs +++ b/src/Data/DevHive.Data.Models/Post.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; using DevHive.Data.RelationModels; namespace DevHive.Data.Models diff --git a/src/Data/DevHive.Data.Models/ProfilePicture.cs b/src/Data/DevHive.Data.Models/ProfilePicture.cs index d5cc397..c5dec68 100644 --- a/src/Data/DevHive.Data.Models/ProfilePicture.cs +++ b/src/Data/DevHive.Data.Models/ProfilePicture.cs @@ -1,5 +1,5 @@ using System; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { diff --git a/src/Data/DevHive.Data.Models/Rating.cs b/src/Data/DevHive.Data.Models/Rating.cs index e1bedd2..13fdbce 100644 --- a/src/Data/DevHive.Data.Models/Rating.cs +++ b/src/Data/DevHive.Data.Models/Rating.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { @@ -11,7 +11,7 @@ namespace DevHive.Data.Models public Guid PostId { get; set; } public Post Post { get; set; } - + public int Rate { get; set; } } } diff --git a/src/Data/DevHive.Data.Models/Role.cs b/src/Data/DevHive.Data.Models/Role.cs index 259d867..0df556c 100644 --- a/src/Data/DevHive.Data.Models/Role.cs +++ b/src/Data/DevHive.Data.Models/Role.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; using Microsoft.AspNetCore.Identity; using System; diff --git a/src/Data/DevHive.Data.Models/Technology.cs b/src/Data/DevHive.Data.Models/Technology.cs index 6f98f0b..9354d5b 100644 --- a/src/Data/DevHive.Data.Models/Technology.cs +++ b/src/Data/DevHive.Data.Models/Technology.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; namespace DevHive.Data.Models { diff --git a/src/Data/DevHive.Data.Models/User.cs b/src/Data/DevHive.Data.Models/User.cs index 983d073..806397a 100644 --- a/src/Data/DevHive.Data.Models/User.cs +++ b/src/Data/DevHive.Data.Models/User.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -using DevHive.Data.Interfaces.Models; +using DevHive.Data.Models.Interfaces; using DevHive.Data.RelationModels; using Microsoft.AspNetCore.Identity; diff --git a/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj b/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj index 42a3273..d6d0876 100644 --- a/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj +++ b/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj @@ -14,14 +14,6 @@ - - - - - - - - true latest diff --git a/src/Data/DevHive.Data/DevHive.Data.csproj b/src/Data/DevHive.Data/DevHive.Data.csproj index 62b61dc..e8f38ee 100644 --- a/src/Data/DevHive.Data/DevHive.Data.csproj +++ b/src/Data/DevHive.Data/DevHive.Data.csproj @@ -18,14 +18,6 @@ - - - - - - - - true latest diff --git a/src/Data/DevHive.Data/Interfaces/ICommentRepository.cs b/src/Data/DevHive.Data/Interfaces/ICommentRepository.cs new file mode 100644 index 0000000..f85849f --- /dev/null +++ b/src/Data/DevHive.Data/Interfaces/ICommentRepository.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using DevHive.Data.Models; +using DevHive.Data.Repositories.Interfaces; + +namespace DevHive.Data.Interfaces +{ + public interface ICommentRepository : IRepository + { + Task> GetPostComments(Guid postId); + + Task DoesCommentExist(Guid id); + Task GetCommentByIssuerAndTimeCreatedAsync(Guid issuerId, DateTime timeCreated); + } +} diff --git a/src/Data/DevHive.Data/Interfaces/IFeedRepository.cs b/src/Data/DevHive.Data/Interfaces/IFeedRepository.cs new file mode 100644 index 0000000..bda51fa --- /dev/null +++ b/src/Data/DevHive.Data/Interfaces/IFeedRepository.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using DevHive.Data.Models; + +namespace DevHive.Data.Interfaces +{ + public interface IFeedRepository + { + Task> GetFriendsPosts(List friendsList, DateTime firstRequestIssued, int pageNumber, int pageSize); + Task> GetUsersPosts(User user, DateTime firstRequestIssued, int pageNumber, int pageSize); + } +} diff --git a/src/Data/DevHive.Data/Interfaces/ILanguageRepository.cs b/src/Data/DevHive.Data/Interfaces/ILanguageRepository.cs new file mode 100644 index 0000000..4771f91 --- /dev/null +++ b/src/Data/DevHive.Data/Interfaces/ILanguageRepository.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using DevHive.Data.Models; +using DevHive.Data.Repositories.Interfaces; + +namespace DevHive.Data.Interfaces +{ + public interface ILanguageRepository : IRepository + { + HashSet GetLanguages(); + Task GetByNameAsync(string name); + + Task DoesLanguageExistAsync(Guid id); + Task DoesLanguageNameExistAsync(string languageName); + } +} diff --git a/src/Data/DevHive.Data/Interfaces/IPostRepository.cs b/src/Data/DevHive.Data/Interfaces/IPostRepository.cs new file mode 100644 index 0000000..c24d596 --- /dev/null +++ b/src/Data/DevHive.Data/Interfaces/IPostRepository.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using DevHive.Data.Models; +using DevHive.Data.Repositories.Interfaces; + +namespace DevHive.Data.Interfaces +{ + public interface IPostRepository : IRepository + { + Task AddNewPostToCreator(Guid userId, Post post); + + Task GetPostByCreatorAndTimeCreatedAsync(Guid issuerId, DateTime timeCreated); + Task> GetFileUrls(Guid postId); + + Task DoesPostExist(Guid postId); + Task DoesPostHaveFiles(Guid postId); + } +} diff --git a/src/Data/DevHive.Data/Interfaces/IRatingRepository.cs b/src/Data/DevHive.Data/Interfaces/IRatingRepository.cs new file mode 100644 index 0000000..b5aff88 --- /dev/null +++ b/src/Data/DevHive.Data/Interfaces/IRatingRepository.cs @@ -0,0 +1,13 @@ +using System; +using System.Threading.Tasks; +using DevHive.Data.Models; +using DevHive.Data.Repositories.Interfaces; + +namespace DevHive.Data.Interfaces +{ + public interface IRatingRepository : IRepository + { + Task GetRatingByPostId(Guid postId); + Task UserRatedPost(Guid userId, Guid postId); + } +} diff --git a/src/Data/DevHive.Data/Interfaces/IRepository.cs b/src/Data/DevHive.Data/Interfaces/IRepository.cs new file mode 100644 index 0000000..0d11cd3 --- /dev/null +++ b/src/Data/DevHive.Data/Interfaces/IRepository.cs @@ -0,0 +1,21 @@ +using System; +using System.Threading.Tasks; + +namespace DevHive.Data.Repositories.Interfaces +{ + public interface IRepository + where TEntity : class + { + //Add Entity to database + Task AddAsync(TEntity entity); + + //Find entity by id + Task GetByIdAsync(Guid id); + + //Modify Entity from database + Task EditAsync(Guid id, TEntity newEntity); + + //Delete Entity from database + Task DeleteAsync(TEntity entity); + } +} diff --git a/src/Data/DevHive.Data/Interfaces/IRoleRepository.cs b/src/Data/DevHive.Data/Interfaces/IRoleRepository.cs new file mode 100644 index 0000000..a1080bb --- /dev/null +++ b/src/Data/DevHive.Data/Interfaces/IRoleRepository.cs @@ -0,0 +1,15 @@ +using System; +using System.Threading.Tasks; +using DevHive.Data.Models; +using DevHive.Data.Repositories.Interfaces; + +namespace DevHive.Data.Interfaces +{ + public interface IRoleRepository : IRepository + { + Task GetByNameAsync(string name); + + Task DoesNameExist(string name); + Task DoesRoleExist(Guid id); + } +} diff --git a/src/Data/DevHive.Data/Interfaces/ITechnologyRepository.cs b/src/Data/DevHive.Data/Interfaces/ITechnologyRepository.cs new file mode 100644 index 0000000..3e55b2d --- /dev/null +++ b/src/Data/DevHive.Data/Interfaces/ITechnologyRepository.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using DevHive.Data.Models; +using DevHive.Data.Repositories.Interfaces; + +namespace DevHive.Data.Interfaces +{ + public interface ITechnologyRepository : IRepository + { + Task GetByNameAsync(string name); + HashSet GetTechnologies(); + + Task DoesTechnologyExistAsync(Guid id); + Task DoesTechnologyNameExistAsync(string technologyName); + } +} diff --git a/src/Data/DevHive.Data/Interfaces/IUserRepository.cs b/src/Data/DevHive.Data/Interfaces/IUserRepository.cs new file mode 100644 index 0000000..917809d --- /dev/null +++ b/src/Data/DevHive.Data/Interfaces/IUserRepository.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using DevHive.Data.Models; +using DevHive.Data.Repositories.Interfaces; + +namespace DevHive.Data.Interfaces +{ + public interface IUserRepository : IRepository + { + //Read + Task GetByUsernameAsync(string username); + Task UpdateProfilePicture(Guid userId, string pictureUrl); + + //Validations + Task ValidateFriendsCollectionAsync(List usernames); + Task DoesEmailExistAsync(string email); + Task DoesUserExistAsync(Guid id); + Task DoesUsernameExistAsync(string username); + bool DoesUserHaveThisUsername(Guid id, string username); + } +} diff --git a/src/Data/DevHive.Data/Interfaces/Models/IComment.cs b/src/Data/DevHive.Data/Interfaces/Models/IComment.cs deleted file mode 100644 index 97c1578..0000000 --- a/src/Data/DevHive.Data/Interfaces/Models/IComment.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using DevHive.Data.Models; - -namespace DevHive.Data.Interfaces.Models -{ - public interface IComment : IModel - { - Post Post { get; set; } - - User Creator { get; set; } - - string Message { get; set; } - - DateTime TimeCreated { get; set; } - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Models/ILanguage.cs b/src/Data/DevHive.Data/Interfaces/Models/ILanguage.cs deleted file mode 100644 index 9eed09d..0000000 --- a/src/Data/DevHive.Data/Interfaces/Models/ILanguage.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; -using DevHive.Data.Models; - -namespace DevHive.Data.Interfaces.Models -{ - public interface ILanguage : IModel - { - string Name { get; set; } - HashSet Users { get; set; } - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Models/IModel.cs b/src/Data/DevHive.Data/Interfaces/Models/IModel.cs deleted file mode 100644 index f903af3..0000000 --- a/src/Data/DevHive.Data/Interfaces/Models/IModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace DevHive.Data.Interfaces.Models -{ - public interface IModel - { - Guid Id { get; set; } - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Models/IPost.cs b/src/Data/DevHive.Data/Interfaces/Models/IPost.cs deleted file mode 100644 index 712d955..0000000 --- a/src/Data/DevHive.Data/Interfaces/Models/IPost.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using DevHive.Data.Models; -using DevHive.Data.RelationModels; - -namespace DevHive.Data.Interfaces.Models -{ - public interface IPost : IModel - { - User Creator { get; set; } - - string Message { get; set; } - - DateTime TimeCreated { get; set; } - - List Comments { get; set; } - - // Rating Rating { get; set; } - - List Attachments { get; set; } - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Models/IProfilePicture.cs b/src/Data/DevHive.Data/Interfaces/Models/IProfilePicture.cs deleted file mode 100644 index c3fcbea..0000000 --- a/src/Data/DevHive.Data/Interfaces/Models/IProfilePicture.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using DevHive.Data.Models; - -namespace DevHive.Data.Interfaces.Models -{ - public interface IProfilePicture : IModel - { - Guid UserId { get; set; } - User User { get; set; } - - string PictureURL { get; set; } - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Models/IRating.cs b/src/Data/DevHive.Data/Interfaces/Models/IRating.cs deleted file mode 100644 index d1b968f..0000000 --- a/src/Data/DevHive.Data/Interfaces/Models/IRating.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; -using DevHive.Data.Models; - -namespace DevHive.Data.Interfaces.Models -{ - public interface IRating : IModel - { - // Post Post { get; set; } - - int Rate { get; set; } - - // HashSet UsersThatRated { get; set; } - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Models/IRole.cs b/src/Data/DevHive.Data/Interfaces/Models/IRole.cs deleted file mode 100644 index c8b7068..0000000 --- a/src/Data/DevHive.Data/Interfaces/Models/IRole.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; -using DevHive.Data.Models; - -namespace DevHive.Data.Interfaces.Models -{ - public interface IRole - { - HashSet Users { get; set; } - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Models/ITechnology.cs b/src/Data/DevHive.Data/Interfaces/Models/ITechnology.cs deleted file mode 100644 index 153f75f..0000000 --- a/src/Data/DevHive.Data/Interfaces/Models/ITechnology.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; -using DevHive.Data.Models; - -namespace DevHive.Data.Interfaces.Models -{ - public interface ITechnology : IModel - { - string Name { get; set; } - HashSet Users { get; set; } - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Models/IUser.cs b/src/Data/DevHive.Data/Interfaces/Models/IUser.cs deleted file mode 100644 index fcd741c..0000000 --- a/src/Data/DevHive.Data/Interfaces/Models/IUser.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections.Generic; -using DevHive.Data.Models; -using DevHive.Data.RelationModels; - -namespace DevHive.Data.Interfaces.Models -{ - public interface IUser : IModel - { - string FirstName { get; set; } - - string LastName { get; set; } - - ProfilePicture ProfilePicture { get; set; } - - HashSet Languages { get; set; } - - HashSet Technologies { get; set; } - - HashSet Roles { get; set; } - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/ICommentRepository.cs b/src/Data/DevHive.Data/Interfaces/Repositories/ICommentRepository.cs deleted file mode 100644 index 267f251..0000000 --- a/src/Data/DevHive.Data/Interfaces/Repositories/ICommentRepository.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using DevHive.Data.Models; -using DevHive.Data.Repositories.Interfaces; - -namespace DevHive.Data.Interfaces.Repositories -{ - public interface ICommentRepository : IRepository - { - Task> GetPostComments(Guid postId); - - Task DoesCommentExist(Guid id); - Task GetCommentByIssuerAndTimeCreatedAsync(Guid issuerId, DateTime timeCreated); - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IFeedRepository.cs b/src/Data/DevHive.Data/Interfaces/Repositories/IFeedRepository.cs deleted file mode 100644 index 7262510..0000000 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IFeedRepository.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using DevHive.Data.Models; - -namespace DevHive.Data.Interfaces.Repositories -{ - public interface IFeedRepository - { - Task> GetFriendsPosts(List friendsList, DateTime firstRequestIssued, int pageNumber, int pageSize); - Task> GetUsersPosts(User user, DateTime firstRequestIssued, int pageNumber, int pageSize); - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/ILanguageRepository.cs b/src/Data/DevHive.Data/Interfaces/Repositories/ILanguageRepository.cs deleted file mode 100644 index db2949a..0000000 --- a/src/Data/DevHive.Data/Interfaces/Repositories/ILanguageRepository.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using DevHive.Data.Models; -using DevHive.Data.Repositories.Interfaces; - -namespace DevHive.Data.Interfaces.Repositories -{ - public interface ILanguageRepository : IRepository - { - HashSet GetLanguages(); - Task GetByNameAsync(string name); - - Task DoesLanguageExistAsync(Guid id); - Task DoesLanguageNameExistAsync(string languageName); - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IPostRepository.cs b/src/Data/DevHive.Data/Interfaces/Repositories/IPostRepository.cs deleted file mode 100644 index 9f7cf85..0000000 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IPostRepository.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using DevHive.Data.Models; -using DevHive.Data.Repositories.Interfaces; - -namespace DevHive.Data.Interfaces.Repositories -{ - public interface IPostRepository : IRepository - { - Task AddNewPostToCreator(Guid userId, Post post); - - Task GetPostByCreatorAndTimeCreatedAsync(Guid issuerId, DateTime timeCreated); - Task> GetFileUrls(Guid postId); - - Task DoesPostExist(Guid postId); - Task DoesPostHaveFiles(Guid postId); - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IRatingRepository.cs b/src/Data/DevHive.Data/Interfaces/Repositories/IRatingRepository.cs deleted file mode 100644 index f77f301..0000000 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IRatingRepository.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Threading.Tasks; -using DevHive.Data.Models; -using DevHive.Data.Repositories.Interfaces; - -namespace DevHive.Data.Interfaces.Repositories -{ - public interface IRatingRepository : IRepository - { - Task GetRatingByPostId(Guid postId); - Task UserRatedPost(Guid userId, Guid postId); - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IRepository.cs b/src/Data/DevHive.Data/Interfaces/Repositories/IRepository.cs deleted file mode 100644 index 0d11cd3..0000000 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IRepository.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Threading.Tasks; - -namespace DevHive.Data.Repositories.Interfaces -{ - public interface IRepository - where TEntity : class - { - //Add Entity to database - Task AddAsync(TEntity entity); - - //Find entity by id - Task GetByIdAsync(Guid id); - - //Modify Entity from database - Task EditAsync(Guid id, TEntity newEntity); - - //Delete Entity from database - Task DeleteAsync(TEntity entity); - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IRoleRepository.cs b/src/Data/DevHive.Data/Interfaces/Repositories/IRoleRepository.cs deleted file mode 100644 index e834369..0000000 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IRoleRepository.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Threading.Tasks; -using DevHive.Data.Models; -using DevHive.Data.Repositories.Interfaces; - -namespace DevHive.Data.Interfaces.Repositories -{ - public interface IRoleRepository : IRepository - { - Task GetByNameAsync(string name); - - Task DoesNameExist(string name); - Task DoesRoleExist(Guid id); - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/ITechnologyRepository.cs b/src/Data/DevHive.Data/Interfaces/Repositories/ITechnologyRepository.cs deleted file mode 100644 index 9126bfc..0000000 --- a/src/Data/DevHive.Data/Interfaces/Repositories/ITechnologyRepository.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using DevHive.Data.Models; -using DevHive.Data.Repositories.Interfaces; - -namespace DevHive.Data.Interfaces.Repositories -{ - public interface ITechnologyRepository : IRepository - { - Task GetByNameAsync(string name); - HashSet GetTechnologies(); - - Task DoesTechnologyExistAsync(Guid id); - Task DoesTechnologyNameExistAsync(string technologyName); - } -} diff --git a/src/Data/DevHive.Data/Interfaces/Repositories/IUserRepository.cs b/src/Data/DevHive.Data/Interfaces/Repositories/IUserRepository.cs deleted file mode 100644 index 5ebe3d3..0000000 --- a/src/Data/DevHive.Data/Interfaces/Repositories/IUserRepository.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using DevHive.Data.Models; -using DevHive.Data.Repositories.Interfaces; - -namespace DevHive.Data.Interfaces.Repositories -{ - public interface IUserRepository : IRepository - { - //Read - Task GetByUsernameAsync(string username); - Task UpdateProfilePicture(Guid userId, string pictureUrl); - - //Validations - Task ValidateFriendsCollectionAsync(List usernames); - Task DoesEmailExistAsync(string email); - Task DoesUserExistAsync(Guid id); - Task DoesUsernameExistAsync(string username); - bool DoesUserHaveThisUsername(Guid id, string username); - } -} diff --git a/src/DevHive.sln b/src/DevHive.sln index 73c5b85..05bdcda 100644 --- a/src/DevHive.sln +++ b/src/DevHive.sln @@ -1,40 +1,35 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30717.126 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2E5E3F99-7936-4F3B-974E-A98000D1564B}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{0C2AC7A9-AC68-4668-B88E-9370C596F498}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{2ED11F7C-A247-48F6-99ED-CD0AA89C6A28}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data", "Data\DevHive.Data\DevHive.Data.csproj", "{70D0903D-C65F-4600-B6F8-F7BD00500A51}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web", "Web\DevHive.Web\DevHive.Web.csproj", "{BD295280-3F69-4BDD-8715-526E9852930E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Models", "Data\DevHive.Data.Models\DevHive.Data.Models.csproj", "{56F85916-3955-4558-8809-376D20902B94}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{C94823A0-150D-49E0-9913-628FB5D67370}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Tests", "Data\DevHive.Data.Tests\DevHive.Data.Tests.csproj", "{F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services", "Services\DevHive.Services\DevHive.Services.csproj", "{897281A2-C315-42DA-92CB-267DF91D8A4B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{F2864A9D-70F1-452F-AAAC-AAFD8102ABAD}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{9A0158E8-834E-4B8C-B62B-2BF6FF0E3518}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Common", "Common\DevHive.Common.Models\DevHive.Common.csproj", "{5C3DFE9B-9690-475E-A0AE-D62315D38337}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data", "Data\DevHive.Data\DevHive.Data.csproj", "{A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{7CA79114-C359-4871-BFA7-0EA898B50AE4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Tests", "Web\DevHive.Web.Tests\DevHive.Web.Tests.csproj", "{251A09C6-28CA-4E9E-B482-0B10ABE293FF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services", "Services\DevHive.Services\DevHive.Services.csproj", "{B5F22590-E3CE-4595-BE48-AA7F1797A6B8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services.Tests", "Services\DevHive.Services.Tests\DevHive.Services.Tests.csproj", "{3E86ACCF-9F49-4D51-B152-4ACD6801211D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services.Models", "Services\DevHive.Services.Models\DevHive.Services.Models.csproj", "{2FFF985B-A26F-443D-A159-62ED2FD5A2BC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Tests", "Data\DevHive.Data.Tests\DevHive.Data.Tests.csproj", "{E6E401DC-43A0-4562-8584-4FA81FE0206C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services.Tests", "Services\DevHive.Services.Tests\DevHive.Services.Tests.csproj", "{6E58003B-E5E8-4AA4-8F70-A9442BBFC110}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Models", "Web\DevHive.Web.Models\DevHive.Web.Models.csproj", "{746A1043-A016-4CA6-953A-CECD02020E28}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{768A592D-58EA-4CD3-A053-2E8F2DC7708A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services.Models", "Services\DevHive.Services.Models\DevHive.Services.Models.csproj", "{2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web", "Web\DevHive.Web\DevHive.Web.csproj", "{A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Models", "Data\DevHive.Data.Models\DevHive.Data.Models.csproj", "{7FFECB5A-E23F-44E0-A978-416DBF075406}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Models", "Web\DevHive.Web.Models\DevHive.Web.Models.csproj", "{D8C898F7-A0DE-4939-8708-3D4A5C383EFC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2C2D8ED7-CBBF-4E79-AC21-C932C6FA651B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Common", "Common\DevHive.Common.Models\DevHive.Common.csproj", "{34E78E35-2476-4925-864A-467C2BC5042B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Tests", "Web\DevHive.Web.Tests\DevHive.Web.Tests.csproj", "{608273FF-01ED-48B3-B912-66CCDBF5572E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,144 +40,141 @@ Global Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|x64.ActiveCfg = Debug|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|x64.Build.0 = Debug|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|x86.ActiveCfg = Debug|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Debug|x86.Build.0 = Debug|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Release|Any CPU.Build.0 = Release|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Release|x64.ActiveCfg = Release|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Release|x64.Build.0 = Release|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Release|x86.ActiveCfg = Release|Any CPU - {BD295280-3F69-4BDD-8715-526E9852930E}.Release|x86.Build.0 = Release|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|x64.ActiveCfg = Debug|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|x64.Build.0 = Debug|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|x86.ActiveCfg = Debug|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Debug|x86.Build.0 = Debug|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|Any CPU.Build.0 = Release|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|x64.ActiveCfg = Release|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|x64.Build.0 = Release|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|x86.ActiveCfg = Release|Any CPU - {897281A2-C315-42DA-92CB-267DF91D8A4B}.Release|x86.Build.0 = Release|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|x64.ActiveCfg = Debug|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|x64.Build.0 = Debug|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|x86.ActiveCfg = Debug|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Debug|x86.Build.0 = Debug|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|Any CPU.Build.0 = Release|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|x64.ActiveCfg = Release|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|x64.Build.0 = Release|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|x86.ActiveCfg = Release|Any CPU - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C}.Release|x86.Build.0 = Release|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|x64.ActiveCfg = Debug|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|x64.Build.0 = Debug|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|x86.ActiveCfg = Debug|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Debug|x86.Build.0 = Debug|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|Any CPU.Build.0 = Release|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|x64.ActiveCfg = Release|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|x64.Build.0 = Release|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|x86.ActiveCfg = Release|Any CPU - {251A09C6-28CA-4E9E-B482-0B10ABE293FF}.Release|x86.Build.0 = Release|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|x64.ActiveCfg = Debug|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|x64.Build.0 = Debug|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|x86.ActiveCfg = Debug|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Debug|x86.Build.0 = Debug|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|Any CPU.Build.0 = Release|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|x64.ActiveCfg = Release|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|x64.Build.0 = Release|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|x86.ActiveCfg = Release|Any CPU - {3E86ACCF-9F49-4D51-B152-4ACD6801211D}.Release|x86.Build.0 = Release|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|x64.ActiveCfg = Debug|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|x64.Build.0 = Debug|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|x86.ActiveCfg = Debug|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Debug|x86.Build.0 = Debug|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|Any CPU.Build.0 = Release|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|x64.ActiveCfg = Release|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|x64.Build.0 = Release|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|x86.ActiveCfg = Release|Any CPU - {E6E401DC-43A0-4562-8584-4FA81FE0206C}.Release|x86.Build.0 = Release|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|Any CPU.Build.0 = Debug|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|x64.ActiveCfg = Debug|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|x64.Build.0 = Debug|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|x86.ActiveCfg = Debug|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Debug|x86.Build.0 = Debug|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Release|Any CPU.ActiveCfg = Release|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Release|Any CPU.Build.0 = Release|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Release|x64.ActiveCfg = Release|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Release|x64.Build.0 = Release|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Release|x86.ActiveCfg = Release|Any CPU - {746A1043-A016-4CA6-953A-CECD02020E28}.Release|x86.Build.0 = Release|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|x64.ActiveCfg = Debug|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|x64.Build.0 = Debug|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|x86.ActiveCfg = Debug|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Debug|x86.Build.0 = Debug|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|Any CPU.Build.0 = Release|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|x64.ActiveCfg = Release|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|x64.Build.0 = Release|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|x86.ActiveCfg = Release|Any CPU - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17}.Release|x86.Build.0 = Release|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|x64.ActiveCfg = Debug|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|x64.Build.0 = Debug|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|x86.ActiveCfg = Debug|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Debug|x86.Build.0 = Debug|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|Any CPU.Build.0 = Release|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|x64.ActiveCfg = Release|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|x64.Build.0 = Release|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|x86.ActiveCfg = Release|Any CPU - {7FFECB5A-E23F-44E0-A978-416DBF075406}.Release|x86.Build.0 = Release|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|x64.ActiveCfg = Debug|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|x64.Build.0 = Debug|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|x86.ActiveCfg = Debug|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Debug|x86.Build.0 = Debug|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Release|Any CPU.Build.0 = Release|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Release|x64.ActiveCfg = Release|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Release|x64.Build.0 = Release|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Release|x86.ActiveCfg = Release|Any CPU - {34E78E35-2476-4925-864A-467C2BC5042B}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {BD295280-3F69-4BDD-8715-526E9852930E} = {2ED11F7C-A247-48F6-99ED-CD0AA89C6A28} - {897281A2-C315-42DA-92CB-267DF91D8A4B} = {C94823A0-150D-49E0-9913-628FB5D67370} - {A28CAD8A-CDA9-42AD-8701-2DAE5D55EC9C} = {9A0158E8-834E-4B8C-B62B-2BF6FF0E3518} - {251A09C6-28CA-4E9E-B482-0B10ABE293FF} = {2ED11F7C-A247-48F6-99ED-CD0AA89C6A28} - {3E86ACCF-9F49-4D51-B152-4ACD6801211D} = {C94823A0-150D-49E0-9913-628FB5D67370} - {E6E401DC-43A0-4562-8584-4FA81FE0206C} = {9A0158E8-834E-4B8C-B62B-2BF6FF0E3518} - {746A1043-A016-4CA6-953A-CECD02020E28} = {2ED11F7C-A247-48F6-99ED-CD0AA89C6A28} - {2B1E8E07-9E8C-4FE5-ADA7-F67BCBDD1D17} = {C94823A0-150D-49E0-9913-628FB5D67370} - {7FFECB5A-E23F-44E0-A978-416DBF075406} = {9A0158E8-834E-4B8C-B62B-2BF6FF0E3518} - {34E78E35-2476-4925-864A-467C2BC5042B} = {2C2D8ED7-CBBF-4E79-AC21-C932C6FA651B} + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|x64.ActiveCfg = Debug|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|x64.Build.0 = Debug|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|x86.ActiveCfg = Debug|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Debug|x86.Build.0 = Debug|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|Any CPU.Build.0 = Release|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|x64.ActiveCfg = Release|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|x64.Build.0 = Release|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|x86.ActiveCfg = Release|Any CPU + {70D0903D-C65F-4600-B6F8-F7BD00500A51}.Release|x86.Build.0 = Release|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Debug|Any CPU.Build.0 = Debug|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Debug|x64.ActiveCfg = Debug|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Debug|x64.Build.0 = Debug|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Debug|x86.ActiveCfg = Debug|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Debug|x86.Build.0 = Debug|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Release|Any CPU.ActiveCfg = Release|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Release|Any CPU.Build.0 = Release|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Release|x64.ActiveCfg = Release|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Release|x64.Build.0 = Release|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Release|x86.ActiveCfg = Release|Any CPU + {56F85916-3955-4558-8809-376D20902B94}.Release|x86.Build.0 = Release|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|x64.ActiveCfg = Debug|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|x64.Build.0 = Debug|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|x86.ActiveCfg = Debug|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Debug|x86.Build.0 = Debug|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|Any CPU.Build.0 = Release|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x64.ActiveCfg = Release|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x64.Build.0 = Release|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x86.ActiveCfg = Release|Any CPU + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x86.Build.0 = Release|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x64.ActiveCfg = Debug|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x64.Build.0 = Debug|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x86.ActiveCfg = Debug|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x86.Build.0 = Debug|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|Any CPU.Build.0 = Release|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x64.ActiveCfg = Release|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x64.Build.0 = Release|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x86.ActiveCfg = Release|Any CPU + {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x86.Build.0 = Release|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|x64.ActiveCfg = Debug|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|x64.Build.0 = Debug|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|x86.ActiveCfg = Debug|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|x86.Build.0 = Debug|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|Any CPU.Build.0 = Release|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|x64.ActiveCfg = Release|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|x64.Build.0 = Release|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|x86.ActiveCfg = Release|Any CPU + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Release|x86.Build.0 = Release|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|x64.ActiveCfg = Debug|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|x64.Build.0 = Debug|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|x86.ActiveCfg = Debug|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Debug|x86.Build.0 = Debug|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|Any CPU.Build.0 = Release|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|x64.ActiveCfg = Release|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|x64.Build.0 = Release|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|x86.ActiveCfg = Release|Any CPU + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC}.Release|x86.Build.0 = Release|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|x64.ActiveCfg = Debug|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|x64.Build.0 = Debug|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|x86.ActiveCfg = Debug|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Debug|x86.Build.0 = Debug|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|Any CPU.Build.0 = Release|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|x64.ActiveCfg = Release|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|x64.Build.0 = Release|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|x86.ActiveCfg = Release|Any CPU + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110}.Release|x86.Build.0 = Release|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|x64.ActiveCfg = Debug|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|x64.Build.0 = Debug|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|x86.ActiveCfg = Debug|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Debug|x86.Build.0 = Debug|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|Any CPU.Build.0 = Release|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|x64.ActiveCfg = Release|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|x64.Build.0 = Release|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|x86.ActiveCfg = Release|Any CPU + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A}.Release|x86.Build.0 = Release|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|x64.ActiveCfg = Debug|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|x64.Build.0 = Debug|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|x86.ActiveCfg = Debug|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Debug|x86.Build.0 = Debug|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|Any CPU.Build.0 = Release|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|x64.ActiveCfg = Release|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|x64.Build.0 = Release|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|x86.ActiveCfg = Release|Any CPU + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC}.Release|x86.Build.0 = Release|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|x64.ActiveCfg = Debug|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|x64.Build.0 = Debug|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|x86.ActiveCfg = Debug|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Debug|x86.Build.0 = Debug|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|Any CPU.Build.0 = Release|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x64.ActiveCfg = Release|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x64.Build.0 = Release|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x86.ActiveCfg = Release|Any CPU + {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {0F5395E8-26FB-40FD-83A1-EE7766C5E398} + GlobalSection(NestedProjects) = preSolution + {70D0903D-C65F-4600-B6F8-F7BD00500A51} = {0C2AC7A9-AC68-4668-B88E-9370C596F498} + {56F85916-3955-4558-8809-376D20902B94} = {0C2AC7A9-AC68-4668-B88E-9370C596F498} + {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0} = {0C2AC7A9-AC68-4668-B88E-9370C596F498} + {5C3DFE9B-9690-475E-A0AE-D62315D38337} = {F2864A9D-70F1-452F-AAAC-AAFD8102ABAD} + {B5F22590-E3CE-4595-BE48-AA7F1797A6B8} = {7CA79114-C359-4871-BFA7-0EA898B50AE4} + {2FFF985B-A26F-443D-A159-62ED2FD5A2BC} = {7CA79114-C359-4871-BFA7-0EA898B50AE4} + {6E58003B-E5E8-4AA4-8F70-A9442BBFC110} = {7CA79114-C359-4871-BFA7-0EA898B50AE4} + {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A} = {768A592D-58EA-4CD3-A053-2E8F2DC7708A} + {D8C898F7-A0DE-4939-8708-3D4A5C383EFC} = {768A592D-58EA-4CD3-A053-2E8F2DC7708A} + {608273FF-01ED-48B3-B912-66CCDBF5572E} = {768A592D-58EA-4CD3-A053-2E8F2DC7708A} EndGlobalSection EndGlobal diff --git a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj index ebf5f9c..744a855 100644 --- a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj +++ b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj @@ -1,11 +1,9 @@ - net5.0 - + - diff --git a/src/Services/DevHive.Services.Models/Identity/Role/CreateRoleServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/Role/CreateRoleServiceModel.cs deleted file mode 100644 index 3bed3fd..0000000 --- a/src/Services/DevHive.Services.Models/Identity/Role/CreateRoleServiceModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; - -namespace DevHive.Services.Models.Identity.Role -{ - public class CreateRoleServiceModel - { - public string Name { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/Role/RoleServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/Role/RoleServiceModel.cs deleted file mode 100644 index 07249fe..0000000 --- a/src/Services/DevHive.Services.Models/Identity/Role/RoleServiceModel.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace DevHive.Services.Models.Identity.Role -{ - public class RoleServiceModel - { - public string Name { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/Role/UpdateRoleServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/Role/UpdateRoleServiceModel.cs deleted file mode 100644 index e21e6b4..0000000 --- a/src/Services/DevHive.Services.Models/Identity/Role/UpdateRoleServiceModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; - -namespace DevHive.Services.Models.Identity.Role -{ - public class UpdateRoleServiceModel - { - public Guid Id { get; set; } - public string Name { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/User/BaseUserServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/User/BaseUserServiceModel.cs deleted file mode 100644 index 514f82a..0000000 --- a/src/Services/DevHive.Services.Models/Identity/User/BaseUserServiceModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace DevHive.Services.Models.Identity.User -{ - public class BaseUserServiceModel - { - public string UserName { get; set; } - public string Email { get; set; } - public string FirstName { get; set; } - public string LastName { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/User/FriendServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/User/FriendServiceModel.cs deleted file mode 100644 index a784f5c..0000000 --- a/src/Services/DevHive.Services.Models/Identity/User/FriendServiceModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; - -namespace DevHive.Services.Models.Identity.User -{ - public class FriendServiceModel - { - public Guid Id { get; set; } - public string UserName { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/User/LoginServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/User/LoginServiceModel.cs deleted file mode 100644 index 4d53283..0000000 --- a/src/Services/DevHive.Services.Models/Identity/User/LoginServiceModel.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace DevHive.Services.Models.Identity.User -{ - public class LoginServiceModel - { - public string UserName { get; set; } - public string Password { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/User/ProfilePictureServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/User/ProfilePictureServiceModel.cs deleted file mode 100644 index ad81057..0000000 --- a/src/Services/DevHive.Services.Models/Identity/User/ProfilePictureServiceModel.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace DevHive.Services.Models.Identity.User -{ - public class ProfilePictureServiceModel - { - public string ProfilePictureURL { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/User/RegisterServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/User/RegisterServiceModel.cs deleted file mode 100644 index adc4119..0000000 --- a/src/Services/DevHive.Services.Models/Identity/User/RegisterServiceModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using DevHive.Services.Models.Language; -using DevHive.Services.Models.Technology; - -namespace DevHive.Services.Models.Identity.User -{ - public class RegisterServiceModel : BaseUserServiceModel - { - public string Password { get; set; } - - public HashSet Languages { get; set; } - - public HashSet Technologies { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/User/UpdateFriendServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/User/UpdateFriendServiceModel.cs deleted file mode 100644 index b0efe10..0000000 --- a/src/Services/DevHive.Services.Models/Identity/User/UpdateFriendServiceModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; - -namespace DevHive.Services.Models.Identity.User -{ - public class UpdateFriendServiceModel - { - public Guid Id { get; set; } - public string UserName { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/User/UpdateProfilePictureServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/User/UpdateProfilePictureServiceModel.cs deleted file mode 100644 index 8563953..0000000 --- a/src/Services/DevHive.Services.Models/Identity/User/UpdateProfilePictureServiceModel.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using Microsoft.AspNetCore.Http; - -namespace DevHive.Services.Models.Identity.User -{ - public class UpdateProfilePictureServiceModel - { - public Guid UserId { get; set; } - - public IFormFile Picture { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/User/UpdateUserServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/User/UpdateUserServiceModel.cs deleted file mode 100644 index b4e4400..0000000 --- a/src/Services/DevHive.Services.Models/Identity/User/UpdateUserServiceModel.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using DevHive.Services.Models.Identity.Role; -using DevHive.Services.Models.Language; -using DevHive.Services.Models.Technology; - -namespace DevHive.Services.Models.Identity.User -{ - public class UpdateUserServiceModel : BaseUserServiceModel - { - public Guid Id { get; set; } - - public string Password { get; set; } - - public string ProfilePictureURL { get; set; } - - public HashSet Roles { get; set; } = new HashSet(); - - public HashSet Friends { get; set; } = new HashSet(); - - public HashSet Languages { get; set; } = new HashSet(); - - public HashSet Technologies { get; set; } = new HashSet(); - - } -} diff --git a/src/Services/DevHive.Services.Models/Identity/User/UserServiceModel.cs b/src/Services/DevHive.Services.Models/Identity/User/UserServiceModel.cs deleted file mode 100644 index ac7bba2..0000000 --- a/src/Services/DevHive.Services.Models/Identity/User/UserServiceModel.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections.Generic; -using DevHive.Common.Models.Misc; -using DevHive.Services.Models.Identity.Role; -using DevHive.Services.Models.Language; -using DevHive.Services.Models.Technology; - -namespace DevHive.Services.Models.Identity.User -{ - public class UserServiceModel : BaseUserServiceModel - { - public string ProfilePictureURL { get; set; } - - public HashSet Roles { get; set; } = new(); - - public HashSet Friends { get; set; } = new(); - - public HashSet Languages { get; set; } = new(); - - public HashSet Technologies { get; set; } = new(); - - public List Posts { get; set; } = new(); - } -} diff --git a/src/Services/DevHive.Services.Models/Role/CreateRoleServiceModel.cs b/src/Services/DevHive.Services.Models/Role/CreateRoleServiceModel.cs new file mode 100644 index 0000000..8b03c65 --- /dev/null +++ b/src/Services/DevHive.Services.Models/Role/CreateRoleServiceModel.cs @@ -0,0 +1,10 @@ +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; + +namespace DevHive.Services.Models.Role +{ + public class CreateRoleServiceModel + { + public string Name { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/Role/RoleServiceModel.cs b/src/Services/DevHive.Services.Models/Role/RoleServiceModel.cs new file mode 100644 index 0000000..77ca954 --- /dev/null +++ b/src/Services/DevHive.Services.Models/Role/RoleServiceModel.cs @@ -0,0 +1,7 @@ +namespace DevHive.Services.Models.Role +{ + public class RoleServiceModel + { + public string Name { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/Role/UpdateRoleServiceModel.cs b/src/Services/DevHive.Services.Models/Role/UpdateRoleServiceModel.cs new file mode 100644 index 0000000..9b8fbfe --- /dev/null +++ b/src/Services/DevHive.Services.Models/Role/UpdateRoleServiceModel.cs @@ -0,0 +1,10 @@ +using System; + +namespace DevHive.Services.Models.Role +{ + public class UpdateRoleServiceModel + { + public Guid Id { get; set; } + public string Name { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/User/BaseUserServiceModel.cs b/src/Services/DevHive.Services.Models/User/BaseUserServiceModel.cs new file mode 100644 index 0000000..5c3dc6b --- /dev/null +++ b/src/Services/DevHive.Services.Models/User/BaseUserServiceModel.cs @@ -0,0 +1,10 @@ +namespace DevHive.Services.Models.User +{ + public class BaseUserServiceModel + { + public string UserName { get; set; } + public string Email { get; set; } + public string FirstName { get; set; } + public string LastName { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/User/FriendServiceModel.cs b/src/Services/DevHive.Services.Models/User/FriendServiceModel.cs new file mode 100644 index 0000000..2241886 --- /dev/null +++ b/src/Services/DevHive.Services.Models/User/FriendServiceModel.cs @@ -0,0 +1,10 @@ +using System; + +namespace DevHive.Services.Models.User +{ + public class FriendServiceModel + { + public Guid Id { get; set; } + public string UserName { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/User/LoginServiceModel.cs b/src/Services/DevHive.Services.Models/User/LoginServiceModel.cs new file mode 100644 index 0000000..6a0d128 --- /dev/null +++ b/src/Services/DevHive.Services.Models/User/LoginServiceModel.cs @@ -0,0 +1,8 @@ +namespace DevHive.Services.Models.User +{ + public class LoginServiceModel + { + public string UserName { get; set; } + public string Password { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/User/ProfilePictureServiceModel.cs b/src/Services/DevHive.Services.Models/User/ProfilePictureServiceModel.cs new file mode 100644 index 0000000..cbe64b2 --- /dev/null +++ b/src/Services/DevHive.Services.Models/User/ProfilePictureServiceModel.cs @@ -0,0 +1,7 @@ +namespace DevHive.Services.Models.User +{ + public class ProfilePictureServiceModel + { + public string ProfilePictureURL { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/User/RegisterServiceModel.cs b/src/Services/DevHive.Services.Models/User/RegisterServiceModel.cs new file mode 100644 index 0000000..5852d46 --- /dev/null +++ b/src/Services/DevHive.Services.Models/User/RegisterServiceModel.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using DevHive.Services.Models.Language; +using DevHive.Services.Models.Technology; + +namespace DevHive.Services.Models.User +{ + public class RegisterServiceModel : BaseUserServiceModel + { + public string Password { get; set; } + + public HashSet Languages { get; set; } + + public HashSet Technologies { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/User/UpdateFriendServiceModel.cs b/src/Services/DevHive.Services.Models/User/UpdateFriendServiceModel.cs new file mode 100644 index 0000000..0d7a8c1 --- /dev/null +++ b/src/Services/DevHive.Services.Models/User/UpdateFriendServiceModel.cs @@ -0,0 +1,10 @@ +using System; + +namespace DevHive.Services.Models.User +{ + public class UpdateFriendServiceModel + { + public Guid Id { get; set; } + public string UserName { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/User/UpdateProfilePictureServiceModel.cs b/src/Services/DevHive.Services.Models/User/UpdateProfilePictureServiceModel.cs new file mode 100644 index 0000000..19ba08f --- /dev/null +++ b/src/Services/DevHive.Services.Models/User/UpdateProfilePictureServiceModel.cs @@ -0,0 +1,12 @@ +using System; +using Microsoft.AspNetCore.Http; + +namespace DevHive.Services.Models.User +{ + public class UpdateProfilePictureServiceModel + { + public Guid UserId { get; set; } + + public IFormFile Picture { get; set; } + } +} diff --git a/src/Services/DevHive.Services.Models/User/UpdateUserServiceModel.cs b/src/Services/DevHive.Services.Models/User/UpdateUserServiceModel.cs new file mode 100644 index 0000000..ff20e6b --- /dev/null +++ b/src/Services/DevHive.Services.Models/User/UpdateUserServiceModel.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using DevHive.Services.Models.Role; +using DevHive.Services.Models.Language; +using DevHive.Services.Models.Technology; + +namespace DevHive.Services.Models.User +{ + public class UpdateUserServiceModel : BaseUserServiceModel + { + public Guid Id { get; set; } + + public string Password { get; set; } + + public string ProfilePictureURL { get; set; } + + public HashSet Roles { get; set; } = new HashSet(); + + public HashSet Friends { get; set; } = new HashSet(); + + public HashSet Languages { get; set; } = new HashSet(); + + public HashSet Technologies { get; set; } = new HashSet(); + + } +} diff --git a/src/Services/DevHive.Services.Models/User/UserServiceModel.cs b/src/Services/DevHive.Services.Models/User/UserServiceModel.cs new file mode 100644 index 0000000..04b618b --- /dev/null +++ b/src/Services/DevHive.Services.Models/User/UserServiceModel.cs @@ -0,0 +1,23 @@ +using System.Collections.Generic; +using DevHive.Common.Models.Misc; +using DevHive.Services.Models.Role; +using DevHive.Services.Models.Language; +using DevHive.Services.Models.Technology; + +namespace DevHive.Services.Models.User +{ + public class UserServiceModel : BaseUserServiceModel + { + public string ProfilePictureURL { get; set; } + + public HashSet Roles { get; set; } = new(); + + public HashSet Friends { get; set; } = new(); + + public HashSet Languages { get; set; } = new(); + + public HashSet Technologies { get; set; } = new(); + + public List Posts { get; set; } = new(); + } +} diff --git a/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj b/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj index af419df..d6d0876 100644 --- a/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj +++ b/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj @@ -14,14 +14,6 @@ - - - - - - - - true latest diff --git a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs index e500dd1..c4fac77 100644 --- a/src/Services/DevHive.Services.Tests/RoleService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/RoleService.Tests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using AutoMapper; using DevHive.Data.Interfaces.Repositories; using DevHive.Data.Models; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Services.Services; using Moq; using NUnit.Framework; diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index 21d4862..aff34c9 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -10,7 +10,7 @@ using DevHive.Common.Models.Misc; using DevHive.Data.Interfaces.Repositories; using DevHive.Data.Models; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using DevHive.Services.Options; using DevHive.Services.Services; using Microsoft.AspNetCore.Identity; diff --git a/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs b/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs index e61a107..37f259a 100644 --- a/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs +++ b/src/Services/DevHive.Services/Configurations/Mapping/RoleMapings.cs @@ -1,6 +1,6 @@ using DevHive.Data.Models; using AutoMapper; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; namespace DevHive.Services.Configurations.Mapping { diff --git a/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs b/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs index 2b0f4ed..9a8e3d9 100644 --- a/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs +++ b/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs @@ -1,6 +1,6 @@ using DevHive.Data.Models; using AutoMapper; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using DevHive.Common.Models.Misc; using DevHive.Data.RelationModels; diff --git a/src/Services/DevHive.Services/DevHive.Services.csproj b/src/Services/DevHive.Services/DevHive.Services.csproj index 7a33166..1380248 100644 --- a/src/Services/DevHive.Services/DevHive.Services.csproj +++ b/src/Services/DevHive.Services/DevHive.Services.csproj @@ -18,12 +18,6 @@ - - - - - - true latest diff --git a/src/Services/DevHive.Services/Interfaces/IRoleService.cs b/src/Services/DevHive.Services/Interfaces/IRoleService.cs index d47728c..2c31b06 100644 --- a/src/Services/DevHive.Services/Interfaces/IRoleService.cs +++ b/src/Services/DevHive.Services/Interfaces/IRoleService.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; namespace DevHive.Services.Interfaces { diff --git a/src/Services/DevHive.Services/Interfaces/IUserService.cs b/src/Services/DevHive.Services/Interfaces/IUserService.cs index 9e2b4e3..daa5e5e 100644 --- a/src/Services/DevHive.Services/Interfaces/IUserService.cs +++ b/src/Services/DevHive.Services/Interfaces/IUserService.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; using DevHive.Common.Models.Identity; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; namespace DevHive.Services.Interfaces { diff --git a/src/Services/DevHive.Services/Services/RoleService.cs b/src/Services/DevHive.Services/Services/RoleService.cs index a8b8e17..dbf8fcd 100644 --- a/src/Services/DevHive.Services/Services/RoleService.cs +++ b/src/Services/DevHive.Services/Services/RoleService.cs @@ -4,7 +4,7 @@ using AutoMapper; using DevHive.Data.Interfaces.Repositories; using DevHive.Data.Models; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Services.Models.Language; namespace DevHive.Services.Services diff --git a/src/Services/DevHive.Services/Services/UserService.cs b/src/Services/DevHive.Services/Services/UserService.cs index 22d5052..f68e3aa 100644 --- a/src/Services/DevHive.Services/Services/UserService.cs +++ b/src/Services/DevHive.Services/Services/UserService.cs @@ -1,6 +1,6 @@ using AutoMapper; using DevHive.Services.Options; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using System.Threading.Tasks; using DevHive.Data.Models; using System; diff --git a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj index 0462967..65892c5 100644 --- a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj +++ b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj @@ -1,14 +1,10 @@ - net5.0 + + - - - - - diff --git a/src/Web/DevHive.Web.Models/Identity/Role/CreateRoleWebModel.cs b/src/Web/DevHive.Web.Models/Identity/Role/CreateRoleWebModel.cs deleted file mode 100644 index 859cdd9..0000000 --- a/src/Web/DevHive.Web.Models/Identity/Role/CreateRoleWebModel.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; - -namespace DevHive.Web.Models.Identity.Role -{ - public class CreateRoleWebModel - { - [NotNull] - [Required] - [MinLength(3)] - [MaxLength(50)] - public string Name { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Identity/Role/RoleWebModel.cs b/src/Web/DevHive.Web.Models/Identity/Role/RoleWebModel.cs deleted file mode 100644 index 99b0f50..0000000 --- a/src/Web/DevHive.Web.Models/Identity/Role/RoleWebModel.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; - -namespace DevHive.Web.Models.Identity.Role -{ - public class RoleWebModel - { - [NotNull] - [Required] - [MinLength(3)] - [MaxLength(50)] - public string Name { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Identity/Role/UpdateRoleWebModel.cs b/src/Web/DevHive.Web.Models/Identity/Role/UpdateRoleWebModel.cs deleted file mode 100644 index 3870481..0000000 --- a/src/Web/DevHive.Web.Models/Identity/Role/UpdateRoleWebModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; - -namespace DevHive.Web.Models.Identity.Role -{ - public class UpdateRoleWebModel - { - [NotNull] - [Required] - [MinLength(3)] - [MaxLength(50)] - public string Name { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Identity/User/BaseUserWebModel.cs b/src/Web/DevHive.Web.Models/Identity/User/BaseUserWebModel.cs deleted file mode 100644 index 297e1a5..0000000 --- a/src/Web/DevHive.Web.Models/Identity/User/BaseUserWebModel.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; -using DevHive.Web.Attributes; - -namespace DevHive.Web.Models.Identity.User -{ - public class BaseUserWebModel - { - [NotNull] - [Required] - [MinLength(3)] - [MaxLength(50)] - public string UserName { get; set; } - - [NotNull] - [Required] - [EmailAddress] - public string Email { get; set; } - - [NotNull] - [Required] - [MinLength(3)] - [MaxLength(30)] - [OnlyLetters(ErrorMessage = "First name can only contain letters!")] - public string FirstName { get; set; } - - [NotNull] - [Required] - [MinLength(3)] - [MaxLength(30)] - [OnlyLetters(ErrorMessage = "Last name can only contain letters!")] - public string LastName { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Identity/User/LoginWebModel.cs b/src/Web/DevHive.Web.Models/Identity/User/LoginWebModel.cs deleted file mode 100644 index ccd806f..0000000 --- a/src/Web/DevHive.Web.Models/Identity/User/LoginWebModel.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; -using DevHive.Web.Attributes; - -namespace DevHive.Web.Models.Identity.User -{ - public class LoginWebModel - { - [NotNull] - [Required] - [MinLength(3)] - [MaxLength(50)] - public string UserName { get; set; } - - [NotNull] - [Required] - [GoodPassword] - public string Password { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Identity/User/ProfilePictureWebModel.cs b/src/Web/DevHive.Web.Models/Identity/User/ProfilePictureWebModel.cs deleted file mode 100644 index 91c9487..0000000 --- a/src/Web/DevHive.Web.Models/Identity/User/ProfilePictureWebModel.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace DevHive.Web.Models.Identity.User -{ - public class ProfilePictureWebModel - { - public string ProfilePictureURL { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Identity/User/RegisterWebModel.cs b/src/Web/DevHive.Web.Models/Identity/User/RegisterWebModel.cs deleted file mode 100644 index 0fc7ec6..0000000 --- a/src/Web/DevHive.Web.Models/Identity/User/RegisterWebModel.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; -using DevHive.Web.Attributes; - -namespace DevHive.Web.Models.Identity.User -{ - public class RegisterWebModel : BaseUserWebModel - { - [NotNull] - [Required] - [GoodPassword] - public string Password { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Identity/User/TokenWebModel.cs b/src/Web/DevHive.Web.Models/Identity/User/TokenWebModel.cs deleted file mode 100644 index 154b64b..0000000 --- a/src/Web/DevHive.Web.Models/Identity/User/TokenWebModel.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace DevHive.Web.Models.Identity.User -{ - public class TokenWebModel - { - public TokenWebModel(string token) - { - this.Token = token; - } - - public string Token { get; set; } - } -} \ No newline at end of file diff --git a/src/Web/DevHive.Web.Models/Identity/User/UpdateProfilePictureWebModel.cs b/src/Web/DevHive.Web.Models/Identity/User/UpdateProfilePictureWebModel.cs deleted file mode 100644 index 6efe968..0000000 --- a/src/Web/DevHive.Web.Models/Identity/User/UpdateProfilePictureWebModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Microsoft.AspNetCore.Http; - -namespace DevHive.Web.Models.Identity.User -{ - public class UpdateProfilePictureWebModel - { - public IFormFile Picture { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Identity/User/UpdateUserWebModel.cs b/src/Web/DevHive.Web.Models/Identity/User/UpdateUserWebModel.cs deleted file mode 100644 index 62901f6..0000000 --- a/src/Web/DevHive.Web.Models/Identity/User/UpdateUserWebModel.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; -using DevHive.Web.Attributes; -using DevHive.Web.Models.Identity.Role; -using DevHive.Web.Models.Language; -using DevHive.Web.Models.Technology; - -namespace DevHive.Web.Models.Identity.User -{ - public class UpdateUserWebModel : BaseUserWebModel - { - [NotNull] - [Required] - [GoodPassword] - public string Password { get; set; } - - [NotNull] - [Required] - public HashSet Friends { get; set; } - - [NotNull] - [Required] - public HashSet Roles { get; set; } - - [NotNull] - [Required] - public HashSet Languages { get; set; } - - [NotNull] - [Required] - public HashSet Technologies { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Identity/User/UserWebModel.cs b/src/Web/DevHive.Web.Models/Identity/User/UserWebModel.cs deleted file mode 100644 index 7ab8cca..0000000 --- a/src/Web/DevHive.Web.Models/Identity/User/UserWebModel.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; -using DevHive.Common.Models.Misc; -using DevHive.Web.Models.Identity.Role; -using DevHive.Web.Models.Language; -using DevHive.Web.Models.Technology; - -namespace DevHive.Web.Models.Identity.User -{ - public class UserWebModel : BaseUserWebModel - { - public string ProfilePictureURL { get; set; } - - [NotNull] - [Required] - public HashSet Roles { get; set; } = new(); - - [NotNull] - [Required] - public HashSet Friends { get; set; } = new(); - - [NotNull] - [Required] - public HashSet Languages { get; set; } = new(); - - [NotNull] - [Required] - public HashSet Technologies { get; set; } = new(); - - public List Posts { get; set; } = new(); - } -} diff --git a/src/Web/DevHive.Web.Models/Identity/User/UsernameWebModel.cs b/src/Web/DevHive.Web.Models/Identity/User/UsernameWebModel.cs deleted file mode 100644 index c533bba..0000000 --- a/src/Web/DevHive.Web.Models/Identity/User/UsernameWebModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; -using DevHive.Web.Attributes; - -namespace DevHive.Web.Models.Identity.User -{ - public class UsernameWebModel - { - [NotNull] - [Required] - [MinLength(3)] - [MaxLength(50)] - public string UserName { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Post/Rating/RatePostWebModel.cs b/src/Web/DevHive.Web.Models/Post/Rating/RatePostWebModel.cs deleted file mode 100644 index 5f0e58f..0000000 --- a/src/Web/DevHive.Web.Models/Post/Rating/RatePostWebModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace DevHive.Web.Models.Post.Rating -{ - public class RatePostWebModel - { - public Guid PostId { get; set; } - - public bool Liked { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Post/Rating/ReadPostRatingWebModel.cs b/src/Web/DevHive.Web.Models/Post/Rating/ReadPostRatingWebModel.cs deleted file mode 100644 index a551fb8..0000000 --- a/src/Web/DevHive.Web.Models/Post/Rating/ReadPostRatingWebModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace DevHive.Web.Models.Post.Rating -{ - public class ReadPostRatingWebModel - { - public Guid Id { get; set; } - - public Guid PostId { get; set; } - - public int Likes { get; set; } - - public int Dislikes { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Rating/RatePostWebModel.cs b/src/Web/DevHive.Web.Models/Rating/RatePostWebModel.cs new file mode 100644 index 0000000..cbba4ab --- /dev/null +++ b/src/Web/DevHive.Web.Models/Rating/RatePostWebModel.cs @@ -0,0 +1,11 @@ +using System; + +namespace DevHive.Web.Models.Rating +{ + public class RatePostWebModel + { + public Guid PostId { get; set; } + + public bool Liked { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/Rating/ReadPostRatingWebModel.cs b/src/Web/DevHive.Web.Models/Rating/ReadPostRatingWebModel.cs new file mode 100644 index 0000000..8afd57e --- /dev/null +++ b/src/Web/DevHive.Web.Models/Rating/ReadPostRatingWebModel.cs @@ -0,0 +1,15 @@ +using System; + +namespace DevHive.Web.Models.Rating +{ + public class ReadPostRatingWebModel + { + public Guid Id { get; set; } + + public Guid PostId { get; set; } + + public int Likes { get; set; } + + public int Dislikes { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/Role/CreateRoleWebModel.cs b/src/Web/DevHive.Web.Models/Role/CreateRoleWebModel.cs new file mode 100644 index 0000000..9beced4 --- /dev/null +++ b/src/Web/DevHive.Web.Models/Role/CreateRoleWebModel.cs @@ -0,0 +1,14 @@ +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; + +namespace DevHive.Web.Models.Role +{ + public class CreateRoleWebModel + { + [NotNull] + [Required] + [MinLength(3)] + [MaxLength(50)] + public string Name { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/Role/RoleWebModel.cs b/src/Web/DevHive.Web.Models/Role/RoleWebModel.cs new file mode 100644 index 0000000..680fb05 --- /dev/null +++ b/src/Web/DevHive.Web.Models/Role/RoleWebModel.cs @@ -0,0 +1,14 @@ +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; + +namespace DevHive.Web.Models.Role +{ + public class RoleWebModel + { + [NotNull] + [Required] + [MinLength(3)] + [MaxLength(50)] + public string Name { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/Role/UpdateRoleWebModel.cs b/src/Web/DevHive.Web.Models/Role/UpdateRoleWebModel.cs new file mode 100644 index 0000000..f32839e --- /dev/null +++ b/src/Web/DevHive.Web.Models/Role/UpdateRoleWebModel.cs @@ -0,0 +1,15 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; + +namespace DevHive.Web.Models.Role +{ + public class UpdateRoleWebModel + { + [NotNull] + [Required] + [MinLength(3)] + [MaxLength(50)] + public string Name { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs b/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs new file mode 100644 index 0000000..9a2544d --- /dev/null +++ b/src/Web/DevHive.Web.Models/User/BaseUserWebModel.cs @@ -0,0 +1,34 @@ +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; +using DevHive.Web.Attributes; + +namespace DevHive.Web.Models.User +{ + public class BaseUserWebModel + { + [NotNull] + [Required] + [MinLength(3)] + [MaxLength(50)] + public string UserName { get; set; } + + [NotNull] + [Required] + [EmailAddress] + public string Email { get; set; } + + [NotNull] + [Required] + [MinLength(3)] + [MaxLength(30)] + [OnlyLetters(ErrorMessage = "First name can only contain letters!")] + public string FirstName { get; set; } + + [NotNull] + [Required] + [MinLength(3)] + [MaxLength(30)] + [OnlyLetters(ErrorMessage = "Last name can only contain letters!")] + public string LastName { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/User/LoginWebModel.cs b/src/Web/DevHive.Web.Models/User/LoginWebModel.cs new file mode 100644 index 0000000..c821721 --- /dev/null +++ b/src/Web/DevHive.Web.Models/User/LoginWebModel.cs @@ -0,0 +1,20 @@ +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; +using DevHive.Web.Attributes; + +namespace DevHive.Web.Models.User +{ + public class LoginWebModel + { + [NotNull] + [Required] + [MinLength(3)] + [MaxLength(50)] + public string UserName { get; set; } + + [NotNull] + [Required] + [GoodPassword] + public string Password { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/User/ProfilePictureWebModel.cs b/src/Web/DevHive.Web.Models/User/ProfilePictureWebModel.cs new file mode 100644 index 0000000..e09ee08 --- /dev/null +++ b/src/Web/DevHive.Web.Models/User/ProfilePictureWebModel.cs @@ -0,0 +1,7 @@ +namespace DevHive.Web.Models.User +{ + public class ProfilePictureWebModel + { + public string ProfilePictureURL { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs b/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs new file mode 100644 index 0000000..754c8eb --- /dev/null +++ b/src/Web/DevHive.Web.Models/User/RegisterWebModel.cs @@ -0,0 +1,14 @@ +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; +using DevHive.Web.Attributes; + +namespace DevHive.Web.Models.User +{ + public class RegisterWebModel : BaseUserWebModel + { + [NotNull] + [Required] + [GoodPassword] + public string Password { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/User/TokenWebModel.cs b/src/Web/DevHive.Web.Models/User/TokenWebModel.cs new file mode 100644 index 0000000..7f3361d --- /dev/null +++ b/src/Web/DevHive.Web.Models/User/TokenWebModel.cs @@ -0,0 +1,12 @@ +namespace DevHive.Web.Models.User +{ + public class TokenWebModel + { + public TokenWebModel(string token) + { + this.Token = token; + } + + public string Token { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/User/UpdateProfilePictureWebModel.cs b/src/Web/DevHive.Web.Models/User/UpdateProfilePictureWebModel.cs new file mode 100644 index 0000000..196d1e7 --- /dev/null +++ b/src/Web/DevHive.Web.Models/User/UpdateProfilePictureWebModel.cs @@ -0,0 +1,9 @@ +using Microsoft.AspNetCore.Http; + +namespace DevHive.Web.Models.User +{ + public class UpdateProfilePictureWebModel + { + public IFormFile Picture { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs b/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs new file mode 100644 index 0000000..86f6bfe --- /dev/null +++ b/src/Web/DevHive.Web.Models/User/UpdateUserWebModel.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; +using DevHive.Web.Attributes; +using DevHive.Web.Models.Role; +using DevHive.Web.Models.Language; +using DevHive.Web.Models.Technology; + +namespace DevHive.Web.Models.User +{ + public class UpdateUserWebModel : BaseUserWebModel + { + [NotNull] + [Required] + [GoodPassword] + public string Password { get; set; } + + [NotNull] + [Required] + public HashSet Friends { get; set; } + + [NotNull] + [Required] + public HashSet Roles { get; set; } + + [NotNull] + [Required] + public HashSet Languages { get; set; } + + [NotNull] + [Required] + public HashSet Technologies { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Models/User/UserWebModel.cs b/src/Web/DevHive.Web.Models/User/UserWebModel.cs new file mode 100644 index 0000000..37141d0 --- /dev/null +++ b/src/Web/DevHive.Web.Models/User/UserWebModel.cs @@ -0,0 +1,33 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; +using DevHive.Common.Models.Misc; +using DevHive.Web.Models.Role; +using DevHive.Web.Models.Language; +using DevHive.Web.Models.Technology; + +namespace DevHive.Web.Models.User +{ + public class UserWebModel : BaseUserWebModel + { + public string ProfilePictureURL { get; set; } + + [NotNull] + [Required] + public HashSet Roles { get; set; } = new(); + + [NotNull] + [Required] + public HashSet Friends { get; set; } = new(); + + [NotNull] + [Required] + public HashSet Languages { get; set; } = new(); + + [NotNull] + [Required] + public HashSet Technologies { get; set; } = new(); + + public List Posts { get; set; } = new(); + } +} diff --git a/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs b/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs new file mode 100644 index 0000000..fc0a7ff --- /dev/null +++ b/src/Web/DevHive.Web.Models/User/UsernameWebModel.cs @@ -0,0 +1,15 @@ +using System.ComponentModel.DataAnnotations; +using System.Diagnostics.CodeAnalysis; +using DevHive.Web.Attributes; + +namespace DevHive.Web.Models.User +{ + public class UsernameWebModel + { + [NotNull] + [Required] + [MinLength(3)] + [MaxLength(50)] + public string UserName { get; set; } + } +} diff --git a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj index 2b30bb8..ee390b5 100644 --- a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj +++ b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj @@ -13,13 +13,6 @@ - - - - - - - true latest diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs index 067b4e4..b5deba0 100644 --- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs @@ -3,9 +3,9 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using DevHive.Web.Controllers; -using DevHive.Web.Models.Identity.Role; +using DevHive.Web.Models.Role; using Microsoft.AspNetCore.Mvc; using Moq; using NUnit.Framework; diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs index c1431c8..3e858f6 100644 --- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; using AutoMapper; using DevHive.Common.Models.Identity; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.User; +using DevHive.Services.Models.User; using DevHive.Web.Controllers; -using DevHive.Web.Models.Identity.User; +using DevHive.Web.Models.User; using Microsoft.AspNetCore.Mvc; using Moq; using NUnit.Framework; diff --git a/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs b/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs index 2ea2742..60f8503 100644 --- a/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs +++ b/src/Web/DevHive.Web/Configurations/Mapping/RoleMappings.cs @@ -1,6 +1,6 @@ using AutoMapper; -using DevHive.Web.Models.Identity.Role; -using DevHive.Services.Models.Identity.Role; +using DevHive.Web.Models.Role; +using DevHive.Services.Models.Role; namespace DevHive.Web.Configurations.Mapping { diff --git a/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs index f58e7ca..14aaa3a 100644 --- a/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs +++ b/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs @@ -1,6 +1,6 @@ using AutoMapper; -using DevHive.Services.Models.Identity.User; -using DevHive.Web.Models.Identity.User; +using DevHive.Services.Models.User; +using DevHive.Web.Models.User; using DevHive.Common.Models.Identity; namespace DevHive.Web.Configurations.Mapping diff --git a/src/Web/DevHive.Web/Controllers/RoleController.cs b/src/Web/DevHive.Web/Controllers/RoleController.cs index 0d2a2eb..1465795 100644 --- a/src/Web/DevHive.Web/Controllers/RoleController.cs +++ b/src/Web/DevHive.Web/Controllers/RoleController.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using DevHive.Web.Models.Identity.Role; +using DevHive.Web.Models.Role; using AutoMapper; using System; using DevHive.Services.Interfaces; -using DevHive.Services.Models.Identity.Role; +using DevHive.Services.Models.Role; using Microsoft.AspNetCore.Authorization; namespace DevHive.Web.Controllers diff --git a/src/Web/DevHive.Web/Controllers/UserController.cs b/src/Web/DevHive.Web/Controllers/UserController.cs index 109bbaa..25faa8a 100644 --- a/src/Web/DevHive.Web/Controllers/UserController.cs +++ b/src/Web/DevHive.Web/Controllers/UserController.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; using AutoMapper; -using DevHive.Services.Models.Identity.User; -using DevHive.Web.Models.Identity.User; +using DevHive.Services.Models.User; +using DevHive.Web.Models.User; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using DevHive.Common.Models.Identity; diff --git a/src/Web/DevHive.Web/DevHive.Web.csproj b/src/Web/DevHive.Web/DevHive.Web.csproj index 71362ce..7ba07b1 100644 --- a/src/Web/DevHive.Web/DevHive.Web.csproj +++ b/src/Web/DevHive.Web/DevHive.Web.csproj @@ -20,11 +20,4 @@ - - - - - - - -- cgit v1.2.3 From 72502154725594cf31878aa944f4bc9d9f3521a3 Mon Sep 17 00:00:00 2001 From: transtrike Date: Tue, 16 Feb 2021 18:07:51 +0200 Subject: UserManager&RoleManager logic moved to Repo; Password hashing and validation moved to Repo and using ASPNET Core hashing methods; Added Migrations; Fixed Roles not added to user --- src/.stylecop.json | 25 + .../Misc/PasswordModifications.cs | 13 - src/Data/DevHive.Data.Models/User.cs | 2 +- src/Data/DevHive.Data.Tests/UserRepositoryTests.cs | 8 +- .../DevHive.Data/Interfaces/IUserRepository.cs | 8 +- .../Migrations/20210216152915_Inital.Designer.cs | 667 +++++++++++++++++++++ .../Migrations/20210216152915_Inital.cs | 586 ++++++++++++++++++ .../Migrations/DevHiveContextModelSnapshot.cs | 665 ++++++++++++++++++++ .../DevHive.Data/Repositories/RoleRepository.cs | 37 +- .../DevHive.Data/Repositories/UserRepository.cs | 82 ++- .../DevHive.Services.Tests/UserService.Tests.cs | 2 +- .../Configurations/Mapping/UserMappings.cs | 9 +- .../DevHive.Services/Services/RoleService.cs | 4 +- .../DevHive.Services/Services/UserService.cs | 74 +-- .../Configurations/Extensions/ConfigureDatabase.cs | 12 +- src/Web/DevHive.Web/Controllers/UserController.cs | 9 +- src/Web/DevHive.Web/Startup.cs | 1 + 17 files changed, 2081 insertions(+), 123 deletions(-) create mode 100644 src/.stylecop.json delete mode 100644 src/Common/DevHive.Common.Models/Misc/PasswordModifications.cs create mode 100644 src/Data/DevHive.Data/Migrations/20210216152915_Inital.Designer.cs create mode 100644 src/Data/DevHive.Data/Migrations/20210216152915_Inital.cs create mode 100644 src/Data/DevHive.Data/Migrations/DevHiveContextModelSnapshot.cs (limited to 'src/Web/DevHive.Web/Controllers/UserController.cs') diff --git a/src/.stylecop.json b/src/.stylecop.json new file mode 100644 index 0000000..6954967 --- /dev/null +++ b/src/.stylecop.json @@ -0,0 +1,25 @@ +{ + "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", + "settings": { + "indentation": { + "useTabs": true, + "tabSize": 4, + "indentationSize": 4 + }, + "orderingRules": { + "elementOrder": [ + "kind", + "accessibility", + "constant", + "static", + "readonly" + ], + "blankLinesBetweenUsingGroups": "require", + "systemUsingDirectivesFirst": true, + "usingDirectivesPlacement": "outsideNamespace" + }, + "namingRules": { + + } + } +} diff --git a/src/Common/DevHive.Common.Models/Misc/PasswordModifications.cs b/src/Common/DevHive.Common.Models/Misc/PasswordModifications.cs deleted file mode 100644 index f10a334..0000000 --- a/src/Common/DevHive.Common.Models/Misc/PasswordModifications.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Security.Cryptography; -using System.Text; - -namespace DevHive.Common.Models.Misc -{ - public static class PasswordModifications - { - public static string GeneratePasswordHash(string password) - { - return string.Join(string.Empty, SHA512.HashData(Encoding.ASCII.GetBytes(password))); - } - } -} diff --git a/src/Data/DevHive.Data.Models/User.cs b/src/Data/DevHive.Data.Models/User.cs index bf4ea50..bac5425 100644 --- a/src/Data/DevHive.Data.Models/User.cs +++ b/src/Data/DevHive.Data.Models/User.cs @@ -14,7 +14,7 @@ namespace DevHive.Data.Models public string LastName { get; set; } - public ProfilePicture ProfilePicture { get; set; } + public ProfilePicture ProfilePicture { get; set; } = new() { PictureURL = "/assets/images/feed/profile-pic.png" }; public HashSet Languages { get; set; } = new(); diff --git a/src/Data/DevHive.Data.Tests/UserRepositoryTests.cs b/src/Data/DevHive.Data.Tests/UserRepositoryTests.cs index 43e9a36..5f84e34 100644 --- a/src/Data/DevHive.Data.Tests/UserRepositoryTests.cs +++ b/src/Data/DevHive.Data.Tests/UserRepositoryTests.cs @@ -234,7 +234,7 @@ namespace DevHive.Data.Tests // } #endregion - #region DoesUserHaveThisUsername + #region DoesUserHaveThisUsernameAsync [Test] public async Task DoesUserHaveThisUsername_ReturnsTrue_WhenUserHasTheGivenUsername() { @@ -242,9 +242,9 @@ namespace DevHive.Data.Tests this._context.Users.Add(dummyUser); await this._context.SaveChangesAsync(); - bool result = this._userRepository.DoesUserHaveThisUsername(dummyUser.Id, dummyUser.UserName); + bool result = this._userRepository.DoesUserHaveThisUsernameAsync(dummyUser.Id, dummyUser.UserName); - Assert.IsTrue(result, "DoesUserHaveThisUsername does not return true when the user has the given name"); + Assert.IsTrue(result, "DoesUserHaveThisUsernameAsync does not return true when the user has the given name"); } [Test] @@ -255,7 +255,7 @@ namespace DevHive.Data.Tests this._context.Users.Add(dummyUser); await this._context.SaveChangesAsync(); - bool result = this._userRepository.DoesUserHaveThisUsername(dummyUser.Id, username); + bool result = this._userRepository.DoesUserHaveThisUsernameAsync(dummyUser.Id, username); Assert.IsFalse(result, "DoesUserNameExistAsync does not return false when user doesnt have the given name"); } diff --git a/src/Data/DevHive.Data/Interfaces/IUserRepository.cs b/src/Data/DevHive.Data/Interfaces/IUserRepository.cs index 917809d..aec0eb3 100644 --- a/src/Data/DevHive.Data/Interfaces/IUserRepository.cs +++ b/src/Data/DevHive.Data/Interfaces/IUserRepository.cs @@ -8,15 +8,17 @@ namespace DevHive.Data.Interfaces { public interface IUserRepository : IRepository { - //Read + Task AddRoleToUser(User user, string roleName); + Task GetByUsernameAsync(string username); Task UpdateProfilePicture(Guid userId, string pictureUrl); - //Validations + Task VerifyPassword(User user, string password); + Task IsInRoleAsync(User user, string roleName); Task ValidateFriendsCollectionAsync(List usernames); Task DoesEmailExistAsync(string email); Task DoesUserExistAsync(Guid id); Task DoesUsernameExistAsync(string username); - bool DoesUserHaveThisUsername(Guid id, string username); + Task DoesUserHaveThisUsernameAsync(Guid id, string username); } } diff --git a/src/Data/DevHive.Data/Migrations/20210216152915_Inital.Designer.cs b/src/Data/DevHive.Data/Migrations/20210216152915_Inital.Designer.cs new file mode 100644 index 0000000..a85f657 --- /dev/null +++ b/src/Data/DevHive.Data/Migrations/20210216152915_Inital.Designer.cs @@ -0,0 +1,667 @@ +// +using System; +using DevHive.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +namespace DevHive.Data.Migrations +{ + [DbContext(typeof(DevHiveContext))] + [Migration("20210216152915_Inital")] + partial class Inital + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("Relational:MaxIdentifierLength", 63) + .HasAnnotation("ProductVersion", "5.0.3") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + modelBuilder.Entity("DevHive.Data.Models.Comment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CreatorId") + .HasColumnType("uuid"); + + b.Property("Message") + .HasColumnType("text"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.Property("TimeCreated") + .HasColumnType("timestamp without time zone"); + + b.HasKey("Id"); + + b.HasIndex("CreatorId"); + + b.HasIndex("PostId"); + + b.ToTable("Comments"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Language", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Name") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Languages"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Post", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CreatorId") + .HasColumnType("uuid"); + + b.Property("Message") + .HasColumnType("text"); + + b.Property("TimeCreated") + .HasColumnType("timestamp without time zone"); + + b.HasKey("Id"); + + b.HasIndex("CreatorId"); + + b.ToTable("Posts"); + }); + + modelBuilder.Entity("DevHive.Data.Models.ProfilePicture", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("PictureURL") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("ProfilePicture"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Rating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.Property("Rate") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("PostId") + .IsUnique(); + + b.ToTable("Rating"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.PostAttachments", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("FileUrl") + .HasColumnType("text"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("PostId"); + + b.ToTable("PostAttachments"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.RatedPost", b => + { + b.Property("UserId") + .HasColumnType("uuid"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.HasKey("UserId", "PostId"); + + b.HasIndex("PostId"); + + b.ToTable("RatedPosts"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.UserRate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Liked") + .HasColumnType("boolean"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("PostId"); + + b.HasIndex("UserId"); + + b.ToTable("UserRates"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Technology", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Name") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Technologies"); + }); + + modelBuilder.Entity("DevHive.Data.Models.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AccessFailedCount") + .HasColumnType("integer"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("boolean"); + + b.Property("FirstName") + .HasColumnType("text"); + + b.Property("LastName") + .HasColumnType("text"); + + b.Property("LockoutEnabled") + .HasColumnType("boolean"); + + b.Property("LockoutEnd") + .HasColumnType("timestamp with time zone"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("PasswordHash") + .HasColumnType("text"); + + b.Property("PhoneNumber") + .HasColumnType("text"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("boolean"); + + b.Property("SecurityStamp") + .HasColumnType("text"); + + b.Property("TwoFactorEnabled") + .HasColumnType("boolean"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.HasIndex("UserId"); + + b.HasIndex("UserName") + .IsUnique(); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("LanguageUser", b => + { + b.Property("LanguagesId") + .HasColumnType("uuid"); + + b.Property("UsersId") + .HasColumnType("uuid"); + + b.HasKey("LanguagesId", "UsersId"); + + b.HasIndex("UsersId"); + + b.ToTable("LanguageUser"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("RoleId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("ProviderKey") + .HasColumnType("text"); + + b.Property("ProviderDisplayName") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("uuid"); + + b.Property("RoleId") + .HasColumnType("uuid"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("uuid"); + + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("RoleUser", b => + { + b.Property("RolesId") + .HasColumnType("uuid"); + + b.Property("UsersId") + .HasColumnType("uuid"); + + b.HasKey("RolesId", "UsersId"); + + b.HasIndex("UsersId"); + + b.ToTable("RoleUser"); + }); + + modelBuilder.Entity("TechnologyUser", b => + { + b.Property("TechnologiesId") + .HasColumnType("uuid"); + + b.Property("UsersId") + .HasColumnType("uuid"); + + b.HasKey("TechnologiesId", "UsersId"); + + b.HasIndex("UsersId"); + + b.ToTable("TechnologyUser"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Comment", b => + { + b.HasOne("DevHive.Data.Models.User", "Creator") + .WithMany("Comments") + .HasForeignKey("CreatorId"); + + b.HasOne("DevHive.Data.Models.Post", "Post") + .WithMany("Comments") + .HasForeignKey("PostId"); + + b.Navigation("Creator"); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Post", b => + { + b.HasOne("DevHive.Data.Models.User", "Creator") + .WithMany("Posts") + .HasForeignKey("CreatorId"); + + b.Navigation("Creator"); + }); + + modelBuilder.Entity("DevHive.Data.Models.ProfilePicture", b => + { + b.HasOne("DevHive.Data.Models.User", "User") + .WithOne("ProfilePicture") + .HasForeignKey("DevHive.Data.Models.ProfilePicture", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Rating", b => + { + b.HasOne("DevHive.Data.Models.Post", "Post") + .WithOne("Rating") + .HasForeignKey("DevHive.Data.Models.Rating", "PostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.PostAttachments", b => + { + b.HasOne("DevHive.Data.Models.Post", "Post") + .WithMany("Attachments") + .HasForeignKey("PostId"); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.RatedPost", b => + { + b.HasOne("DevHive.Data.Models.Post", "Post") + .WithMany() + .HasForeignKey("PostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("DevHive.Data.Models.User", "User") + .WithMany("RatedPosts") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Post"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.UserRate", b => + { + b.HasOne("DevHive.Data.Models.Post", "Post") + .WithMany() + .HasForeignKey("PostId"); + + b.HasOne("DevHive.Data.Models.User", "User") + .WithMany() + .HasForeignKey("UserId"); + + b.Navigation("Post"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("DevHive.Data.Models.User", b => + { + b.HasOne("DevHive.Data.Models.User", null) + .WithMany("Friends") + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("LanguageUser", b => + { + b.HasOne("DevHive.Data.Models.Language", null) + .WithMany() + .HasForeignKey("LanguagesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("DevHive.Data.Models.Role", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("DevHive.Data.Models.Role", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("RoleUser", b => + { + b.HasOne("DevHive.Data.Models.Role", null) + .WithMany() + .HasForeignKey("RolesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("TechnologyUser", b => + { + b.HasOne("DevHive.Data.Models.Technology", null) + .WithMany() + .HasForeignKey("TechnologiesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("DevHive.Data.Models.Post", b => + { + b.Navigation("Attachments"); + + b.Navigation("Comments"); + + b.Navigation("Rating"); + }); + + modelBuilder.Entity("DevHive.Data.Models.User", b => + { + b.Navigation("Comments"); + + b.Navigation("Friends"); + + b.Navigation("Posts"); + + b.Navigation("ProfilePicture"); + + b.Navigation("RatedPosts"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Data/DevHive.Data/Migrations/20210216152915_Inital.cs b/src/Data/DevHive.Data/Migrations/20210216152915_Inital.cs new file mode 100644 index 0000000..131501e --- /dev/null +++ b/src/Data/DevHive.Data/Migrations/20210216152915_Inital.cs @@ -0,0 +1,586 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +namespace DevHive.Data.Migrations +{ + public partial class Inital : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "AspNetRoles", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + Name = table.Column(type: "character varying(256)", maxLength: 256, nullable: true), + NormalizedName = table.Column(type: "character varying(256)", maxLength: 256, nullable: true), + ConcurrencyStamp = table.Column(type: "text", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoles", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AspNetUsers", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + FirstName = table.Column(type: "text", nullable: true), + LastName = table.Column(type: "text", nullable: true), + UserId = table.Column(type: "uuid", nullable: true), + UserName = table.Column(type: "character varying(256)", maxLength: 256, nullable: true), + NormalizedUserName = table.Column(type: "character varying(256)", maxLength: 256, nullable: true), + Email = table.Column(type: "character varying(256)", maxLength: 256, nullable: true), + NormalizedEmail = table.Column(type: "character varying(256)", maxLength: 256, nullable: true), + EmailConfirmed = table.Column(type: "boolean", nullable: false), + PasswordHash = table.Column(type: "text", nullable: true), + SecurityStamp = table.Column(type: "text", nullable: true), + ConcurrencyStamp = table.Column(type: "text", nullable: true), + PhoneNumber = table.Column(type: "text", nullable: true), + PhoneNumberConfirmed = table.Column(type: "boolean", nullable: false), + TwoFactorEnabled = table.Column(type: "boolean", nullable: false), + LockoutEnd = table.Column(type: "timestamp with time zone", nullable: true), + LockoutEnabled = table.Column(type: "boolean", nullable: false), + AccessFailedCount = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUsers", x => x.Id); + table.ForeignKey( + name: "FK_AspNetUsers_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "Languages", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + Name = table.Column(type: "text", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Languages", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Technologies", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + Name = table.Column(type: "text", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Technologies", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AspNetRoleClaims", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + RoleId = table.Column(type: "uuid", nullable: false), + ClaimType = table.Column(type: "text", nullable: true), + ClaimValue = table.Column(type: "text", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserClaims", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + UserId = table.Column(type: "uuid", nullable: false), + ClaimType = table.Column(type: "text", nullable: true), + ClaimValue = table.Column(type: "text", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetUserClaims_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserLogins", + columns: table => new + { + LoginProvider = table.Column(type: "text", nullable: false), + ProviderKey = table.Column(type: "text", nullable: false), + ProviderDisplayName = table.Column(type: "text", nullable: true), + UserId = table.Column(type: "uuid", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); + table.ForeignKey( + name: "FK_AspNetUserLogins_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserRoles", + columns: table => new + { + UserId = table.Column(type: "uuid", nullable: false), + RoleId = table.Column(type: "uuid", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserTokens", + columns: table => new + { + UserId = table.Column(type: "uuid", nullable: false), + LoginProvider = table.Column(type: "text", nullable: false), + Name = table.Column(type: "text", nullable: false), + Value = table.Column(type: "text", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); + table.ForeignKey( + name: "FK_AspNetUserTokens_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Posts", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + CreatorId = table.Column(type: "uuid", nullable: true), + Message = table.Column(type: "text", nullable: true), + TimeCreated = table.Column(type: "timestamp without time zone", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Posts", x => x.Id); + table.ForeignKey( + name: "FK_Posts_AspNetUsers_CreatorId", + column: x => x.CreatorId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "ProfilePicture", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + UserId = table.Column(type: "uuid", nullable: false), + PictureURL = table.Column(type: "text", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_ProfilePicture", x => x.Id); + table.ForeignKey( + name: "FK_ProfilePicture_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "RoleUser", + columns: table => new + { + RolesId = table.Column(type: "uuid", nullable: false), + UsersId = table.Column(type: "uuid", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_RoleUser", x => new { x.RolesId, x.UsersId }); + table.ForeignKey( + name: "FK_RoleUser_AspNetRoles_RolesId", + column: x => x.RolesId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_RoleUser_AspNetUsers_UsersId", + column: x => x.UsersId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "LanguageUser", + columns: table => new + { + LanguagesId = table.Column(type: "uuid", nullable: false), + UsersId = table.Column(type: "uuid", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_LanguageUser", x => new { x.LanguagesId, x.UsersId }); + table.ForeignKey( + name: "FK_LanguageUser_AspNetUsers_UsersId", + column: x => x.UsersId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_LanguageUser_Languages_LanguagesId", + column: x => x.LanguagesId, + principalTable: "Languages", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "TechnologyUser", + columns: table => new + { + TechnologiesId = table.Column(type: "uuid", nullable: false), + UsersId = table.Column(type: "uuid", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_TechnologyUser", x => new { x.TechnologiesId, x.UsersId }); + table.ForeignKey( + name: "FK_TechnologyUser_AspNetUsers_UsersId", + column: x => x.UsersId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_TechnologyUser_Technologies_TechnologiesId", + column: x => x.TechnologiesId, + principalTable: "Technologies", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Comments", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + PostId = table.Column(type: "uuid", nullable: true), + CreatorId = table.Column(type: "uuid", nullable: true), + Message = table.Column(type: "text", nullable: true), + TimeCreated = table.Column(type: "timestamp without time zone", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Comments", x => x.Id); + table.ForeignKey( + name: "FK_Comments_AspNetUsers_CreatorId", + column: x => x.CreatorId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + table.ForeignKey( + name: "FK_Comments_Posts_PostId", + column: x => x.PostId, + principalTable: "Posts", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "PostAttachments", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + PostId = table.Column(type: "uuid", nullable: true), + FileUrl = table.Column(type: "text", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_PostAttachments", x => x.Id); + table.ForeignKey( + name: "FK_PostAttachments_Posts_PostId", + column: x => x.PostId, + principalTable: "Posts", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "RatedPosts", + columns: table => new + { + UserId = table.Column(type: "uuid", nullable: false), + PostId = table.Column(type: "uuid", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_RatedPosts", x => new { x.UserId, x.PostId }); + table.ForeignKey( + name: "FK_RatedPosts_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_RatedPosts_Posts_PostId", + column: x => x.PostId, + principalTable: "Posts", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Rating", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + PostId = table.Column(type: "uuid", nullable: false), + Rate = table.Column(type: "integer", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Rating", x => x.Id); + table.ForeignKey( + name: "FK_Rating_Posts_PostId", + column: x => x.PostId, + principalTable: "Posts", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "UserRates", + columns: table => new + { + Id = table.Column(type: "uuid", nullable: false), + UserId = table.Column(type: "uuid", nullable: true), + Liked = table.Column(type: "boolean", nullable: false), + PostId = table.Column(type: "uuid", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_UserRates", x => x.Id); + table.ForeignKey( + name: "FK_UserRates_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + table.ForeignKey( + name: "FK_UserRates_Posts_PostId", + column: x => x.PostId, + principalTable: "Posts", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_AspNetRoleClaims_RoleId", + table: "AspNetRoleClaims", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "RoleNameIndex", + table: "AspNetRoles", + column: "NormalizedName", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserClaims_UserId", + table: "AspNetUserClaims", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserLogins_UserId", + table: "AspNetUserLogins", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserRoles_RoleId", + table: "AspNetUserRoles", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "EmailIndex", + table: "AspNetUsers", + column: "NormalizedEmail"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUsers_UserId", + table: "AspNetUsers", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUsers_UserName", + table: "AspNetUsers", + column: "UserName", + unique: true); + + migrationBuilder.CreateIndex( + name: "UserNameIndex", + table: "AspNetUsers", + column: "NormalizedUserName", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_Comments_CreatorId", + table: "Comments", + column: "CreatorId"); + + migrationBuilder.CreateIndex( + name: "IX_Comments_PostId", + table: "Comments", + column: "PostId"); + + migrationBuilder.CreateIndex( + name: "IX_LanguageUser_UsersId", + table: "LanguageUser", + column: "UsersId"); + + migrationBuilder.CreateIndex( + name: "IX_PostAttachments_PostId", + table: "PostAttachments", + column: "PostId"); + + migrationBuilder.CreateIndex( + name: "IX_Posts_CreatorId", + table: "Posts", + column: "CreatorId"); + + migrationBuilder.CreateIndex( + name: "IX_ProfilePicture_UserId", + table: "ProfilePicture", + column: "UserId", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_RatedPosts_PostId", + table: "RatedPosts", + column: "PostId"); + + migrationBuilder.CreateIndex( + name: "IX_Rating_PostId", + table: "Rating", + column: "PostId", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_RoleUser_UsersId", + table: "RoleUser", + column: "UsersId"); + + migrationBuilder.CreateIndex( + name: "IX_TechnologyUser_UsersId", + table: "TechnologyUser", + column: "UsersId"); + + migrationBuilder.CreateIndex( + name: "IX_UserRates_PostId", + table: "UserRates", + column: "PostId"); + + migrationBuilder.CreateIndex( + name: "IX_UserRates_UserId", + table: "UserRates", + column: "UserId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "AspNetRoleClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserLogins"); + + migrationBuilder.DropTable( + name: "AspNetUserRoles"); + + migrationBuilder.DropTable( + name: "AspNetUserTokens"); + + migrationBuilder.DropTable( + name: "Comments"); + + migrationBuilder.DropTable( + name: "LanguageUser"); + + migrationBuilder.DropTable( + name: "PostAttachments"); + + migrationBuilder.DropTable( + name: "ProfilePicture"); + + migrationBuilder.DropTable( + name: "RatedPosts"); + + migrationBuilder.DropTable( + name: "Rating"); + + migrationBuilder.DropTable( + name: "RoleUser"); + + migrationBuilder.DropTable( + name: "TechnologyUser"); + + migrationBuilder.DropTable( + name: "UserRates"); + + migrationBuilder.DropTable( + name: "Languages"); + + migrationBuilder.DropTable( + name: "AspNetRoles"); + + migrationBuilder.DropTable( + name: "Technologies"); + + migrationBuilder.DropTable( + name: "Posts"); + + migrationBuilder.DropTable( + name: "AspNetUsers"); + } + } +} diff --git a/src/Data/DevHive.Data/Migrations/DevHiveContextModelSnapshot.cs b/src/Data/DevHive.Data/Migrations/DevHiveContextModelSnapshot.cs new file mode 100644 index 0000000..8db3abf --- /dev/null +++ b/src/Data/DevHive.Data/Migrations/DevHiveContextModelSnapshot.cs @@ -0,0 +1,665 @@ +// +using System; +using DevHive.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +namespace DevHive.Data.Migrations +{ + [DbContext(typeof(DevHiveContext))] + partial class DevHiveContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("Relational:MaxIdentifierLength", 63) + .HasAnnotation("ProductVersion", "5.0.3") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + modelBuilder.Entity("DevHive.Data.Models.Comment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CreatorId") + .HasColumnType("uuid"); + + b.Property("Message") + .HasColumnType("text"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.Property("TimeCreated") + .HasColumnType("timestamp without time zone"); + + b.HasKey("Id"); + + b.HasIndex("CreatorId"); + + b.HasIndex("PostId"); + + b.ToTable("Comments"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Language", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Name") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Languages"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Post", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CreatorId") + .HasColumnType("uuid"); + + b.Property("Message") + .HasColumnType("text"); + + b.Property("TimeCreated") + .HasColumnType("timestamp without time zone"); + + b.HasKey("Id"); + + b.HasIndex("CreatorId"); + + b.ToTable("Posts"); + }); + + modelBuilder.Entity("DevHive.Data.Models.ProfilePicture", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("PictureURL") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("ProfilePicture"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Rating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.Property("Rate") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("PostId") + .IsUnique(); + + b.ToTable("Rating"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.PostAttachments", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("FileUrl") + .HasColumnType("text"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("PostId"); + + b.ToTable("PostAttachments"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.RatedPost", b => + { + b.Property("UserId") + .HasColumnType("uuid"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.HasKey("UserId", "PostId"); + + b.HasIndex("PostId"); + + b.ToTable("RatedPosts"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.UserRate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Liked") + .HasColumnType("boolean"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("PostId"); + + b.HasIndex("UserId"); + + b.ToTable("UserRates"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Technology", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Name") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Technologies"); + }); + + modelBuilder.Entity("DevHive.Data.Models.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AccessFailedCount") + .HasColumnType("integer"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("boolean"); + + b.Property("FirstName") + .HasColumnType("text"); + + b.Property("LastName") + .HasColumnType("text"); + + b.Property("LockoutEnabled") + .HasColumnType("boolean"); + + b.Property("LockoutEnd") + .HasColumnType("timestamp with time zone"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("PasswordHash") + .HasColumnType("text"); + + b.Property("PhoneNumber") + .HasColumnType("text"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("boolean"); + + b.Property("SecurityStamp") + .HasColumnType("text"); + + b.Property("TwoFactorEnabled") + .HasColumnType("boolean"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.HasIndex("UserId"); + + b.HasIndex("UserName") + .IsUnique(); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("LanguageUser", b => + { + b.Property("LanguagesId") + .HasColumnType("uuid"); + + b.Property("UsersId") + .HasColumnType("uuid"); + + b.HasKey("LanguagesId", "UsersId"); + + b.HasIndex("UsersId"); + + b.ToTable("LanguageUser"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("RoleId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("ProviderKey") + .HasColumnType("text"); + + b.Property("ProviderDisplayName") + .HasColumnType("text"); + + b.Property("UserId") + .HasColumnType("uuid"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("uuid"); + + b.Property("RoleId") + .HasColumnType("uuid"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("uuid"); + + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("RoleUser", b => + { + b.Property("RolesId") + .HasColumnType("uuid"); + + b.Property("UsersId") + .HasColumnType("uuid"); + + b.HasKey("RolesId", "UsersId"); + + b.HasIndex("UsersId"); + + b.ToTable("RoleUser"); + }); + + modelBuilder.Entity("TechnologyUser", b => + { + b.Property("TechnologiesId") + .HasColumnType("uuid"); + + b.Property("UsersId") + .HasColumnType("uuid"); + + b.HasKey("TechnologiesId", "UsersId"); + + b.HasIndex("UsersId"); + + b.ToTable("TechnologyUser"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Comment", b => + { + b.HasOne("DevHive.Data.Models.User", "Creator") + .WithMany("Comments") + .HasForeignKey("CreatorId"); + + b.HasOne("DevHive.Data.Models.Post", "Post") + .WithMany("Comments") + .HasForeignKey("PostId"); + + b.Navigation("Creator"); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Post", b => + { + b.HasOne("DevHive.Data.Models.User", "Creator") + .WithMany("Posts") + .HasForeignKey("CreatorId"); + + b.Navigation("Creator"); + }); + + modelBuilder.Entity("DevHive.Data.Models.ProfilePicture", b => + { + b.HasOne("DevHive.Data.Models.User", "User") + .WithOne("ProfilePicture") + .HasForeignKey("DevHive.Data.Models.ProfilePicture", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Rating", b => + { + b.HasOne("DevHive.Data.Models.Post", "Post") + .WithOne("Rating") + .HasForeignKey("DevHive.Data.Models.Rating", "PostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.PostAttachments", b => + { + b.HasOne("DevHive.Data.Models.Post", "Post") + .WithMany("Attachments") + .HasForeignKey("PostId"); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.RatedPost", b => + { + b.HasOne("DevHive.Data.Models.Post", "Post") + .WithMany() + .HasForeignKey("PostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("DevHive.Data.Models.User", "User") + .WithMany("RatedPosts") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Post"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("DevHive.Data.Models.Relational.UserRate", b => + { + b.HasOne("DevHive.Data.Models.Post", "Post") + .WithMany() + .HasForeignKey("PostId"); + + b.HasOne("DevHive.Data.Models.User", "User") + .WithMany() + .HasForeignKey("UserId"); + + b.Navigation("Post"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("DevHive.Data.Models.User", b => + { + b.HasOne("DevHive.Data.Models.User", null) + .WithMany("Friends") + .HasForeignKey("UserId"); + }); + + modelBuilder.Entity("LanguageUser", b => + { + b.HasOne("DevHive.Data.Models.Language", null) + .WithMany() + .HasForeignKey("LanguagesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("DevHive.Data.Models.Role", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("DevHive.Data.Models.Role", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("RoleUser", b => + { + b.HasOne("DevHive.Data.Models.Role", null) + .WithMany() + .HasForeignKey("RolesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("TechnologyUser", b => + { + b.HasOne("DevHive.Data.Models.Technology", null) + .WithMany() + .HasForeignKey("TechnologiesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("DevHive.Data.Models.User", null) + .WithMany() + .HasForeignKey("UsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("DevHive.Data.Models.Post", b => + { + b.Navigation("Attachments"); + + b.Navigation("Comments"); + + b.Navigation("Rating"); + }); + + modelBuilder.Entity("DevHive.Data.Models.User", b => + { + b.Navigation("Comments"); + + b.Navigation("Friends"); + + b.Navigation("Posts"); + + b.Navigation("ProfilePicture"); + + b.Navigation("RatedPosts"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Data/DevHive.Data/Repositories/RoleRepository.cs b/src/Data/DevHive.Data/Repositories/RoleRepository.cs index 7d07c1b..99e0634 100644 --- a/src/Data/DevHive.Data/Repositories/RoleRepository.cs +++ b/src/Data/DevHive.Data/Repositories/RoleRepository.cs @@ -2,53 +2,54 @@ using System; using System.Threading.Tasks; using DevHive.Data.Interfaces; using DevHive.Data.Models; +using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; namespace DevHive.Data.Repositories { public class RoleRepository : BaseRepository, IRoleRepository { - private readonly DevHiveContext _context; + private readonly RoleManager _roleManager; - public RoleRepository(DevHiveContext context) + public RoleRepository(DevHiveContext context, RoleManager roleManager) : base(context) { - this._context = context; + this._roleManager = roleManager; } + #region Create + public override async Task AddAsync(Role entity) + { + IdentityResult result = await this._roleManager.CreateAsync(entity); + + return result.Succeeded; + } + #endregion + #region Read public async Task GetByNameAsync(string name) { - return await this._context.Roles - .FirstOrDefaultAsync(x => x.Name == name); + return await this._roleManager.FindByNameAsync(name); } #endregion public override async Task EditAsync(Guid id, Role newEntity) { - Role role = await this.GetByIdAsync(id); - - this._context - .Entry(role) - .CurrentValues - .SetValues(newEntity); + newEntity.Id = id; + IdentityResult result = await this._roleManager.UpdateAsync(newEntity); - return await this.SaveChangesAsync(); + return result.Succeeded; } #region Validations public async Task DoesNameExist(string name) { - return await this._context.Roles - .AsNoTracking() - .AnyAsync(r => r.Name == name); + return await this._roleManager.RoleExistsAsync(name); } public async Task DoesRoleExist(Guid id) { - return await this._context.Roles - .AsNoTracking() - .AnyAsync(r => r.Id == id); + return await this._roleManager.Roles.AnyAsync(r => r.Id == id); } #endregion } diff --git a/src/Data/DevHive.Data/Repositories/UserRepository.cs b/src/Data/DevHive.Data/Repositories/UserRepository.cs index 9fa6eca..d570480 100644 --- a/src/Data/DevHive.Data/Repositories/UserRepository.cs +++ b/src/Data/DevHive.Data/Repositories/UserRepository.cs @@ -1,12 +1,8 @@ using System; using System.Collections.Generic; -using System.Globalization; -using System.Linq; using System.Threading.Tasks; -using AutoMapper.Mappers; using DevHive.Data.Interfaces; using DevHive.Data.Models; -using DevHive.Data.Models.Relational; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; @@ -14,18 +10,42 @@ namespace DevHive.Data.Repositories { public class UserRepository : BaseRepository, IUserRepository { - private readonly DevHiveContext _context; + private readonly UserManager _userManager; + private readonly RoleManager _roleManager; - public UserRepository(DevHiveContext context) + public UserRepository(DevHiveContext context, UserManager userManager, RoleManager roleManager) : base(context) { - this._context = context; + this._userManager = userManager; + this._roleManager = roleManager; } + #region Create + public override async Task AddAsync(User entity) + { + entity.PasswordHash = this._userManager.PasswordHasher.HashPassword(entity, entity.PasswordHash).ToString(); + IdentityResult result = await this._userManager.CreateAsync(entity); + + return result.Succeeded; + } + + public async Task AddRoleToUser(User user, string roleName) + { + bool succeeded = (await this._userManager.AddToRoleAsync(user, roleName)).Succeeded; + if (succeeded) + { + user.Roles.Add(await this._roleManager.FindByNameAsync(roleName)); + succeeded = await this.SaveChangesAsync(); + } + + return succeeded; + } + #endregion + #region Read public override async Task GetByIdAsync(Guid id) { - return await this._context.Users + return await this._userManager.Users .Include(x => x.Roles) .Include(x => x.Languages) .Include(x => x.Technologies) @@ -37,7 +57,7 @@ namespace DevHive.Data.Repositories public async Task GetByUsernameAsync(string username) { - return await this._context.Users + return await this._userManager.Users .Include(x => x.Roles) .Include(x => x.Languages) .Include(x => x.Technologies) @@ -49,6 +69,14 @@ namespace DevHive.Data.Repositories #endregion #region Update + public override async Task EditAsync(Guid id, User newEntity) + { + newEntity.Id = id; + IdentityResult result = await this._userManager.UpdateAsync(newEntity); + + return result.Succeeded; + } + public async Task UpdateProfilePicture(Guid userId, string pictureUrl) { User user = await this.GetByIdAsync(userId); @@ -59,24 +87,41 @@ namespace DevHive.Data.Repositories } #endregion + #region Delete + public override async Task DeleteAsync(User entity) + { + IdentityResult result = await this._userManager.DeleteAsync(entity); + + return result.Succeeded; + } + #endregion + #region Validations + public async Task VerifyPassword(User user, string password) + { + return await this._userManager.CheckPasswordAsync(user, password); + } + + public async Task IsInRoleAsync(User user, string roleName) + { + return await this._userManager.IsInRoleAsync(user, roleName); + } + public async Task DoesUserExistAsync(Guid id) { - return await this._context.Users - .AsNoTracking() - .AnyAsync(x => x.Id == id); + return await this._userManager.Users.AnyAsync(x => x.Id == id); } public async Task DoesUsernameExistAsync(string username) { - return await this._context.Users + return await this._userManager.Users .AsNoTracking() .AnyAsync(u => u.UserName == username); } public async Task DoesEmailExistAsync(string email) { - return await this._context.Users + return await this._userManager.Users .AsNoTracking() .AnyAsync(u => u.Email == email); } @@ -87,7 +132,7 @@ namespace DevHive.Data.Repositories foreach (var username in usernames) { - if (!await this._context.Users.AnyAsync(x => x.UserName == username)) + if (!await this.DoesUsernameExistAsync(username)) { valid = false; break; @@ -96,11 +141,10 @@ namespace DevHive.Data.Repositories return valid; } - public bool DoesUserHaveThisUsername(Guid id, string username) + public async Task DoesUserHaveThisUsernameAsync(Guid id, string username) { - return this._context.Users - .AsNoTracking() - .Any(x => x.Id == id && + return await this._userManager.Users + .AnyAsync(x => x.Id == id && x.UserName == username); } #endregion diff --git a/src/Services/DevHive.Services.Tests/UserService.Tests.cs b/src/Services/DevHive.Services.Tests/UserService.Tests.cs index ce997c1..550106f 100644 --- a/src/Services/DevHive.Services.Tests/UserService.Tests.cs +++ b/src/Services/DevHive.Services.Tests/UserService.Tests.cs @@ -274,7 +274,7 @@ namespace DevHive.Services.Tests // // this.UserRepositoryMock.Setup(p => p.DoesUserExistAsync(It.IsAny())).Returns(Task.FromResult(true)); // this.UserRepositoryMock.Setup(p => p.DoesUsernameExistAsync(It.IsAny())).Returns(Task.FromResult(false)); - // this.UserRepositoryMock.Setup(p => p.DoesUserHaveThisUsername(It.IsAny(), It.IsAny())).Returns(true); + // this.UserRepositoryMock.Setup(p => p.DoesUserHaveThisUsernameAsync(It.IsAny(), It.IsAny())).Returns(true); // this.UserRepositoryMock.Setup(p => p.EditAsync(It.IsAny(), It.IsAny())).Returns(Task.FromResult(shouldPass)); // this.UserRepositoryMock.Setup(p => p.GetByIdAsync(It.IsAny())).Returns(Task.FromResult(user)); // this.MapperMock.Setup(p => p.Map(It.IsAny())).Returns(user); diff --git a/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs b/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs index 043fcb7..99b41a8 100644 --- a/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs +++ b/src/Services/DevHive.Services/Configurations/Mapping/UserMappings.cs @@ -1,8 +1,6 @@ using DevHive.Data.Models; using AutoMapper; using DevHive.Services.Models.User; -using DevHive.Common.Models.Misc; -using DevHive.Data.Models.Relational; namespace DevHive.Services.Configurations.Mapping { @@ -11,19 +9,18 @@ namespace DevHive.Services.Configurations.Mapping public UserMappings() { CreateMap(); - CreateMap(); + CreateMap() + .ForMember(dest => dest.PasswordHash, src => src.MapFrom(p => p.Password)); CreateMap() .ForMember(dest => dest.Friends, src => src.Ignore()); CreateMap() - .ForMember(dest => dest.Friends, src => src.Ignore()) - .AfterMap((src, dest) => dest.PasswordHash = PasswordModifications.GeneratePasswordHash(src.Password)); + .ForMember(dest => dest.Friends, src => src.Ignore()); CreateMap(); CreateMap() .ForMember(dest => dest.ProfilePictureURL, src => src.MapFrom(p => p.ProfilePicture.PictureURL)) .ForMember(dest => dest.Friends, src => src.MapFrom(p => p.Friends)); CreateMap() - .ForMember(x => x.Password, opt => opt.Ignore()) .ForMember(dest => dest.ProfilePictureURL, src => src.MapFrom(p => p.ProfilePicture.PictureURL)); CreateMap(); } diff --git a/src/Services/DevHive.Services/Services/RoleService.cs b/src/Services/DevHive.Services/Services/RoleService.cs index 1285421..a5da759 100644 --- a/src/Services/DevHive.Services/Services/RoleService.cs +++ b/src/Services/DevHive.Services/Services/RoleService.cs @@ -39,8 +39,8 @@ namespace DevHive.Services.Services public async Task GetRoleById(Guid id) { - Role role = await this._roleRepository.GetByIdAsync(id) - ?? throw new ArgumentException("Role does not exist!"); + Role role = await this._roleRepository.GetByIdAsync(id) ?? + throw new ArgumentException("Role does not exist!"); return this._roleMapper.Map(role); } diff --git a/src/Services/DevHive.Services/Services/UserService.cs b/src/Services/DevHive.Services/Services/UserService.cs index e31eb8d..dfd45cc 100644 --- a/src/Services/DevHive.Services/Services/UserService.cs +++ b/src/Services/DevHive.Services/Services/UserService.cs @@ -15,7 +15,7 @@ using DevHive.Data.Interfaces; using System.Linq; using DevHive.Common.Models.Misc; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Identity; +using Newtonsoft.Json; namespace DevHive.Services.Services { @@ -25,8 +25,6 @@ namespace DevHive.Services.Services private readonly IRoleRepository _roleRepository; private readonly ILanguageRepository _languageRepository; private readonly ITechnologyRepository _technologyRepository; - private readonly UserManager _userManager; - private readonly RoleManager _roleManager; private readonly IMapper _userMapper; private readonly JwtOptions _jwtOptions; private readonly ICloudService _cloudService; @@ -35,8 +33,6 @@ namespace DevHive.Services.Services ILanguageRepository languageRepository, IRoleRepository roleRepository, ITechnologyRepository technologyRepository, - UserManager userManager, - RoleManager roleManager, IMapper mapper, JwtOptions jwtOptions, ICloudService cloudService) @@ -47,8 +43,6 @@ namespace DevHive.Services.Services this._jwtOptions = jwtOptions; this._languageRepository = languageRepository; this._technologyRepository = technologyRepository; - this._userManager = userManager; - this._roleManager = roleManager; this._cloudService = cloudService; } @@ -64,7 +58,7 @@ namespace DevHive.Services.Services User user = await this._userRepository.GetByUsernameAsync(loginModel.UserName); - if (user.PasswordHash != PasswordModifications.GeneratePasswordHash(loginModel.Password)) + if (!await this._userRepository.VerifyPassword(user, loginModel.Password)) throw new ArgumentException("Incorrect password!"); return new TokenModel(WriteJWTSecurityToken(user.Id, user.UserName, user.Roles)); @@ -82,22 +76,16 @@ namespace DevHive.Services.Services throw new ArgumentException("Email already exists!"); User user = this._userMapper.Map(registerModel); - user.PasswordHash = PasswordModifications.GeneratePasswordHash(registerModel.Password); - user.ProfilePicture = new ProfilePicture() { PictureURL = "/assets/images/feed/profile-pic.png" }; - // Make sure the default role exists - //TODO: Move when project starts - if (!await this._roleRepository.DoesNameExist(Role.DefaultRole)) - await this._roleRepository.AddAsync(new Role { Name = Role.DefaultRole }); + bool userResult = await this._userRepository.AddAsync(user); + bool roleResult = await this._userRepository.AddRoleToUser(user, Role.DefaultRole); - user.Roles.Add(await this._roleRepository.GetByNameAsync(Role.DefaultRole)); - - IdentityResult userResult = await this._userManager.CreateAsync(user); - User createdUser = await this._userRepository.GetByUsernameAsync(registerModel.UserName); - - if (!userResult.Succeeded) + if (!userResult) throw new ArgumentException("Unable to create a user"); + if (!roleResult) + throw new ArgumentException("Unable to add role to user"); + User createdUser = await this._userRepository.GetByUsernameAsync(registerModel.UserName); return new TokenModel(WriteJWTSecurityToken(createdUser.Id, createdUser.UserName, createdUser.Roles)); } #endregion @@ -125,20 +113,20 @@ namespace DevHive.Services.Services { await this.ValidateUserOnUpdate(updateUserServiceModel); - User currentUser = await this._userRepository.GetByIdAsync(updateUserServiceModel.Id); - await this.PopulateUserModel(currentUser, updateUserServiceModel); + User user = await this._userRepository.GetByIdAsync(updateUserServiceModel.Id); + await this.PopulateUserModel(user, updateUserServiceModel); if (updateUserServiceModel.Friends.Count > 0) - await this.CreateRelationToFriends(currentUser, updateUserServiceModel.Friends.ToList()); + await this.CreateRelationToFriends(user, updateUserServiceModel.Friends.ToList()); else - currentUser.Friends.Clear(); + user.Friends.Clear(); - IdentityResult result = await this._userManager.UpdateAsync(currentUser); + bool result = await this._userRepository.EditAsync(user.Id, user); - if (!result.Succeeded) + if (!result) throw new InvalidOperationException("Unable to edit user!"); - User newUser = await this._userRepository.GetByIdAsync(currentUser.Id); + User newUser = await this._userRepository.GetByIdAsync(user.Id); return this._userMapper.Map(newUser); } @@ -175,16 +163,14 @@ namespace DevHive.Services.Services throw new ArgumentException("User does not exist!"); User user = await this._userRepository.GetByIdAsync(id); - IdentityResult result = await this._userManager.DeleteAsync(user); - - return result.Succeeded; + return await this._userRepository.DeleteAsync(user); } #endregion #region Validations /// /// Checks whether the given user, gotten by the "id" property, - /// is the same user as the one in the token (uness the user in the token has the admin role) + /// is the same user as the one in the token (unless the user in the token has the admin role) /// and the roles in the token are the same as those in the user, gotten by the id in the token /// public async Task ValidJWT(Guid id, string rawTokenData) @@ -192,15 +178,16 @@ namespace DevHive.Services.Services // There is authorization name in the beginning, i.e. "Bearer eyJh..." var jwt = new JwtSecurityTokenHandler().ReadJwtToken(rawTokenData.Remove(0, 7)); - Guid jwtUserID = new Guid(this.GetClaimTypeValues("ID", jwt.Claims).First()); - List jwtRoleNames = this.GetClaimTypeValues("role", jwt.Claims); + Guid jwtUserID = new(UserService.GetClaimTypeValues("ID", jwt.Claims).First()); + List jwtRoleNames = UserService.GetClaimTypeValues("role", jwt.Claims); User user = await this._userRepository.GetByIdAsync(jwtUserID) ?? throw new ArgumentException("User does not exist!"); - /* Check if user is trying to do something to himself, unless he's an admin */ + /* Check if he is an admin */ + if (user.Roles.Any(x => x.Name == Role.AdminRole)) + return true; - /* Check roles */ if (!jwtRoleNames.Contains(Role.AdminRole) && user.Id != id) return false; @@ -219,7 +206,7 @@ namespace DevHive.Services.Services /// /// Returns all values from a given claim type /// - private List GetClaimTypeValues(string type, IEnumerable claims) + private static List GetClaimTypeValues(string type, IEnumerable claims) { List toReturn = new(); @@ -243,7 +230,7 @@ namespace DevHive.Services.Services if (updateUserServiceModel.Friends.Any(x => x.UserName == updateUserServiceModel.UserName)) throw new ArgumentException("You cant add yourself as a friend(sry, bro)!"); - if (!this._userRepository.DoesUserHaveThisUsername(updateUserServiceModel.Id, updateUserServiceModel.UserName) + if (!await this._userRepository.DoesUserHaveThisUsernameAsync(updateUserServiceModel.Id, updateUserServiceModel.UserName) && await this._userRepository.DoesUsernameExistAsync(updateUserServiceModel.UserName)) throw new ArgumentException("Username already exists!"); @@ -296,19 +283,16 @@ namespace DevHive.Services.Services if (!await this._roleRepository.DoesNameExist(Role.AdminRole)) { - Role adminRole = new() - { - Name = Role.AdminRole - }; + Role adminRole = new() { Name = Role.AdminRole }; adminRole.Users.Add(user); await this._roleRepository.AddAsync(adminRole); } - Role admin = await this._roleManager.FindByNameAsync(Role.AdminRole); + Role admin = await this._roleRepository.GetByNameAsync(Role.AdminRole); user.Roles.Add(admin); - await this._userManager.UpdateAsync(user); + await this._userRepository.EditAsync(user.Id, user); User newUser = await this._userRepository.GetByIdAsync(userId); @@ -323,7 +307,7 @@ namespace DevHive.Services.Services user.Email = updateUserServiceModel.Email; //Do NOT allow a user to change his roles, unless he is an Admin - bool isAdmin = await this._userManager.IsInRoleAsync(user, Role.AdminRole); + bool isAdmin = await this._userRepository.IsInRoleAsync(user, Role.AdminRole); if (isAdmin) { @@ -371,7 +355,7 @@ namespace DevHive.Services.Services user.Friends.Add(amigo); amigo.Friends.Add(user); - await this._userManager.UpdateAsync(amigo); + await this._userRepository.EditAsync(amigo.Id, amigo); } } #endregion diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs index 84108ae..687e83f 100644 --- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs @@ -60,7 +60,7 @@ namespace DevHive.Web.Configurations.Extensions }); } - public static async Task UseDatabaseConfiguration(this IApplicationBuilder app) + public static void UseDatabaseConfiguration(this IApplicationBuilder app) { app.UseHttpsRedirection(); app.UseRouting(); @@ -75,21 +75,21 @@ namespace DevHive.Web.Configurations.Extensions var roleManager = (RoleManager)serviceScope.ServiceProvider.GetService(typeof(RoleManager)); - if (!await dbContext.Roles.AnyAsync(x => x.Name == Role.DefaultRole)) + if (!dbContext.Roles.Any(x => x.Name == Role.DefaultRole)) { Role defaultRole = new() { Name = Role.DefaultRole }; - await roleManager.CreateAsync(defaultRole); + roleManager.CreateAsync(defaultRole).Wait(); } - if (!await dbContext.Roles.AnyAsync(x => x.Name == Role.AdminRole)) + if (!dbContext.Roles.Any(x => x.Name == Role.AdminRole)) { Role adminRole = new() { Name = Role.AdminRole }; - await roleManager.CreateAsync(adminRole); + roleManager.CreateAsync(adminRole).Wait(); } - await dbContext.SaveChangesAsync(); + dbContext.SaveChanges(); } } } diff --git a/src/Web/DevHive.Web/Controllers/UserController.cs b/src/Web/DevHive.Web/Controllers/UserController.cs index 25faa8a..214fba7 100644 --- a/src/Web/DevHive.Web/Controllers/UserController.cs +++ b/src/Web/DevHive.Web/Controllers/UserController.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using DevHive.Common.Models.Identity; using DevHive.Services.Interfaces; -using Microsoft.Extensions.Hosting; namespace DevHive.Web.Controllers { @@ -32,8 +31,8 @@ namespace DevHive.Web.Controllers { LoginServiceModel loginServiceModel = this._userMapper.Map(loginModel); - TokenModel TokenModel = await this._userService.LoginUser(loginServiceModel); - TokenWebModel tokenWebModel = this._userMapper.Map(TokenModel); + TokenModel tokenModel = await this._userService.LoginUser(loginServiceModel); + TokenWebModel tokenWebModel = this._userMapper.Map(tokenModel); return new OkObjectResult(tokenWebModel); } @@ -45,8 +44,8 @@ namespace DevHive.Web.Controllers { RegisterServiceModel registerServiceModel = this._userMapper.Map(registerModel); - TokenModel TokenModel = await this._userService.RegisterUser(registerServiceModel); - TokenWebModel tokenWebModel = this._userMapper.Map(TokenModel); + TokenModel tokenModel = await this._userService.RegisterUser(registerServiceModel); + TokenWebModel tokenWebModel = this._userMapper.Map(tokenModel); return new CreatedResult("Register", tokenWebModel); } diff --git a/src/Web/DevHive.Web/Startup.cs b/src/Web/DevHive.Web/Startup.cs index 46521cf..dbcf131 100644 --- a/src/Web/DevHive.Web/Startup.cs +++ b/src/Web/DevHive.Web/Startup.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using DevHive.Web.Configurations.Extensions; using Newtonsoft.Json; +using System.Threading.Tasks; namespace DevHive.Web { -- cgit v1.2.3 From 83ae76a1b93c91cf7cfb5fc9ea1ef728ee47c839 Mon Sep 17 00:00:00 2001 From: transtrike Date: Sat, 27 Feb 2021 11:18:09 +0200 Subject: JWT Validations works; Introduced more bugs to fix later --- .../DevHive.Common.Models/DevHive.Common.csproj | 13 ---- .../DevHive.Common/Jwt/Interfaces/IJwtService.cs | 11 +++ src/Common/DevHive.Common/Jwt/JwtService.cs | 79 ++++++++++++++++++++++ src/DevHive.sln | 49 +++++++++----- .../DevHive.Services/Services/UserService.cs | 68 ++++++++++++------- .../Extensions/ConfigureDependencyInjection.cs | 12 +++- .../Controllers/ProfilePictureController.cs | 32 +++++++++ src/Web/DevHive.Web/Controllers/UserController.cs | 17 ----- src/Web/DevHive.Web/appsettings.json | 29 ++++---- 9 files changed, 225 insertions(+), 85 deletions(-) delete mode 100644 src/Common/DevHive.Common.Models/DevHive.Common.csproj create mode 100644 src/Common/DevHive.Common/Jwt/Interfaces/IJwtService.cs create mode 100644 src/Common/DevHive.Common/Jwt/JwtService.cs create mode 100644 src/Web/DevHive.Web/Controllers/ProfilePictureController.cs (limited to 'src/Web/DevHive.Web/Controllers/UserController.cs') diff --git a/src/Common/DevHive.Common.Models/DevHive.Common.csproj b/src/Common/DevHive.Common.Models/DevHive.Common.csproj deleted file mode 100644 index f6d662c..0000000 --- a/src/Common/DevHive.Common.Models/DevHive.Common.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - net5.0 - - - - - - - true - latest - - \ No newline at end of file diff --git a/src/Common/DevHive.Common/Jwt/Interfaces/IJwtService.cs b/src/Common/DevHive.Common/Jwt/Interfaces/IJwtService.cs new file mode 100644 index 0000000..d2f1756 --- /dev/null +++ b/src/Common/DevHive.Common/Jwt/Interfaces/IJwtService.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; + +namespace DevHive.Common.Jwt.Interfaces +{ + public interface IJwtService + { + string GenerateJwtToken(Guid userId, string username, List roleNames); + bool ValidateToken(string authToken); + } +} diff --git a/src/Common/DevHive.Common/Jwt/JwtService.cs b/src/Common/DevHive.Common/Jwt/JwtService.cs new file mode 100644 index 0000000..677353a --- /dev/null +++ b/src/Common/DevHive.Common/Jwt/JwtService.cs @@ -0,0 +1,79 @@ +using System; +using System.Buffers.Text; +using System.Collections.Generic; +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Security.Principal; +using System.Text; +using DevHive.Common.Jwt.Interfaces; +using Microsoft.IdentityModel.Tokens; + +namespace DevHive.Common.Jwt +{ + public class JwtService : IJwtService + { + private readonly string _validationIssuer; + private readonly string _audience; + private readonly byte[] _signingKey; + + public JwtService(byte[] signingKey, string validationIssuer, string audience) + { + this._signingKey = signingKey; + this._validationIssuer = validationIssuer; + this._audience = audience; + } + + public string GenerateJwtToken(Guid userId, string username, List roleNames) + { + var securityKey = new SymmetricSecurityKey(this._signingKey); + var credentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256); + + HashSet claims = new() + { + new Claim("ID", $"{userId}"), + new Claim("Username", username) + }; + + foreach (var roleName in roleNames) + claims.Add(new Claim(ClaimTypes.Role, roleName)); + + SecurityTokenDescriptor securityTokenDescriptor = new() + { + Issuer = this._validationIssuer, + Audience = this._audience, + Subject = new ClaimsIdentity(claims), + Expires = DateTime.Today.AddDays(7), + SigningCredentials = credentials, + }; + + JwtSecurityTokenHandler tokenHandler = new(); + SecurityToken token = tokenHandler.CreateToken(securityTokenDescriptor); + + return tokenHandler.WriteToken(token); + } + + public bool ValidateToken(string authToken) + { + var tokenHandler = new JwtSecurityTokenHandler(); + var validationParameters = GetValidationParameters(); + + //Validate edge case where user can delete other users + + IPrincipal principal = tokenHandler.ValidateToken(authToken.Remove(0, 7), validationParameters, out _); + return principal.Identity.IsAuthenticated; + } + + private TokenValidationParameters GetValidationParameters() + { + return new TokenValidationParameters() + { + ValidateLifetime = true, + ValidateAudience = true, + ValidateIssuer = true, + ValidIssuer = this._validationIssuer, + ValidAudience = this._audience, + IssuerSigningKey = new SymmetricSecurityKey(this._signingKey) + }; + } + } +} diff --git a/src/DevHive.sln b/src/DevHive.sln index 05bdcda..a202180 100644 --- a/src/DevHive.sln +++ b/src/DevHive.sln @@ -11,10 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Models", "Data EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Data.Tests", "Data\DevHive.Data.Tests\DevHive.Data.Tests.csproj", "{F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{F2864A9D-70F1-452F-AAAC-AAFD8102ABAD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Common", "Common\DevHive.Common.Models\DevHive.Common.csproj", "{5C3DFE9B-9690-475E-A0AE-D62315D38337}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{7CA79114-C359-4871-BFA7-0EA898B50AE4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Services", "Services\DevHive.Services\DevHive.Services.csproj", "{B5F22590-E3CE-4595-BE48-AA7F1797A6B8}" @@ -31,6 +27,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Models", "Web\D EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Web.Tests", "Web\DevHive.Web.Tests\DevHive.Web.Tests.csproj", "{608273FF-01ED-48B3-B912-66CCDBF5572E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{49B4EAF5-8F45-493F-A25A-7F37DAAE6B1E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Common", "Common\DevHive.Common\DevHive.Common.csproj", "{AAEC0516-A943-449E-A1E8-E0628BFFAA2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevHive.Common.Models", "Common\DevHive.Common.Models\DevHive.Common.Models.csproj", "{3D63C965-A734-45D6-B75D-AFDCAB511293}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -80,18 +82,6 @@ Global {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x64.Build.0 = Release|Any CPU {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x86.ActiveCfg = Release|Any CPU {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0}.Release|x86.Build.0 = Release|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x64.ActiveCfg = Debug|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x64.Build.0 = Debug|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x86.ActiveCfg = Debug|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Debug|x86.Build.0 = Debug|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|Any CPU.Build.0 = Release|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x64.ActiveCfg = Release|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x64.Build.0 = Release|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x86.ActiveCfg = Release|Any CPU - {5C3DFE9B-9690-475E-A0AE-D62315D38337}.Release|x86.Build.0 = Release|Any CPU {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|Any CPU.Build.0 = Debug|Any CPU {B5F22590-E3CE-4595-BE48-AA7F1797A6B8}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -164,17 +154,42 @@ Global {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x64.Build.0 = Release|Any CPU {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x86.ActiveCfg = Release|Any CPU {608273FF-01ED-48B3-B912-66CCDBF5572E}.Release|x86.Build.0 = Release|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Debug|x64.ActiveCfg = Debug|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Debug|x64.Build.0 = Debug|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Debug|x86.ActiveCfg = Debug|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Debug|x86.Build.0 = Debug|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Release|Any CPU.Build.0 = Release|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Release|x64.ActiveCfg = Release|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Release|x64.Build.0 = Release|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Release|x86.ActiveCfg = Release|Any CPU + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E}.Release|x86.Build.0 = Release|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Debug|x64.ActiveCfg = Debug|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Debug|x64.Build.0 = Debug|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Debug|x86.ActiveCfg = Debug|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Debug|x86.Build.0 = Debug|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Release|Any CPU.Build.0 = Release|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Release|x64.ActiveCfg = Release|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Release|x64.Build.0 = Release|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Release|x86.ActiveCfg = Release|Any CPU + {3D63C965-A734-45D6-B75D-AFDCAB511293}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {70D0903D-C65F-4600-B6F8-F7BD00500A51} = {0C2AC7A9-AC68-4668-B88E-9370C596F498} {56F85916-3955-4558-8809-376D20902B94} = {0C2AC7A9-AC68-4668-B88E-9370C596F498} {F056B3F1-B72D-4935-87EA-F7BFEA96AFB0} = {0C2AC7A9-AC68-4668-B88E-9370C596F498} - {5C3DFE9B-9690-475E-A0AE-D62315D38337} = {F2864A9D-70F1-452F-AAAC-AAFD8102ABAD} {B5F22590-E3CE-4595-BE48-AA7F1797A6B8} = {7CA79114-C359-4871-BFA7-0EA898B50AE4} {2FFF985B-A26F-443D-A159-62ED2FD5A2BC} = {7CA79114-C359-4871-BFA7-0EA898B50AE4} {6E58003B-E5E8-4AA4-8F70-A9442BBFC110} = {7CA79114-C359-4871-BFA7-0EA898B50AE4} {A6D35BD9-A2A4-4937-89A8-DCB0D610B04A} = {768A592D-58EA-4CD3-A053-2E8F2DC7708A} {D8C898F7-A0DE-4939-8708-3D4A5C383EFC} = {768A592D-58EA-4CD3-A053-2E8F2DC7708A} {608273FF-01ED-48B3-B912-66CCDBF5572E} = {768A592D-58EA-4CD3-A053-2E8F2DC7708A} + {AAEC0516-A943-449E-A1E8-E0628BFFAA2E} = {49B4EAF5-8F45-493F-A25A-7F37DAAE6B1E} + {3D63C965-A734-45D6-B75D-AFDCAB511293} = {49B4EAF5-8F45-493F-A25A-7F37DAAE6B1E} EndGlobalSection EndGlobal diff --git a/src/Services/DevHive.Services/Services/UserService.cs b/src/Services/DevHive.Services/Services/UserService.cs index dfd45cc..cbcb116 100644 --- a/src/Services/DevHive.Services/Services/UserService.cs +++ b/src/Services/DevHive.Services/Services/UserService.cs @@ -13,9 +13,9 @@ using DevHive.Common.Models.Identity; using DevHive.Services.Interfaces; using DevHive.Data.Interfaces; using System.Linq; -using DevHive.Common.Models.Misc; using Microsoft.AspNetCore.Http; -using Newtonsoft.Json; +using DevHive.Common.Jwt; +using DevHive.Common.Jwt.Interfaces; namespace DevHive.Services.Services { @@ -28,6 +28,7 @@ namespace DevHive.Services.Services private readonly IMapper _userMapper; private readonly JwtOptions _jwtOptions; private readonly ICloudService _cloudService; + private readonly IJwtService _jwtService; public UserService(IUserRepository userRepository, ILanguageRepository languageRepository, @@ -35,7 +36,8 @@ namespace DevHive.Services.Services ITechnologyRepository technologyRepository, IMapper mapper, JwtOptions jwtOptions, - ICloudService cloudService) + ICloudService cloudService, + IJwtService jwtService) { this._userRepository = userRepository; this._roleRepository = roleRepository; @@ -44,6 +46,7 @@ namespace DevHive.Services.Services this._languageRepository = languageRepository; this._technologyRepository = technologyRepository; this._cloudService = cloudService; + this._jwtService = jwtService; } #region Authentication @@ -65,8 +68,10 @@ namespace DevHive.Services.Services } /// - /// Returns a new JSON Web Token (that can be used for authorization) for the given user + /// Register a user in the database and return a /// + /// Register model, containing registration information + /// A Token model, containing JWT Token for further verification public async Task RegisterUser(RegisterServiceModel registerModel) { if (await this._userRepository.DoesUsernameExistAsync(registerModel.UserName)) @@ -86,7 +91,12 @@ namespace DevHive.Services.Services throw new ArgumentException("Unable to add role to user"); User createdUser = await this._userRepository.GetByUsernameAsync(registerModel.UserName); - return new TokenModel(WriteJWTSecurityToken(createdUser.Id, createdUser.UserName, createdUser.Roles)); + List roleNames = createdUser + .Roles + .Select(x => x.Name) + .ToList(); + + return new TokenModel(this._jwtService.GenerateJwtToken(createdUser.Id, createdUser.UserName, roleNames)); } #endregion @@ -173,34 +183,38 @@ namespace DevHive.Services.Services /// is the same user as the one in the token (unless the user in the token has the admin role) /// and the roles in the token are the same as those in the user, gotten by the id in the token /// + /// + /// + /// public async Task ValidJWT(Guid id, string rawTokenData) { + return this._jwtService.ValidateToken(rawTokenData); // There is authorization name in the beginning, i.e. "Bearer eyJh..." - var jwt = new JwtSecurityTokenHandler().ReadJwtToken(rawTokenData.Remove(0, 7)); + // var jwt = new JwtSecurityTokenHandler().ReadJwtToken(rawTokenData.Remove(0, 7)); - Guid jwtUserID = new(UserService.GetClaimTypeValues("ID", jwt.Claims).First()); - List jwtRoleNames = UserService.GetClaimTypeValues("role", jwt.Claims); + // Guid jwtUserID = new(UserService.GetClaimTypeValues("ID", jwt.Claims).First()); + // List jwtRoleNames = UserService.GetClaimTypeValues("role", jwt.Claims); - User user = await this._userRepository.GetByIdAsync(jwtUserID) - ?? throw new ArgumentException("User does not exist!"); + // User user = await this._userRepository.GetByIdAsync(jwtUserID) + // ?? throw new ArgumentException("User does not exist!"); - /* Check if he is an admin */ - if (user.Roles.Any(x => x.Name == Role.AdminRole)) - return true; + // /* Check if he is an admin */ + // if (user.Roles.Any(x => x.Name == Role.AdminRole)) + // return true; - if (!jwtRoleNames.Contains(Role.AdminRole) && user.Id != id) - return false; + // if (!jwtRoleNames.Contains(Role.AdminRole) && user.Id != id) + // return false; - // Check if jwt contains all user roles (if it doesn't, jwt is either old or tampered with) - foreach (var role in user.Roles) - if (!jwtRoleNames.Contains(role.Name)) - return false; + // // Check if jwt contains all user roles (if it doesn't, jwt is either old or tampered with) + // foreach (var role in user.Roles) + // if (!jwtRoleNames.Contains(role.Name)) + // return false; - // Check if jwt contains only roles of user - if (jwtRoleNames.Count != user.Roles.Count) - return false; + // // Check if jwt contains only roles of user + // if (jwtRoleNames.Count != user.Roles.Count) + // return false; - return true; + // return true; } /// @@ -294,9 +308,13 @@ namespace DevHive.Services.Services user.Roles.Add(admin); await this._userRepository.EditAsync(user.Id, user); - User newUser = await this._userRepository.GetByIdAsync(userId); + User createdUser = await this._userRepository.GetByIdAsync(userId); + List roleNames = createdUser + .Roles + .Select(x => x.Name) + .ToList(); - return new TokenModel(WriteJWTSecurityToken(newUser.Id, newUser.UserName, newUser.Roles)); + return new TokenModel(this._jwtService.GenerateJwtToken(createdUser.Id, createdUser.UserName, roleNames)); } private async Task PopulateUserModel(User user, UpdateUserServiceModel updateUserServiceModel) diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs index c547951..660a416 100644 --- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs @@ -1,3 +1,6 @@ +using System.Text; +using DevHive.Common.Jwt; +using DevHive.Common.Jwt.Interfaces; using DevHive.Data.Interfaces; using DevHive.Data.Repositories; using DevHive.Services.Interfaces; @@ -27,12 +30,19 @@ namespace DevHive.Web.Configurations.Extensions services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(options => new CloudinaryService( cloudName: configuration.GetSection("Cloud").GetSection("cloudName").Value, apiKey: configuration.GetSection("Cloud").GetSection("apiKey").Value, apiSecret: configuration.GetSection("Cloud").GetSection("apiSecret").Value)); - services.AddTransient(); + + services.AddSingleton(options => + new JwtService( + signingKey: Encoding.ASCII.GetBytes(configuration.GetSection("Jwt").GetSection("signingKey").Value), + validationIssuer: configuration.GetSection("Jwt").GetSection("validationIssuer").Value, + audience: configuration.GetSection("Jwt").GetSection("audience").Value)); } } } diff --git a/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs b/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs new file mode 100644 index 0000000..d3971ff --- /dev/null +++ b/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs @@ -0,0 +1,32 @@ +using System; +using System.Threading.Tasks; +using DevHive.Services.Models.User; +using DevHive.Web.Models.User; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace DevHive.Web.Controllers +{ + [ApiController] + [Route("api/[controller]")] + public class ProfilePictureController + { + [HttpPut] + [Route("ProfilePicture")] + [Authorize(Roles = "User,Admin")] + public async Task UpdateProfilePicture(Guid userId, [FromForm] UpdateProfilePictureWebModel updateProfilePictureWebModel, [FromHeader] string authorization) + { + throw new NotImplementedException(); + // if (!await this._userService.ValidJWT(userId, authorization)) + // return new UnauthorizedResult(); + + // UpdateProfilePictureServiceModel updateProfilePictureServiceModel = this._userMapper.Map(updateProfilePictureWebModel); + // updateProfilePictureServiceModel.UserId = userId; + + // ProfilePictureServiceModel profilePictureServiceModel = await this._userService.UpdateProfilePicture(updateProfilePictureServiceModel); + // ProfilePictureWebModel profilePictureWebModel = this._userMapper.Map(profilePictureServiceModel); + + // return new AcceptedResult("UpdateProfilePicture", profilePictureWebModel); + } + } +} diff --git a/src/Web/DevHive.Web/Controllers/UserController.cs b/src/Web/DevHive.Web/Controllers/UserController.cs index 214fba7..a1e87f4 100644 --- a/src/Web/DevHive.Web/Controllers/UserController.cs +++ b/src/Web/DevHive.Web/Controllers/UserController.cs @@ -93,23 +93,6 @@ namespace DevHive.Web.Controllers return new AcceptedResult("UpdateUser", userWebModel); } - - [HttpPut] - [Route("ProfilePicture")] - [Authorize(Roles = "User,Admin")] - public async Task UpdateProfilePicture(Guid userId, [FromForm] UpdateProfilePictureWebModel updateProfilePictureWebModel, [FromHeader] string authorization) - { - if (!await this._userService.ValidJWT(userId, authorization)) - return new UnauthorizedResult(); - - UpdateProfilePictureServiceModel updateProfilePictureServiceModel = this._userMapper.Map(updateProfilePictureWebModel); - updateProfilePictureServiceModel.UserId = userId; - - ProfilePictureServiceModel profilePictureServiceModel = await this._userService.UpdateProfilePicture(updateProfilePictureServiceModel); - ProfilePictureWebModel profilePictureWebModel = this._userMapper.Map(profilePictureServiceModel); - - return new AcceptedResult("UpdateProfilePicture", profilePictureWebModel); - } #endregion #region Delete diff --git a/src/Web/DevHive.Web/appsettings.json b/src/Web/DevHive.Web/appsettings.json index bcdcae7..b7e0ce5 100644 --- a/src/Web/DevHive.Web/appsettings.json +++ b/src/Web/DevHive.Web/appsettings.json @@ -1,20 +1,25 @@ { - "AppSettings": { - "Secret": "gXfQlU6qpDleFWyimscjYcT3tgFsQg3yoFjcvSLxG56n1Vu2yptdIUq254wlJWjm" - }, - "ConnectionStrings": { - "DEV": "Server=localhost;Port=5432;Database=API;User Id=postgres;Password=;" + "AppSettings": { + "Secret": "" + }, + "Jwt": { + "signingKey": "", + "validationIssuer": "", + "audience": "" + }, + "ConnectionStrings": { + "DEV": "Server=localhost;Port=5432;Database=API;User Id=postgres;Password=;" }, "Cloud": { "cloudName": "devhive", "apiKey": "488664116365813", "apiSecret": "" }, - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - } + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } } -- cgit v1.2.3 From 26b18fe3727507d1b47ffb53ed773f133122eee8 Mon Sep 17 00:00:00 2001 From: transtrike Date: Sun, 28 Feb 2021 13:00:16 +0200 Subject: Integrated new JWT validation where needed --- src/.editorconfig | 5 +- .../DevHive.Common/Jwt/Interfaces/IJwtService.cs | 17 +++ src/Common/DevHive.Common/Jwt/JwtService.cs | 2 - .../DevHive.Services/Interfaces/IUserService.cs | 49 ++++++++- .../DevHive.Services/Services/UserService.cs | 117 +-------------------- .../DevHive.Web/Controllers/CommentController.cs | 10 +- src/Web/DevHive.Web/Controllers/PostController.cs | 10 +- src/Web/DevHive.Web/Controllers/UserController.cs | 12 ++- 8 files changed, 95 insertions(+), 127 deletions(-) (limited to 'src/Web/DevHive.Web/Controllers/UserController.cs') diff --git a/src/.editorconfig b/src/.editorconfig index ea2af21..9f0e74b 100644 --- a/src/.editorconfig +++ b/src/.editorconfig @@ -44,9 +44,10 @@ dotnet_diagnostic.IDE0055.severity = warning # Sort using and Import directives with System.* appearing first dotnet_sort_system_directives_first = true dotnet_separate_import_directive_groups = false + # Avoid "this." and "Me." if not necessary -dotnet_style_qualification_for_field = false:refactoring -dotnet_style_qualification_for_property = false:refactoring +dotnet_style_qualification_for_field = true:refactoring +dotnet_style_qualification_for_property = true:refactoring dotnet_style_qualification_for_method = false:refactoring dotnet_style_qualification_for_event = false:refactoring diff --git a/src/Common/DevHive.Common/Jwt/Interfaces/IJwtService.cs b/src/Common/DevHive.Common/Jwt/Interfaces/IJwtService.cs index 6f844f5..352a7d5 100644 --- a/src/Common/DevHive.Common/Jwt/Interfaces/IJwtService.cs +++ b/src/Common/DevHive.Common/Jwt/Interfaces/IJwtService.cs @@ -5,7 +5,24 @@ namespace DevHive.Common.Jwt.Interfaces { public interface IJwtService { + /// + /// The generation of a JWT, when a new user registers or log ins + /// Tokens have an expiration time of 7 days. + /// + /// User's Guid + /// Users's username + /// List of user's roles + /// Return a new JWT, containing the user id, username and roles. string GenerateJwtToken(Guid userId, string username, List roleNames); + + /// + /// Checks whether the given user, gotten by the "id" property, + /// is the same user as the one in the token (unless the user in the token has the admin role) + /// and the roles in the token are the same as those in the user, gotten by the id in the token + /// + /// Guid of the user being validated + /// The raw token coming from the request + /// Bool result of is the user authenticated to do an action bool ValidateToken(Guid userId, string rawToken); } } diff --git a/src/Common/DevHive.Common/Jwt/JwtService.cs b/src/Common/DevHive.Common/Jwt/JwtService.cs index a0c49db..9f316da 100644 --- a/src/Common/DevHive.Common/Jwt/JwtService.cs +++ b/src/Common/DevHive.Common/Jwt/JwtService.cs @@ -1,11 +1,9 @@ using System; -using System.Buffers.Text; using System.Collections.Generic; using System.IdentityModel.Tokens.Jwt; using System.Linq; using System.Security.Claims; using System.Security.Principal; -using System.Text; using DevHive.Common.Jwt.Interfaces; using Microsoft.IdentityModel.Tokens; diff --git a/src/Services/DevHive.Services/Interfaces/IUserService.cs b/src/Services/DevHive.Services/Interfaces/IUserService.cs index 4a9ffc8..a55f9dd 100644 --- a/src/Services/DevHive.Services/Interfaces/IUserService.cs +++ b/src/Services/DevHive.Services/Interfaces/IUserService.cs @@ -7,19 +7,64 @@ namespace DevHive.Services.Interfaces { public interface IUserService { + /// + /// Log ins an existing user and gives him/her a JWT Token for further authorization + /// + /// Login service model, conaining user's username and password + /// A JWT Token for authorization Task LoginUser(LoginServiceModel loginModel); + + /// + /// Registers a new user and gives him/her a JWT Token for further authorization + /// + /// Register service model, containing the new user's data + /// A JWT Token for authorization Task RegisterUser(RegisterServiceModel registerModel); + /// + /// Get a user by his username. Used for querying profiles without provided authentication + /// + /// User's username, who's to be queried + /// The queried user or null, if non existant Task GetUserByUsername(string username); + + /// + /// Get a user by his Guid. Used for querying full user's profile + /// Requires authenticated user + /// + /// User's username, who's to be queried + /// The queried user or null, if non existant Task GetUserById(Guid id); + /// + /// Updates a user's data, provided a full model with new details + /// Requires authenticated user + /// + /// Full update user model for updating + /// Read model of the new user Task UpdateUser(UpdateUserServiceModel updateUserServiceModel); + + /// + /// Uploads the given picture and assigns it's link to the user in the database + /// Requires authenticated user + /// + /// Contains User's Guid and the new picture to be updated + /// The new picture's URL Task UpdateProfilePicture(UpdateProfilePictureServiceModel updateProfilePictureServiceModel); + /// + /// Deletes a user from the database and removes his data entirely + /// Requires authenticated user + /// + /// The user's Guid, who's to be deleted + /// True if successfull, false otherwise Task DeleteUser(Guid id); - Task ValidJWT(Guid id, string rawTokenData); - + /// + /// We don't talk about that! + /// + /// + /// Task SuperSecretPromotionToAdmin(Guid userId); } } diff --git a/src/Services/DevHive.Services/Services/UserService.cs b/src/Services/DevHive.Services/Services/UserService.cs index cbcb116..4f74b06 100644 --- a/src/Services/DevHive.Services/Services/UserService.cs +++ b/src/Services/DevHive.Services/Services/UserService.cs @@ -1,20 +1,14 @@ using AutoMapper; -using DevHive.Services.Options; using DevHive.Services.Models.User; using System.Threading.Tasks; using DevHive.Data.Models; using System; -using System.IdentityModel.Tokens.Jwt; -using System.Security.Claims; -using Microsoft.IdentityModel.Tokens; -using System.Text; using System.Collections.Generic; using DevHive.Common.Models.Identity; using DevHive.Services.Interfaces; using DevHive.Data.Interfaces; using System.Linq; using Microsoft.AspNetCore.Http; -using DevHive.Common.Jwt; using DevHive.Common.Jwt.Interfaces; namespace DevHive.Services.Services @@ -26,7 +20,6 @@ namespace DevHive.Services.Services private readonly ILanguageRepository _languageRepository; private readonly ITechnologyRepository _technologyRepository; private readonly IMapper _userMapper; - private readonly JwtOptions _jwtOptions; private readonly ICloudService _cloudService; private readonly IJwtService _jwtService; @@ -35,14 +28,12 @@ namespace DevHive.Services.Services IRoleRepository roleRepository, ITechnologyRepository technologyRepository, IMapper mapper, - JwtOptions jwtOptions, ICloudService cloudService, IJwtService jwtService) { this._userRepository = userRepository; this._roleRepository = roleRepository; this._userMapper = mapper; - this._jwtOptions = jwtOptions; this._languageRepository = languageRepository; this._technologyRepository = technologyRepository; this._cloudService = cloudService; @@ -50,10 +41,6 @@ namespace DevHive.Services.Services } #region Authentication - /// - /// Adds a new user to the database with the values from the given model. - /// Returns a JSON Web Token (that can be used for authorization) - /// public async Task LoginUser(LoginServiceModel loginModel) { if (!await this._userRepository.DoesUsernameExistAsync(loginModel.UserName)) @@ -64,14 +51,10 @@ namespace DevHive.Services.Services if (!await this._userRepository.VerifyPassword(user, loginModel.Password)) throw new ArgumentException("Incorrect password!"); - return new TokenModel(WriteJWTSecurityToken(user.Id, user.UserName, user.Roles)); + List roleNames = user.Roles.Select(x => x.Name).ToList(); + return new TokenModel(this._jwtService.GenerateJwtToken(user.Id, user.UserName, roleNames)); } - /// - /// Register a user in the database and return a - /// - /// Register model, containing registration information - /// A Token model, containing JWT Token for further verification public async Task RegisterUser(RegisterServiceModel registerModel) { if (await this._userRepository.DoesUsernameExistAsync(registerModel.UserName)) @@ -91,11 +74,8 @@ namespace DevHive.Services.Services throw new ArgumentException("Unable to add role to user"); User createdUser = await this._userRepository.GetByUsernameAsync(registerModel.UserName); - List roleNames = createdUser - .Roles - .Select(x => x.Name) - .ToList(); + List roleNames = createdUser.Roles.Select(x => x.Name).ToList(); return new TokenModel(this._jwtService.GenerateJwtToken(createdUser.Id, createdUser.UserName, roleNames)); } #endregion @@ -140,9 +120,6 @@ namespace DevHive.Services.Services return this._userMapper.Map(newUser); } - /// - /// Uploads the given picture and assigns it's link to the user in the database - /// public async Task UpdateProfilePicture(UpdateProfilePictureServiceModel updateProfilePictureServiceModel) { User user = await this._userRepository.GetByIdAsync(updateProfilePictureServiceModel.UserId); @@ -179,61 +156,7 @@ namespace DevHive.Services.Services #region Validations /// - /// Checks whether the given user, gotten by the "id" property, - /// is the same user as the one in the token (unless the user in the token has the admin role) - /// and the roles in the token are the same as those in the user, gotten by the id in the token - /// - /// - /// - /// - public async Task ValidJWT(Guid id, string rawTokenData) - { - return this._jwtService.ValidateToken(rawTokenData); - // There is authorization name in the beginning, i.e. "Bearer eyJh..." - // var jwt = new JwtSecurityTokenHandler().ReadJwtToken(rawTokenData.Remove(0, 7)); - - // Guid jwtUserID = new(UserService.GetClaimTypeValues("ID", jwt.Claims).First()); - // List jwtRoleNames = UserService.GetClaimTypeValues("role", jwt.Claims); - - // User user = await this._userRepository.GetByIdAsync(jwtUserID) - // ?? throw new ArgumentException("User does not exist!"); - - // /* Check if he is an admin */ - // if (user.Roles.Any(x => x.Name == Role.AdminRole)) - // return true; - - // if (!jwtRoleNames.Contains(Role.AdminRole) && user.Id != id) - // return false; - - // // Check if jwt contains all user roles (if it doesn't, jwt is either old or tampered with) - // foreach (var role in user.Roles) - // if (!jwtRoleNames.Contains(role.Name)) - // return false; - - // // Check if jwt contains only roles of user - // if (jwtRoleNames.Count != user.Roles.Count) - // return false; - - // return true; - } - - /// - /// Returns all values from a given claim type - /// - private static List GetClaimTypeValues(string type, IEnumerable claims) - { - List toReturn = new(); - - foreach (var claim in claims) - if (claim.Type == type) - toReturn.Add(claim.Value); - - return toReturn; - } - - /// - /// Checks whether the user in the model exists - /// and whether the username in the model is already taken. + /// Checks whether the user in the model exists and whether the username in the model is already taken. /// If the check fails (is false), it throws an exception, otherwise nothing happens /// private async Task ValidateUserOnUpdate(UpdateUserServiceModel updateUserServiceModel) @@ -255,38 +178,6 @@ namespace DevHive.Services.Services if (!await this._userRepository.ValidateFriendsCollectionAsync(usernames)) throw new ArgumentException("One or more friends do not exist!"); } - - /// - /// Return a new JSON Web Token, containing the user id, username and roles. - /// Tokens have an expiration time of 7 days. - /// - private string WriteJWTSecurityToken(Guid userId, string username, HashSet roles) - { - byte[] signingKey = Encoding.ASCII.GetBytes(_jwtOptions.Secret); - HashSet claims = new() - { - new Claim("ID", $"{userId}"), - new Claim("Username", username) - }; - - foreach (var role in roles) - { - claims.Add(new Claim(ClaimTypes.Role, role.Name)); - } - - SecurityTokenDescriptor tokenDescriptor = new() - { - Subject = new ClaimsIdentity(claims), - Expires = DateTime.Today.AddDays(7), - SigningCredentials = new SigningCredentials( - new SymmetricSecurityKey(signingKey), - SecurityAlgorithms.HmacSha512Signature) - }; - - JwtSecurityTokenHandler tokenHandler = new(); - SecurityToken token = tokenHandler.CreateToken(tokenDescriptor); - return tokenHandler.WriteToken(token); - } #endregion #region Misc diff --git a/src/Web/DevHive.Web/Controllers/CommentController.cs b/src/Web/DevHive.Web/Controllers/CommentController.cs index c38e300..b4fae5c 100644 --- a/src/Web/DevHive.Web/Controllers/CommentController.cs +++ b/src/Web/DevHive.Web/Controllers/CommentController.cs @@ -6,6 +6,7 @@ using DevHive.Web.Models.Comment; using DevHive.Services.Models.Comment; using Microsoft.AspNetCore.Authorization; using DevHive.Services.Interfaces; +using DevHive.Common.Jwt.Interfaces; namespace DevHive.Web.Controllers { @@ -16,16 +17,21 @@ namespace DevHive.Web.Controllers { private readonly ICommentService _commentService; private readonly IMapper _commentMapper; + private readonly IJwtService _jwtService; - public CommentController(ICommentService commentService, IMapper commentMapper) + public CommentController(ICommentService commentService, IMapper commentMapper, IJwtService jwtService) { this._commentService = commentService; this._commentMapper = commentMapper; + this._jwtService = jwtService; } [HttpPost] public async Task AddComment(Guid userId, [FromBody] CreateCommentWebModel createCommentWebModel, [FromHeader] string authorization) { + if (!this._jwtService.ValidateToken(userId, authorization)) + return new UnauthorizedResult(); + if (!await this._commentService.ValidateJwtForCreating(userId, authorization)) return new UnauthorizedResult(); @@ -53,7 +59,7 @@ namespace DevHive.Web.Controllers [HttpPut] public async Task UpdateComment(Guid userId, [FromBody] UpdateCommentWebModel updateCommentWebModel, [FromHeader] string authorization) { - if (!await this._commentService.ValidateJwtForComment(updateCommentWebModel.CommentId, authorization)) + if (!this._jwtService.ValidateToken(userId, authorization)) return new UnauthorizedResult(); UpdateCommentServiceModel updateCommentServiceModel = diff --git a/src/Web/DevHive.Web/Controllers/PostController.cs b/src/Web/DevHive.Web/Controllers/PostController.cs index d3fdbf6..309070c 100644 --- a/src/Web/DevHive.Web/Controllers/PostController.cs +++ b/src/Web/DevHive.Web/Controllers/PostController.cs @@ -6,6 +6,7 @@ using DevHive.Web.Models.Post; using DevHive.Services.Models.Post; using Microsoft.AspNetCore.Authorization; using DevHive.Services.Interfaces; +using DevHive.Common.Jwt.Interfaces; namespace DevHive.Web.Controllers { @@ -16,18 +17,20 @@ namespace DevHive.Web.Controllers { private readonly IPostService _postService; private readonly IMapper _postMapper; + private readonly IJwtService _jwtService; - public PostController(IPostService postService, IMapper postMapper) + public PostController(IPostService postService, IMapper postMapper, IJwtService jwtService) { this._postService = postService; this._postMapper = postMapper; + this._jwtService = jwtService; } #region Create [HttpPost] public async Task Create(Guid userId, [FromForm] CreatePostWebModel createPostWebModel, [FromHeader] string authorization) { - if (!await this._postService.ValidateJwtForCreating(userId, authorization)) + if (!this._jwtService.ValidateToken(userId, authorization)) return new UnauthorizedResult(); CreatePostServiceModel createPostServiceModel = @@ -58,6 +61,9 @@ namespace DevHive.Web.Controllers [HttpPut] public async Task Update(Guid userId, [FromForm] UpdatePostWebModel updatePostWebModel, [FromHeader] string authorization) { + if (!this._jwtService.ValidateToken(userId, authorization)) + return new UnauthorizedResult(); + if (!await this._postService.ValidateJwtForPost(updatePostWebModel.PostId, authorization)) return new UnauthorizedResult(); diff --git a/src/Web/DevHive.Web/Controllers/UserController.cs b/src/Web/DevHive.Web/Controllers/UserController.cs index a1e87f4..b01ecc1 100644 --- a/src/Web/DevHive.Web/Controllers/UserController.cs +++ b/src/Web/DevHive.Web/Controllers/UserController.cs @@ -7,6 +7,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using DevHive.Common.Models.Identity; using DevHive.Services.Interfaces; +using DevHive.Common.Jwt.Interfaces; +using DevHive.Web.Models.Attributes; namespace DevHive.Web.Controllers { @@ -16,11 +18,13 @@ namespace DevHive.Web.Controllers { private readonly IUserService _userService; private readonly IMapper _userMapper; + private readonly IJwtService _jwtService; - public UserController(IUserService userService, IMapper mapper) + public UserController(IUserService userService, IMapper mapper, IJwtService jwtService) { this._userService = userService; this._userMapper = mapper; + this._jwtService = jwtService; } #region Authentication @@ -56,7 +60,7 @@ namespace DevHive.Web.Controllers [Authorize(Roles = "User,Admin")] public async Task GetById(Guid id, [FromHeader] string authorization) { - if (!await this._userService.ValidJWT(id, authorization)) + if (!this._jwtService.ValidateToken(id, authorization)) return new UnauthorizedResult(); UserServiceModel userServiceModel = await this._userService.GetUserById(id); @@ -82,7 +86,7 @@ namespace DevHive.Web.Controllers [Authorize(Roles = "User,Admin")] public async Task Update(Guid id, [FromBody] UpdateUserWebModel updateUserWebModel, [FromHeader] string authorization) { - if (!await this._userService.ValidJWT(id, authorization)) + if (!this._jwtService.ValidateToken(id, authorization)) return new UnauthorizedResult(); UpdateUserServiceModel updateUserServiceModel = this._userMapper.Map(updateUserWebModel); @@ -100,7 +104,7 @@ namespace DevHive.Web.Controllers [Authorize(Roles = "User,Admin")] public async Task Delete(Guid id, [FromHeader] string authorization) { - if (!await this._userService.ValidJWT(id, authorization)) + if (!this._jwtService.ValidateToken(id, authorization)) return new UnauthorizedResult(); bool result = await this._userService.DeleteUser(id); -- cgit v1.2.3 From 441f04790659a439c0054b7b06130d14cc2eb90b Mon Sep 17 00:00:00 2001 From: transtrike Date: Sat, 13 Mar 2021 10:01:23 +0200 Subject: Technology xml comments added; Needs finish --- .../Controllers/TechnologyController.cs | 5 +++ src/Web/DevHive.Web/Controllers/UserController.cs | 52 ++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) (limited to 'src/Web/DevHive.Web/Controllers/UserController.cs') diff --git a/src/Web/DevHive.Web/Controllers/TechnologyController.cs b/src/Web/DevHive.Web/Controllers/TechnologyController.cs index e507899..ba3f04a 100644 --- a/src/Web/DevHive.Web/Controllers/TechnologyController.cs +++ b/src/Web/DevHive.Web/Controllers/TechnologyController.cs @@ -23,6 +23,11 @@ namespace DevHive.Web.Controllers this._technologyMapper = technologyMapper; } + /// + /// Create a new technology, so users can have a choice. Admin only! + /// + /// Data for the new technology + /// [HttpPost] [Authorize(Roles = "Admin")] public async Task Create([FromBody] CreateTechnologyWebModel createTechnologyWebModel) diff --git a/src/Web/DevHive.Web/Controllers/UserController.cs b/src/Web/DevHive.Web/Controllers/UserController.cs index b01ecc1..86076e5 100644 --- a/src/Web/DevHive.Web/Controllers/UserController.cs +++ b/src/Web/DevHive.Web/Controllers/UserController.cs @@ -8,12 +8,16 @@ using Microsoft.AspNetCore.Mvc; using DevHive.Common.Models.Identity; using DevHive.Services.Interfaces; using DevHive.Common.Jwt.Interfaces; -using DevHive.Web.Models.Attributes; +using NSwag.Annotations; namespace DevHive.Web.Controllers { + /// + /// All endpoints for integration with the User + /// [ApiController] [Route("/api/[controller]")] + [OpenApiController("User Controller")] public class UserController : ControllerBase { private readonly IUserService _userService; @@ -28,9 +32,15 @@ namespace DevHive.Web.Controllers } #region Authentication + /// + /// Login endpoint for the DevHive Social Platform + /// + /// Login model with username and password + /// A JWT Token for further validation [HttpPost] - [Route("Login")] [AllowAnonymous] + [Route("Login")] + [OpenApiTags("Authorization")] public async Task Login([FromBody] LoginWebModel loginModel) { LoginServiceModel loginServiceModel = this._userMapper.Map(loginModel); @@ -41,9 +51,15 @@ namespace DevHive.Web.Controllers return new OkObjectResult(tokenWebModel); } + /// + /// Register a new User in the DevHive Social Platform + /// + /// Register model with the new data to provide + /// A JWT Token for further validation [HttpPost] - [Route("Register")] [AllowAnonymous] + [Route("Register")] + [OpenApiTag("Authorization")] public async Task Register([FromBody] RegisterWebModel registerModel) { RegisterServiceModel registerServiceModel = this._userMapper.Map(registerModel); @@ -56,6 +72,12 @@ namespace DevHive.Web.Controllers #endregion #region Read + /// + /// Get a User's information using the Guid + /// + /// User's Guid + /// The JWT Token, contained in the header and used for validation + /// A full User's read model [HttpGet] [Authorize(Roles = "User,Admin")] public async Task GetById(Guid id, [FromHeader] string authorization) @@ -69,6 +91,11 @@ namespace DevHive.Web.Controllers return new OkObjectResult(userWebModel); } + /// + /// Get a User's profile using his username. Does NOT require authorization + /// + /// User's username + /// A trimmed version of the full User's read model [HttpGet] [Route("GetUser")] [AllowAnonymous] @@ -82,6 +109,13 @@ namespace DevHive.Web.Controllers #endregion #region Update + /// + /// Full update on User's data. A PUSTINQK can only edit his account + /// + /// The User's Guid + /// A full User update model + /// The JWT Token, contained in the header and used for validation + /// A full User's read model [HttpPut] [Authorize(Roles = "User,Admin")] public async Task Update(Guid id, [FromBody] UpdateUserWebModel updateUserWebModel, [FromHeader] string authorization) @@ -100,6 +134,12 @@ namespace DevHive.Web.Controllers #endregion #region Delete + /// + /// Delete a User with his Id. A PUSTINQK can only delete his account. An Admin can delete all accounts + /// + /// The User's Guid + /// The JWT Token, contained in the header and used for validation + /// Ok, BadRequest or Unauthorized [HttpDelete] [Authorize(Roles = "User,Admin")] public async Task Delete(Guid id, [FromHeader] string authorization) @@ -115,7 +155,13 @@ namespace DevHive.Web.Controllers } #endregion + /// + /// We don't talk about that, NIGGA! + /// + /// + /// [HttpPost] + [OpenApiIgnore] [Authorize(Roles = "User,Admin")] [Route("SuperSecretPromotionToAdmin")] public async Task SuperSecretPromotionToAdmin(Guid userId) -- cgit v1.2.3 From 93ded2b68a31fc9da643ac65955219e4f306ab82 Mon Sep 17 00:00:00 2001 From: transtrike Date: Sat, 13 Mar 2021 11:44:01 +0200 Subject: XML Docs on all controllers --- .../DevHive.Web/Controllers/CommentController.cs | 38 +++++++++++++++++++--- src/Web/DevHive.Web/Controllers/FeedController.cs | 15 +++++++++ .../DevHive.Web/Controllers/LanguageController.cs | 32 ++++++++++++++++-- src/Web/DevHive.Web/Controllers/PostController.cs | 34 +++++++++++++++++-- .../Controllers/ProfilePictureController.cs | 18 +++++++++- src/Web/DevHive.Web/Controllers/RoleController.cs | 24 ++++++++++++++ .../Controllers/TechnologyController.cs | 25 +++++++++++++- src/Web/DevHive.Web/Controllers/UserController.cs | 6 ++-- src/Web/DevHive.Web/DevHive.Web.csproj | 5 ++- 9 files changed, 181 insertions(+), 16 deletions(-) (limited to 'src/Web/DevHive.Web/Controllers/UserController.cs') diff --git a/src/Web/DevHive.Web/Controllers/CommentController.cs b/src/Web/DevHive.Web/Controllers/CommentController.cs index 1722801..8fa3577 100644 --- a/src/Web/DevHive.Web/Controllers/CommentController.cs +++ b/src/Web/DevHive.Web/Controllers/CommentController.cs @@ -10,6 +10,9 @@ using DevHive.Common.Jwt.Interfaces; namespace DevHive.Web.Controllers { + /// + /// All endpoints for interacting with the comments layer + /// [ApiController] [Route("/api/[controller]")] [Authorize(Roles = "User,Admin")] @@ -26,6 +29,13 @@ namespace DevHive.Web.Controllers this._jwtService = jwtService; } + /// + /// Create a comment and attach it to a post + /// + /// The useer's Id + /// The new comment's parametars + /// JWT Bearer token + /// The comment's Id [HttpPost] public async Task AddComment(Guid userId, [FromBody] CreateCommentWebModel createCommentWebModel, [FromHeader] string authorization) { @@ -46,16 +56,28 @@ namespace DevHive.Web.Controllers new OkObjectResult(new { Id = id }); } + /// + /// Query comment's data by it's Id + /// + /// The comment's Id + /// Full data model of the comment [HttpGet] [AllowAnonymous] - public async Task GetCommentById(Guid id) + public async Task GetCommentById(Guid commentId) { - ReadCommentServiceModel readCommentServiceModel = await this._commentService.GetCommentById(id); + ReadCommentServiceModel readCommentServiceModel = await this._commentService.GetCommentById(commentId); ReadCommentWebModel readCommentWebModel = this._commentMapper.Map(readCommentServiceModel); return new OkObjectResult(readCommentWebModel); } + /// + /// Update comment's parametars. Comment creator only! + /// + /// The comment creator's Id + /// New comment's parametars + /// JWT Bearer token + /// Ok result [HttpPut] public async Task UpdateComment(Guid userId, [FromBody] UpdateCommentWebModel updateCommentWebModel, [FromHeader] string authorization) { @@ -73,13 +95,19 @@ namespace DevHive.Web.Controllers new OkObjectResult(new { Id = id }); } + /// + /// Delete a comment. Comment creator only! + /// + /// Comment's Id + /// JWT Bearer token + /// Ok result [HttpDelete] - public async Task DeleteComment(Guid id, [FromHeader] string authorization) + public async Task DeleteComment(Guid commentId, [FromHeader] string authorization) { - if (!await this._commentService.ValidateJwtForComment(id, authorization)) + if (!await this._commentService.ValidateJwtForComment(commentId, authorization)) return new UnauthorizedResult(); - return await this._commentService.DeleteComment(id) ? + return await this._commentService.DeleteComment(commentId) ? new OkResult() : new BadRequestObjectResult("Could not delete Comment"); } diff --git a/src/Web/DevHive.Web/Controllers/FeedController.cs b/src/Web/DevHive.Web/Controllers/FeedController.cs index abca3e4..37532a9 100644 --- a/src/Web/DevHive.Web/Controllers/FeedController.cs +++ b/src/Web/DevHive.Web/Controllers/FeedController.cs @@ -10,6 +10,9 @@ using Microsoft.AspNetCore.Mvc; namespace DevHive.Web.Controllers { + /// + /// All endpoints for interacting with the feed layer + /// [ApiController] [Route("/api/[controller]")] [Authorize(Roles = "User,Admin")] @@ -24,6 +27,12 @@ namespace DevHive.Web.Controllers this._mapper = mapper; } + /// + /// Query posts for user's feed + /// + /// The user's Id, whose feed is begin queried + /// Page parametars + /// A page of the feed [HttpPost] [Route("GetPosts")] public async Task GetPosts(Guid userId, [FromBody] GetPageWebModel getPageWebModel) @@ -37,6 +46,12 @@ namespace DevHive.Web.Controllers return new OkObjectResult(readPageWebModel); } + /// + /// Query a user profile's posts + /// + /// The user's username, whose posts are being queried + /// Page parametars + /// A page of the user's posts [HttpPost] [Route("GetUserPosts")] [AllowAnonymous] diff --git a/src/Web/DevHive.Web/Controllers/LanguageController.cs b/src/Web/DevHive.Web/Controllers/LanguageController.cs index 5b0d5de..665fb66 100644 --- a/src/Web/DevHive.Web/Controllers/LanguageController.cs +++ b/src/Web/DevHive.Web/Controllers/LanguageController.cs @@ -10,6 +10,9 @@ using Microsoft.AspNetCore.Mvc; namespace DevHive.Web.Controllers { + /// + /// All endpoints for interacting with the language layer + /// [ApiController] [Route("/api/[controller]")] public class LanguageController @@ -23,6 +26,11 @@ namespace DevHive.Web.Controllers this._languageMapper = mapper; } + /// + /// Create a new language, so users can have a choice. Admin only! + /// + /// The new language's parametars + /// The new language's Id [HttpPost] [Authorize(Roles = "Admin")] public async Task Create([FromBody] CreateLanguageWebModel createLanguageWebModel) @@ -36,6 +44,11 @@ namespace DevHive.Web.Controllers new OkObjectResult(new { Id = id }); } + /// + /// Query full language data by Id + /// + /// The language's Id + /// Full language data [HttpGet] [AllowAnonymous] public async Task GetById(Guid id) @@ -46,6 +59,10 @@ namespace DevHive.Web.Controllers return new OkObjectResult(languageWebModel); } + /// + /// Query all languages in the database + /// + /// All languages in the database [HttpGet] [Route("GetLanguages")] [Authorize(Roles = "User,Admin")] @@ -57,6 +74,12 @@ namespace DevHive.Web.Controllers return new OkObjectResult(languageWebModels); } + /// + /// Alter language's properties. Admin only! + /// + /// The language's Id + /// The langauge's new parametars + /// Ok result [HttpPut] [Authorize(Roles = "Admin")] public async Task Update(Guid id, [FromBody] UpdateLanguageWebModel updateModel) @@ -72,11 +95,16 @@ namespace DevHive.Web.Controllers return new OkResult(); } + /// + /// Delete a language. Admin only! + /// + /// The language's Id + /// Ok result [HttpDelete] [Authorize(Roles = "Admin")] - public async Task Delete(Guid id) + public async Task Delete(Guid langaugeId) { - bool result = await this._languageService.DeleteLanguage(id); + bool result = await this._languageService.DeleteLanguage(langaugeId); if (!result) return new BadRequestObjectResult("Could not delete Language"); diff --git a/src/Web/DevHive.Web/Controllers/PostController.cs b/src/Web/DevHive.Web/Controllers/PostController.cs index 309070c..44b291d 100644 --- a/src/Web/DevHive.Web/Controllers/PostController.cs +++ b/src/Web/DevHive.Web/Controllers/PostController.cs @@ -10,6 +10,9 @@ using DevHive.Common.Jwt.Interfaces; namespace DevHive.Web.Controllers { + /// + /// All endpoints for interacting with the post layer + /// [ApiController] [Route("/api/[controller]")] [Authorize(Roles = "User,Admin")] @@ -27,6 +30,13 @@ namespace DevHive.Web.Controllers } #region Create + /// + /// Create a new post + /// + /// The user's Id + /// The new post's data + /// JWT Bearer token + /// New post's Id [HttpPost] public async Task Create(Guid userId, [FromForm] CreatePostWebModel createPostWebModel, [FromHeader] string authorization) { @@ -46,6 +56,11 @@ namespace DevHive.Web.Controllers #endregion #region Read + /// + /// Query full post's data by it's Id + /// + /// The post's Id + /// Full data model of the post [HttpGet] [AllowAnonymous] public async Task GetById(Guid id) @@ -58,6 +73,13 @@ namespace DevHive.Web.Controllers #endregion #region Update + /// + /// Update post's data. Creator only! + /// + /// The post creator's Id + /// The new params of the post + /// JWT Bearer token + /// The post's Id [HttpPut] public async Task Update(Guid userId, [FromForm] UpdatePostWebModel updatePostWebModel, [FromHeader] string authorization) { @@ -80,13 +102,19 @@ namespace DevHive.Web.Controllers #endregion #region Delete + /// + /// Delete a post. Creator only! + /// + /// Post's Id + /// JWT Bearer token + /// Ok result [HttpDelete] - public async Task Delete(Guid id, [FromHeader] string authorization) + public async Task Delete(Guid postId, [FromHeader] string authorization) { - if (!await this._postService.ValidateJwtForPost(id, authorization)) + if (!await this._postService.ValidateJwtForPost(postId, authorization)) return new UnauthorizedResult(); - return await this._postService.DeletePost(id) ? + return await this._postService.DeletePost(postId) ? new OkResult() : new BadRequestObjectResult("Could not delete Post"); } diff --git a/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs b/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs index d3971ff..2eec99e 100644 --- a/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs +++ b/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs @@ -1,16 +1,32 @@ using System; using System.Threading.Tasks; -using DevHive.Services.Models.User; using DevHive.Web.Models.User; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace DevHive.Web.Controllers { + /// + /// All endpoints for interacting with the profile picture layer + /// [ApiController] [Route("api/[controller]")] public class ProfilePictureController { + // private readonly ProfilePictureService _profilePictureService; + + // public ProfilePictureController(ProfilePictureService profilePictureService) + // { + // this._profilePictureService = profilePictureService; + // } + + /// + /// Alter the profile picture of a user + /// + /// The user's Id + /// The new profile picture + /// JWT Bearer Token + /// ??? [HttpPut] [Route("ProfilePicture")] [Authorize(Roles = "User,Admin")] diff --git a/src/Web/DevHive.Web/Controllers/RoleController.cs b/src/Web/DevHive.Web/Controllers/RoleController.cs index 1465795..ebb305e 100644 --- a/src/Web/DevHive.Web/Controllers/RoleController.cs +++ b/src/Web/DevHive.Web/Controllers/RoleController.cs @@ -9,6 +9,9 @@ using Microsoft.AspNetCore.Authorization; namespace DevHive.Web.Controllers { + /// + /// All endpoints for interacting with the roles layer + /// [ApiController] [Route("/api/[controller]")] public class RoleController @@ -22,6 +25,11 @@ namespace DevHive.Web.Controllers this._roleMapper = mapper; } + /// + /// Create a new role for the roles hierarchy. Admin only! + /// + /// The new role's parametars + /// The new role's Id [HttpPost] [Authorize(Roles = "Admin")] public async Task Create([FromBody] CreateRoleWebModel createRoleWebModel) @@ -36,6 +44,11 @@ namespace DevHive.Web.Controllers new OkObjectResult(new { Id = id }); } + /// + /// Get a role's full data, querying it by it's Id + /// + /// The role's Id + /// Full info of the role [HttpGet] [Authorize(Roles = "User,Admin")] public async Task GetById(Guid id) @@ -46,6 +59,12 @@ namespace DevHive.Web.Controllers return new OkObjectResult(roleWebModel); } + /// + /// Update a role's parametars. Admin only! + /// + /// The role's Id + /// The new parametrats for that role + /// Ok result [HttpPut] [Authorize(Roles = "Admin")] public async Task Update(Guid id, [FromBody] UpdateRoleWebModel updateRoleWebModel) @@ -62,6 +81,11 @@ namespace DevHive.Web.Controllers return new OkResult(); } + /// + /// Delete a role. Admin only! + /// + /// The role's Id + /// Ok result [HttpDelete] [Authorize(Roles = "Admin")] public async Task Delete(Guid id) diff --git a/src/Web/DevHive.Web/Controllers/TechnologyController.cs b/src/Web/DevHive.Web/Controllers/TechnologyController.cs index ba3f04a..ecf2bd7 100644 --- a/src/Web/DevHive.Web/Controllers/TechnologyController.cs +++ b/src/Web/DevHive.Web/Controllers/TechnologyController.cs @@ -10,6 +10,9 @@ using Microsoft.AspNetCore.Mvc; namespace DevHive.Web.Controllers { + /// + /// All endpoints for interacting with the technology layer + /// [ApiController] [Route("/api/[controller]")] public class TechnologyController @@ -27,7 +30,7 @@ namespace DevHive.Web.Controllers /// Create a new technology, so users can have a choice. Admin only! /// /// Data for the new technology - /// + /// The new technology's Id [HttpPost] [Authorize(Roles = "Admin")] public async Task Create([FromBody] CreateTechnologyWebModel createTechnologyWebModel) @@ -41,6 +44,11 @@ namespace DevHive.Web.Controllers new OkObjectResult(new { Id = id }); } + /// + /// Get technology's data by it's Id + /// + /// The technology's Id + /// The technology's full data [HttpGet] [AllowAnonymous] public async Task GetById(Guid id) @@ -51,6 +59,10 @@ namespace DevHive.Web.Controllers return new OkObjectResult(readTechnologyWebModel); } + /// + /// Get all technologies from our database + /// + /// All technologies [HttpGet] [Route("GetTechnologies")] [Authorize(Roles = "User,Admin")] @@ -62,6 +74,12 @@ namespace DevHive.Web.Controllers return new OkObjectResult(languageWebModels); } + /// + /// Alter a technology's parameters. Admin only! + /// + /// Technology's Id + /// The new parametars + /// Ok result [HttpPut] [Authorize(Roles = "Admin")] public async Task Update(Guid id, [FromBody] UpdateTechnologyWebModel updateModel) @@ -77,6 +95,11 @@ namespace DevHive.Web.Controllers return new OkResult(); } + /// + /// Delete a etchnology from the database. Admin only! + /// + /// The technology's Id + /// Ok result [HttpDelete] [Authorize(Roles = "Admin")] public async Task Delete(Guid id) diff --git a/src/Web/DevHive.Web/Controllers/UserController.cs b/src/Web/DevHive.Web/Controllers/UserController.cs index 86076e5..4d01447 100644 --- a/src/Web/DevHive.Web/Controllers/UserController.cs +++ b/src/Web/DevHive.Web/Controllers/UserController.cs @@ -75,7 +75,7 @@ namespace DevHive.Web.Controllers /// /// Get a User's information using the Guid /// - /// User's Guid + /// User's Id /// The JWT Token, contained in the header and used for validation /// A full User's read model [HttpGet] @@ -112,7 +112,7 @@ namespace DevHive.Web.Controllers /// /// Full update on User's data. A PUSTINQK can only edit his account /// - /// The User's Guid + /// The User's Id /// A full User update model /// The JWT Token, contained in the header and used for validation /// A full User's read model @@ -137,7 +137,7 @@ namespace DevHive.Web.Controllers /// /// Delete a User with his Id. A PUSTINQK can only delete his account. An Admin can delete all accounts /// - /// The User's Guid + /// The User's Id /// The JWT Token, contained in the header and used for validation /// Ok, BadRequest or Unauthorized [HttpDelete] diff --git a/src/Web/DevHive.Web/DevHive.Web.csproj b/src/Web/DevHive.Web/DevHive.Web.csproj index 38f21e6..39322ae 100644 --- a/src/Web/DevHive.Web/DevHive.Web.csproj +++ b/src/Web/DevHive.Web/DevHive.Web.csproj @@ -25,6 +25,9 @@ + + + @@ -32,4 +35,4 @@ - + \ No newline at end of file -- cgit v1.2.3