aboutsummaryrefslogtreecommitdiff
path: root/src/DevHive.Web
diff options
context:
space:
mode:
authortranstrike <transtrike@gmail.com>2021-01-13 23:06:18 +0200
committertranstrike <transtrike@gmail.com>2021-01-13 23:06:18 +0200
commit61c51944844ed404cd4f174440d6e81b2a8591ba (patch)
tree52384addf959a81d63d91702399f47e07bf02ded /src/DevHive.Web
parent623bb66183be1349325ca9364f5bbf2e451f7578 (diff)
downloadDevHive-61c51944844ed404cd4f174440d6e81b2a8591ba.tar
DevHive-61c51944844ed404cd4f174440d6e81b2a8591ba.tar.gz
DevHive-61c51944844ed404cd4f174440d6e81b2a8591ba.zip
Fixed sln-wide code formatting
Diffstat (limited to 'src/DevHive.Web')
-rw-r--r--src/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs4
-rw-r--r--src/DevHive.Web/Configurations/Mapping/CommentMappings.cs4
-rw-r--r--src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs6
-rw-r--r--src/DevHive.Web/Configurations/Mapping/RoleMappings.cs6
-rw-r--r--src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs6
-rw-r--r--src/DevHive.Web/Configurations/Mapping/UserMappings.cs2
-rw-r--r--src/DevHive.Web/Controllers/ErrorController.cs2
-rw-r--r--src/DevHive.Web/Controllers/LanguageController.cs12
-rw-r--r--src/DevHive.Web/Controllers/PostController.cs12
-rw-r--r--src/DevHive.Web/Controllers/RoleController.cs8
-rw-r--r--src/DevHive.Web/Controllers/TechnologyController.cs12
-rw-r--r--src/DevHive.Web/Controllers/UserController.cs6
-rw-r--r--src/DevHive.Web/Models/Identity/User/BaseUserWebModel.cs4
-rw-r--r--src/DevHive.Web/Models/Identity/User/LoginWebModel.cs4
-rw-r--r--src/DevHive.Web/Models/Identity/User/RegisterWebModel.cs4
-rw-r--r--src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs2
-rw-r--r--src/DevHive.Web/Models/Identity/User/UserWebModel.cs2
-rw-r--r--src/DevHive.Web/Models/Identity/Validation/GoodPasswordModelValidation.cs2
-rw-r--r--src/DevHive.Web/Models/Language/UpdateLanguageWebModel.cs4
-rw-r--r--src/DevHive.Web/Startup.cs142
20 files changed, 122 insertions, 122 deletions
diff --git a/src/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs b/src/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs
index b42ae05..4831435 100644
--- a/src/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs
+++ b/src/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs
@@ -20,7 +20,7 @@ namespace DevHive.Web.Configurations.Extensions
services.AddIdentity<User, Role>()
.AddEntityFrameworkStores<DevHiveContext>();
-
+
services.Configure<IdentityOptions>(options =>
{
options.User.RequireUniqueEmail = true;
@@ -41,7 +41,7 @@ namespace DevHive.Web.Configurations.Extensions
services.AddAuthorization(options =>
{
- options.AddPolicy("User", options =>
+ options.AddPolicy("User", options =>
{
options.RequireAuthenticatedUser();
options.AuthenticationSchemes.Add(JwtBearerDefaults.AuthenticationScheme);
diff --git a/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs b/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs
index 394490e..5998e7a 100644
--- a/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/CommentMappings.cs
@@ -13,5 +13,5 @@ namespace DevHive.Web.Configurations.Mapping
CreateMap<CommentServiceModel, CommentWebModel>();
CreateMap<CommentWebModel, CommentServiceModel>();
}
- }
-} \ No newline at end of file
+ }
+}
diff --git a/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs b/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs
index bae8562..3c2a4d0 100644
--- a/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs
@@ -4,7 +4,7 @@ using DevHive.Services.Models.Language;
namespace DevHive.Web.Configurations.Mapping
{
- public class LanguageMappings : Profile
+ public class LanguageMappings : Profile
{
public LanguageMappings()
{
@@ -16,5 +16,5 @@ namespace DevHive.Web.Configurations.Mapping
CreateMap<CreateLanguageServiceModel, CreateLanguageWebModel>();
CreateMap<UpdateLanguageServiceModel, UpdateLanguageWebModel>();
}
- }
-} \ No newline at end of file
+ }
+}
diff --git a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
index 5d33c56..afa3a94 100644
--- a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
@@ -4,15 +4,15 @@ using DevHive.Common.Models.Identity;
namespace DevHive.Web.Configurations.Mapping
{
- public class RoleMappings : Profile
+ public class RoleMappings : Profile
{
public RoleMappings()
{
CreateMap<CreateRoleModel, RoleModel>();
CreateMap<UpdateRoleModel, RoleModel>();
-
+
CreateMap<RoleModel, RoleWebModel>();
CreateMap<RoleWebModel, RoleModel>();
}
- }
+ }
}
diff --git a/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs b/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs
index 849e47f..8523897 100644
--- a/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs
@@ -4,7 +4,7 @@ using DevHive.Services.Models.Technology;
namespace DevHive.Web.Configurations.Mapping
{
- public class TechnologyMappings : Profile
+ public class TechnologyMappings : Profile
{
public TechnologyMappings()
{
@@ -13,5 +13,5 @@ namespace DevHive.Web.Configurations.Mapping
CreateMap<TechnologyServiceModel, TechnologyWebModel>();
CreateMap<TechnologyWebModel, TechnologyServiceModel>();
}
- }
-} \ No newline at end of file
+ }
+}
diff --git a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
index 4420368..59003ea 100644
--- a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
@@ -18,5 +18,5 @@ namespace DevHive.Web.Configurations.Mapping
CreateMap<TokenModel, TokenWebModel>();
}
- }
+ }
}
diff --git a/src/DevHive.Web/Controllers/ErrorController.cs b/src/DevHive.Web/Controllers/ErrorController.cs
index c3f1e55..b187501 100644
--- a/src/DevHive.Web/Controllers/ErrorController.cs
+++ b/src/DevHive.Web/Controllers/ErrorController.cs
@@ -19,7 +19,7 @@ namespace DevHive.Web.Controllers
IExceptionHandlerFeature exception =
HttpContext.Features.Get<IExceptionHandlerFeature>();
-
+
object result = ProcessException(requestId, exception);
return new BadRequestObjectResult(JsonConvert.SerializeObject(result));
}
diff --git a/src/DevHive.Web/Controllers/LanguageController.cs b/src/DevHive.Web/Controllers/LanguageController.cs
index 29c1e99..486e16e 100644
--- a/src/DevHive.Web/Controllers/LanguageController.cs
+++ b/src/DevHive.Web/Controllers/LanguageController.cs
@@ -29,7 +29,7 @@ namespace DevHive.Web.Controllers
bool result = await this._languageService.CreateLanguage(languageServiceModel);
- if(!result)
+ if (!result)
return new BadRequestObjectResult("Could not create Language");
return new OkResult();
@@ -52,21 +52,21 @@ namespace DevHive.Web.Controllers
bool result = await this._languageService.UpdateLanguage(updatelanguageServiceModel);
- if(!result)
+ if (!result)
return new BadRequestObjectResult("Could not update Language");
return new OkResult();
}
-
+
[HttpDelete]
public async Task<IActionResult> Delete(Guid id)
{
bool result = await this._languageService.DeleteLanguage(id);
-
- if(!result)
+
+ if (!result)
return new BadRequestObjectResult("Could not delete Language");
return new OkResult();
}
}
-} \ No newline at end of file
+}
diff --git a/src/DevHive.Web/Controllers/PostController.cs b/src/DevHive.Web/Controllers/PostController.cs
index 753897c..a906e47 100644
--- a/src/DevHive.Web/Controllers/PostController.cs
+++ b/src/DevHive.Web/Controllers/PostController.cs
@@ -30,9 +30,9 @@ namespace DevHive.Web.Controllers
[HttpPost]
public async Task<IActionResult> Create([FromBody] CreatePostWebModel createPostModel)
{
- CreatePostServiceModel postServiceModel =
- this._postMapper.Map<CreatePostServiceModel>(createPostModel);
-
+ CreatePostServiceModel postServiceModel =
+ this._postMapper.Map<CreatePostServiceModel>(createPostModel);
+
bool result = await this._postService.CreatePost(postServiceModel);
if (!result)
@@ -49,7 +49,7 @@ namespace DevHive.Web.Controllers
bool result = await this._postService.AddComment(createCommentServiceModel);
- if(!result)
+ if (!result)
return new BadRequestObjectResult("Could not create the Comment");
return new OkResult();
@@ -81,7 +81,7 @@ namespace DevHive.Web.Controllers
[HttpPut]
public async Task<IActionResult> Update(Guid id, [FromBody] UpdatePostWebModel updatePostModel)
{
- UpdatePostServiceModel postServiceModel =
+ UpdatePostServiceModel postServiceModel =
this._postMapper.Map<UpdatePostServiceModel>(updatePostModel);
postServiceModel.IssuerId = id;
@@ -129,7 +129,7 @@ namespace DevHive.Web.Controllers
{
if (!await this._postService.ValidateJwtForComment(id, authorization))
return new UnauthorizedResult();
-
+
bool result = await this._postService.DeleteComment(id);
if (!result)
diff --git a/src/DevHive.Web/Controllers/RoleController.cs b/src/DevHive.Web/Controllers/RoleController.cs
index d710f5a..0a8f7a1 100644
--- a/src/DevHive.Web/Controllers/RoleController.cs
+++ b/src/DevHive.Web/Controllers/RoleController.cs
@@ -26,9 +26,9 @@ namespace DevHive.Web.Controllers
[HttpPost]
public async Task<IActionResult> Create([FromBody] CreateRoleModel createRoleModel)
{
- RoleModel roleServiceModel =
- this._roleMapper.Map<RoleModel>(createRoleModel);
-
+ RoleModel roleServiceModel =
+ this._roleMapper.Map<RoleModel>(createRoleModel);
+
bool result = await this._roleService.CreateRole(roleServiceModel);
if (!result)
@@ -49,7 +49,7 @@ namespace DevHive.Web.Controllers
[HttpPut]
public async Task<IActionResult> Update(Guid id, [FromBody] UpdateRoleModel updateRoleModel)
{
- RoleModel roleServiceModel =
+ RoleModel roleServiceModel =
this._roleMapper.Map<RoleModel>(updateRoleModel);
roleServiceModel.Id = id;
diff --git a/src/DevHive.Web/Controllers/TechnologyController.cs b/src/DevHive.Web/Controllers/TechnologyController.cs
index e02ca3d..905a71d 100644
--- a/src/DevHive.Web/Controllers/TechnologyController.cs
+++ b/src/DevHive.Web/Controllers/TechnologyController.cs
@@ -29,7 +29,7 @@ namespace DevHive.Web.Controllers
bool result = await this._technologyService.Create(technologyServiceModel);
- if(!result)
+ if (!result)
return new BadRequestObjectResult("Could not create the Technology");
return new OkResult();
@@ -51,21 +51,21 @@ namespace DevHive.Web.Controllers
bool result = await this._technologyService.UpdateTechnology(updateTechnologyWebModel);
- if(!result)
+ if (!result)
return new BadRequestObjectResult("Could not update Technology");
return new OkResult();
}
-
+
[HttpDelete]
public async Task<IActionResult> Delete(Guid id)
{
bool result = await this._technologyService.DeleteTechnology(id);
-
- if(!result)
+
+ if (!result)
return new BadRequestObjectResult("Could not delete Technology");
return new OkResult();
}
}
-} \ No newline at end of file
+}
diff --git a/src/DevHive.Web/Controllers/UserController.cs b/src/DevHive.Web/Controllers/UserController.cs
index 0960915..26271b2 100644
--- a/src/DevHive.Web/Controllers/UserController.cs
+++ b/src/DevHive.Web/Controllers/UserController.cs
@@ -20,7 +20,7 @@ namespace DevHive.Web.Controllers
[ApiController]
[Route("/api/[controller]")]
[Authorize(Roles = "User")]
- public class UserController: ControllerBase
+ public class UserController : ControllerBase
{
private readonly UserService _userService;
private readonly IMapper _userMapper;
@@ -154,7 +154,7 @@ namespace DevHive.Web.Controllers
await this._userService.RemoveFriend(userId, friendId);
return new OkResult();
}
-
+
[HttpDelete]
[Route("RemoveLanguageFromUser")]
public async Task<IActionResult> RemoveLanguageFromUser(Guid userId, [FromBody] LanguageWebModel languageWebModel)
@@ -176,7 +176,7 @@ namespace DevHive.Web.Controllers
new OkResult() :
new BadRequestResult();
}
-
+
#endregion
}
}
diff --git a/src/DevHive.Web/Models/Identity/User/BaseUserWebModel.cs b/src/DevHive.Web/Models/Identity/User/BaseUserWebModel.cs
index ff9fac5..2d99786 100644
--- a/src/DevHive.Web/Models/Identity/User/BaseUserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/BaseUserWebModel.cs
@@ -1,9 +1,9 @@
using System.ComponentModel.DataAnnotations;
using DevHive.Web.Models.Identity.Validation;
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.Identity.User
{
- public class BaseUserWebModel
+ public class BaseUserWebModel
{
[Required]
[MinLength(3)]
diff --git a/src/DevHive.Web/Models/Identity/User/LoginWebModel.cs b/src/DevHive.Web/Models/Identity/User/LoginWebModel.cs
index 3bd7428..87c7416 100644
--- a/src/DevHive.Web/Models/Identity/User/LoginWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/LoginWebModel.cs
@@ -1,6 +1,6 @@
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.Identity.User
{
- public class LoginWebModel
+ public class LoginWebModel
{
public string UserName { get; set; }
public string Password { get; set; }
diff --git a/src/DevHive.Web/Models/Identity/User/RegisterWebModel.cs b/src/DevHive.Web/Models/Identity/User/RegisterWebModel.cs
index 22b178b..273c2d3 100644
--- a/src/DevHive.Web/Models/Identity/User/RegisterWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/RegisterWebModel.cs
@@ -1,9 +1,9 @@
using System.ComponentModel.DataAnnotations;
using DevHive.Web.Models.Identity.Validation;
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.Identity.User
{
- public class RegisterWebModel : BaseUserWebModel
+ public class RegisterWebModel : BaseUserWebModel
{
[Required]
[GoodPassword]
diff --git a/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
index fbe02a5..91fbc64 100644
--- a/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using DevHive.Web.Models.Identity.Validation;
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.Identity.User
{
public class UpdateUserWebModel : BaseUserWebModel
{
diff --git a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
index 260d34c..8f7995c 100644
--- a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
@@ -4,7 +4,7 @@ using DevHive.Web.Models.Identity.Role;
using DevHive.Web.Models.Language;
using DevHive.Web.Models.Technology;
-namespace DevHive.Web.Models.Identity.User
+namespace DevHive.Web.Models.Identity.User
{
public class UserWebModel : BaseUserWebModel
{
diff --git a/src/DevHive.Web/Models/Identity/Validation/GoodPasswordModelValidation.cs b/src/DevHive.Web/Models/Identity/Validation/GoodPasswordModelValidation.cs
index f69121a..f920c35 100644
--- a/src/DevHive.Web/Models/Identity/Validation/GoodPasswordModelValidation.cs
+++ b/src/DevHive.Web/Models/Identity/Validation/GoodPasswordModelValidation.cs
@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
namespace DevHive.Web.Models.Identity.Validation
{
- public class GoodPassword : ValidationAttribute
+ public class GoodPassword : ValidationAttribute
{
public override bool IsValid(object value)
{
diff --git a/src/DevHive.Web/Models/Language/UpdateLanguageWebModel.cs b/src/DevHive.Web/Models/Language/UpdateLanguageWebModel.cs
index 2da8217..deca0fc 100644
--- a/src/DevHive.Web/Models/Language/UpdateLanguageWebModel.cs
+++ b/src/DevHive.Web/Models/Language/UpdateLanguageWebModel.cs
@@ -2,5 +2,5 @@ using System;
namespace DevHive.Web.Models.Language
{
- public class UpdateLanguageWebModel : CreateLanguageWebModel {}
-} \ No newline at end of file
+ public class UpdateLanguageWebModel : CreateLanguageWebModel { }
+}
diff --git a/src/DevHive.Web/Startup.cs b/src/DevHive.Web/Startup.cs
index 96ab318..94aabe8 100644
--- a/src/DevHive.Web/Startup.cs
+++ b/src/DevHive.Web/Startup.cs
@@ -1,71 +1,71 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using DevHive.Web.Configurations.Extensions;
-using Newtonsoft.Json;
-
-namespace DevHive.Web
-{
- public class Startup
- {
- public Startup(IConfiguration configuration)
- {
- Configuration = configuration;
- }
-
- public IConfiguration Configuration { get; }
-
- // This method gets called by the runtime. Use this method to add services to the container.
- public void ConfigureServices(IServiceCollection services)
- {
- services.AddCors();
-
- services.AddControllers()
- .AddNewtonsoftJson(x =>
- {
- x.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
- });
-
- services.DatabaseConfiguration(Configuration);
- services.SwaggerConfiguration();
- services.JWTConfiguration(Configuration);
- services.AutoMapperConfiguration();
- services.DependencyInjectionConfiguration();
- }
-
- // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
- public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
- {
- app.UseCors(x => x
- .AllowAnyMethod()
- .AllowAnyHeader()
- .SetIsOriginAllowed(origin => true) // allow any origin
- .AllowCredentials()); // allow credentials
-
- if (env.IsDevelopment())
- {
- //app.UseDeveloperExceptionPage();
- app.UseExceptionHandler("/api/Error");
- app.UseSwaggerConfiguration();
- }
- else
- {
- app.UseExceptionHandler("/api/Error");
- app.UseHsts();
- }
-
- app.UseDatabaseConfiguration();
- app.UseAutoMapperConfiguration();
-
- app.UseEndpoints(endpoints =>
- {
- endpoints.MapControllerRoute(
- name: "default",
- pattern: "api/{controller}/{action}"
- );
- });
- }
- }
-}
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using DevHive.Web.Configurations.Extensions;
+using Newtonsoft.Json;
+
+namespace DevHive.Web
+{
+ public class Startup
+ {
+ public Startup(IConfiguration configuration)
+ {
+ Configuration = configuration;
+ }
+
+ public IConfiguration Configuration { get; }
+
+ // This method gets called by the runtime. Use this method to add services to the container.
+ public void ConfigureServices(IServiceCollection services)
+ {
+ services.AddCors();
+
+ services.AddControllers()
+ .AddNewtonsoftJson(x =>
+ {
+ x.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
+ });
+
+ services.DatabaseConfiguration(Configuration);
+ services.SwaggerConfiguration();
+ services.JWTConfiguration(Configuration);
+ services.AutoMapperConfiguration();
+ services.DependencyInjectionConfiguration();
+ }
+
+ // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+ {
+ app.UseCors(x => x
+ .AllowAnyMethod()
+ .AllowAnyHeader()
+ .SetIsOriginAllowed(origin => true) // allow any origin
+ .AllowCredentials()); // allow credentials
+
+ if (env.IsDevelopment())
+ {
+ //app.UseDeveloperExceptionPage();
+ app.UseExceptionHandler("/api/Error");
+ app.UseSwaggerConfiguration();
+ }
+ else
+ {
+ app.UseExceptionHandler("/api/Error");
+ app.UseHsts();
+ }
+
+ app.UseDatabaseConfiguration();
+ app.UseAutoMapperConfiguration();
+
+ app.UseEndpoints(endpoints =>
+ {
+ endpoints.MapControllerRoute(
+ name: "default",
+ pattern: "api/{controller}/{action}"
+ );
+ });
+ }
+ }
+}