Browse Source

Fix for user form.

pull/405/head
Sebastian 7 years ago
parent
commit
8df69b65ae
  1. 2
      src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs
  2. 2
      src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs
  3. 2
      src/Squidex/Areas/Api/Controllers/Apps/Models/PatternDto.cs
  4. 2
      src/Squidex/Areas/Api/Controllers/Apps/Models/RoleDto.cs
  5. 4
      src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs
  6. 2
      src/Squidex/Areas/Api/Controllers/Ping/PingController.cs
  7. 2
      src/Squidex/Areas/Api/Controllers/Users/Models/ResourcesDto.cs
  8. 22
      src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileController.cs
  9. 4
      src/Squidex/app/features/administration/pages/users/user-page.component.ts

2
src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs

@ -97,7 +97,7 @@ namespace Squidex.Areas.Api.Controllers.Apps
[ProducesResponseType(typeof(PatternsDto), 200)]
[ApiPermission(Permissions.AppPatternsUpdate)]
[ApiCosts(1)]
public async Task<IActionResult> UpdatePattern(string app, Guid id, [FromBody] UpdatePatternDto request)
public async Task<IActionResult> PutPattern(string app, Guid id, [FromBody] UpdatePatternDto request)
{
var command = request.ToUpdateCommand(id);

2
src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs

@ -122,7 +122,7 @@ namespace Squidex.Areas.Api.Controllers.Apps
[ProducesResponseType(typeof(RolesDto), 200)]
[ApiPermission(Permissions.AppRolesUpdate)]
[ApiCosts(1)]
public async Task<IActionResult> UpdateRole(string app, string name, [FromBody] UpdateRoleDto request)
public async Task<IActionResult> PutRole(string app, string name, [FromBody] UpdateRoleDto request)
{
var command = request.ToCommand(name);

2
src/Squidex/Areas/Api/Controllers/Apps/Models/PatternDto.cs

@ -51,7 +51,7 @@ namespace Squidex.Areas.Api.Controllers.Apps.Models
if (controller.HasPermission(Permissions.AppPatternsUpdate, app))
{
AddPutLink("update", controller.Url<AppPatternsController>(x => nameof(x.UpdatePattern), values));
AddPutLink("update", controller.Url<AppPatternsController>(x => nameof(x.PutPattern), values));
}
if (controller.HasPermission(Permissions.AppPatternsDelete, app))

2
src/Squidex/Areas/Api/Controllers/Apps/Models/RoleDto.cs

@ -68,7 +68,7 @@ namespace Squidex.Areas.Api.Controllers.Apps.Models
{
if (controller.HasPermission(AllPermissions.AppRolesUpdate, app) && NumClients == 0 && NumContributors == 0)
{
AddPutLink("update", controller.Url<AppRolesController>(x => nameof(x.UpdateRole), values));
AddPutLink("update", controller.Url<AppRolesController>(x => nameof(x.PutRole), values));
}
if (controller.HasPermission(AllPermissions.AppRolesDelete, app))

4
src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs

@ -42,7 +42,7 @@ namespace Squidex.Areas.Api.Controllers.Backups
[Route("apps/restore/")]
[ProducesResponseType(typeof(RestoreJobDto), 200)]
[ApiPermission(Permissions.AdminRestore)]
public async Task<IActionResult> GetJob()
public async Task<IActionResult> GetRestoreJob()
{
var restoreGrain = grainFactory.GetGrain<IRestoreGrain>(SingleGrain.Id);
@ -68,7 +68,7 @@ namespace Squidex.Areas.Api.Controllers.Backups
[HttpPost]
[Route("apps/restore/")]
[ApiPermission(Permissions.AdminRestore)]
public async Task<IActionResult> PostRestore([FromBody] RestoreRequestDto request)
public async Task<IActionResult> PostRestoreJob([FromBody] RestoreRequestDto request)
{
var restoreGrain = grainFactory.GetGrain<IRestoreGrain>(SingleGrain.Id);

2
src/Squidex/Areas/Api/Controllers/Ping/PingController.cs

@ -35,7 +35,7 @@ namespace Squidex.Areas.Api.Controllers.Ping
[HttpGet]
[ProducesResponseType(typeof(ExposedValues), 200)]
[Route("info/")]
public IActionResult Info()
public IActionResult GetInfo()
{
return Ok(exposedValues);
}

2
src/Squidex/Areas/Api/Controllers/Users/Models/ResourcesDto.cs

@ -29,7 +29,7 @@ namespace Squidex.Areas.Api.Controllers.Users.Models
if (controller.HasPermission(Permissions.AdminRestore))
{
result.AddGetLink("admin/restore", controller.Url<RestoreController>(x => nameof(x.GetJob)));
result.AddGetLink("admin/restore", controller.Url<RestoreController>(x => nameof(x.GetRestoreJob)));
}
if (controller.HasPermission(Permissions.AdminUsersRead))

22
src/Squidex/Areas/IdentityServer/Controllers/Profile/ProfileController.cs

@ -132,19 +132,21 @@ namespace Squidex.Areas.IdentityServer.Controllers.Profile
return IdentityResult.Failed(new IdentityError { Description = "Please upload a single file." });
}
var thumbnailStream = new MemoryStream();
try
using (var thumbnailStream = new MemoryStream())
{
await assetThumbnailGenerator.CreateThumbnailAsync(file[0].OpenReadStream(), thumbnailStream, 128, 128, "Crop");
try
{
await assetThumbnailGenerator.CreateThumbnailAsync(file[0].OpenReadStream(), thumbnailStream, 128, 128, "Crop");
thumbnailStream.Position = 0;
}
catch
{
return IdentityResult.Failed(new IdentityError { Description = "Picture is not a valid image." });
}
thumbnailStream.Position = 0;
}
catch
{
return IdentityResult.Failed(new IdentityError { Description = "Picture is not a valid image." });
}
await userPictureStore.UploadAsync(user.Id, thumbnailStream);
await userPictureStore.UploadAsync(user.Id, thumbnailStream);
}
return await userManager.UpdateSafeAsync(user.Identity, new UserValues { PictureUrl = SquidexClaimTypes.PictureUrlStore });
}

4
src/Squidex/app/features/administration/pages/users/user-page.component.ts

@ -63,8 +63,8 @@ export class UserPageComponent extends ResourceOwner implements OnInit {
if (value) {
if (this.user) {
this.usersState.update(this.user, value)
.subscribe(() => {
this.userForm.submitCompleted();
.subscribe(user => {
this.userForm.submitCompleted({ newValue: user });
}, error => {
this.userForm.submitFailed(error);
});

Loading…
Cancel
Save