diff options
| author | transtrike <transtrike@gmail.com> | 2020-12-15 19:39:00 +0200 |
|---|---|---|
| committer | transtrike <transtrike@gmail.com> | 2020-12-15 19:39:00 +0200 |
| commit | 85b41def10318ff04e72991008ba7d0e623a7674 (patch) | |
| tree | b23c4f15989c99110e7fd9dd9b006ac91fbfc1cf /src/DevHive.Web | |
| parent | 54d081a513117c732ab4d62312b440d37dfe0d67 (diff) | |
| parent | 9b547cb43ec6a3d28d4f35cef15ac90e465aa695 (diff) | |
| download | DevHive-85b41def10318ff04e72991008ba7d0e623a7674.tar DevHive-85b41def10318ff04e72991008ba7d0e623a7674.tar.gz DevHive-85b41def10318ff04e72991008ba7d0e623a7674.zip | |
Merge branch 'dev' of github.com:Team-Kaleidoscope/DevHive into dev
Diffstat (limited to 'src/DevHive.Web')
| -rw-r--r-- | src/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs | 2 | ||||
| -rw-r--r-- | src/DevHive.Web/Controllers/RoleController.cs | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs b/src/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs index f877e6c..0bd66a6 100644 --- a/src/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs +++ b/src/DevHive.Web/Configurations/Extensions/ConfigureDatabase.cs @@ -16,7 +16,7 @@ namespace DevHive.Web.Configurations.Extensions services.AddDbContext<DevHiveContext>(options => options.UseNpgsql(configuration.GetConnectionString("DEV"))); - services.AddIdentity<User, IdentityRole>() + services.AddIdentity<User, Role>() .AddEntityFrameworkStores<DevHiveContext>(); services.Configure<IdentityOptions>(options => diff --git a/src/DevHive.Web/Controllers/RoleController.cs b/src/DevHive.Web/Controllers/RoleController.cs index e39d858..5e73357 100644 --- a/src/DevHive.Web/Controllers/RoleController.cs +++ b/src/DevHive.Web/Controllers/RoleController.cs @@ -24,7 +24,9 @@ namespace DevHive.Web.Controllers [HttpPost] public Task<IActionResult> Create(CreateRoleWebModel createRoleWebModel) { - RoleServiceModel roleServiceModel = this._roleMapper.Map<RoleServiceModel>(createRoleWebModel); + RoleServiceModel roleServiceModel = + this._roleMapper.Map<RoleServiceModel>(createRoleWebModel); + return this._service.CreateRole(roleServiceModel); } @@ -37,7 +39,9 @@ namespace DevHive.Web.Controllers [HttpPut] public Task<IActionResult> Update(UpdateRoleWebModel updateRoleWebModel) { - RoleServiceModel roleServiceModel = this._roleMapper.Map<RoleServiceModel>(updateRoleWebModel); + RoleServiceModel roleServiceModel = + this._roleMapper.Map<RoleServiceModel>(updateRoleWebModel); + return this._service.UpdateRole(roleServiceModel); } |