Browse Source

Routes fixed

pull/141/head
Sebastian Stehle 8 years ago
parent
commit
502aa6de25
  1. 4
      src/Squidex/Controllers/Api/Apps/AppLanguagesController.cs
  2. 6
      src/Squidex/Controllers/Api/Assets/AssetsController.cs
  3. 6
      src/Squidex/Controllers/Api/EventConsumers/EventConsumersController.cs
  4. 2
      src/Squidex/Controllers/Api/Schemas/SchemaFieldsController.cs
  5. 4
      src/Squidex/Controllers/Api/Schemas/SchemasController.cs
  6. 8
      src/Squidex/Controllers/Api/Statistics/UsagesController.cs
  7. 10
      src/Squidex/Controllers/Api/Users/UserManagementController.cs
  8. 4
      src/Squidex/Controllers/Api/Users/UsersController.cs
  9. 8
      src/Squidex/Controllers/Api/Webhooks/WebhooksController.cs
  10. 22
      src/Squidex/Controllers/ContentApi/ContentsController.cs
  11. 12
      src/Squidex/Controllers/UI/Account/AccountController.cs
  12. 2
      src/Squidex/Controllers/UI/Error/ErrorController.cs
  13. 2
      src/Squidex/Controllers/UI/Profile/PortalController.cs
  14. 12
      src/Squidex/Controllers/UI/Profile/ProfileController.cs

4
src/Squidex/Controllers/Api/Apps/AppLanguagesController.cs

@ -102,7 +102,7 @@ namespace Squidex.Controllers.Api.Apps
/// </returns>
[MustBeAppOwner]
[HttpPut]
[Route("apps/{app}/languages/{language}")]
[Route("apps/{app}/languages/{language}/")]
[ApiCosts(1)]
public async Task<IActionResult> Update(string app, string language, [FromBody] UpdateAppLanguageDto request)
{
@ -122,7 +122,7 @@ namespace Squidex.Controllers.Api.Apps
/// </returns>
[MustBeAppOwner]
[HttpDelete]
[Route("apps/{app}/languages/{language}")]
[Route("apps/{app}/languages/{language}/")]
[ApiCosts(1)]
public async Task<IActionResult> DeleteLanguage(string app, string language)
{

6
src/Squidex/Controllers/Api/Assets/AssetsController.cs

@ -126,7 +126,7 @@ namespace Squidex.Controllers.Api.Assets
/// </returns>
[MustBeAppReader]
[HttpGet]
[Route("apps/{app}/assets/{id}")]
[Route("apps/{app}/assets/{id}/")]
[ProducesResponseType(typeof(AssetsDto), 200)]
[ApiCosts(1)]
public async Task<IActionResult> GetAsset(string app, Guid id)
@ -189,7 +189,7 @@ namespace Squidex.Controllers.Api.Assets
/// </returns>
[MustBeAppEditor]
[HttpPut]
[Route("apps/{app}/assets/{id}/content")]
[Route("apps/{app}/assets/{id}/content/")]
[ProducesResponseType(typeof(AssetReplacedDto), 201)]
[ProducesResponseType(typeof(ErrorDto), 400)]
[ApiCosts(1)]
@ -219,7 +219,7 @@ namespace Squidex.Controllers.Api.Assets
/// </returns>
[MustBeAppReader]
[HttpPut]
[Route("apps/{app}/assets/{id}")]
[Route("apps/{app}/assets/{id}/")]
[ProducesResponseType(typeof(ErrorDto), 400)]
[ApiCosts(1)]
public async Task<IActionResult> PutAsset(string app, Guid id, [FromBody] AssetUpdateDto request)

6
src/Squidex/Controllers/Api/EventConsumers/EventConsumersController.cs

@ -47,7 +47,7 @@ namespace Squidex.Controllers.Api.EventConsumers
}
[HttpPut]
[Route("event-consumers/{name}/start")]
[Route("event-consumers/{name}/start/")]
[ApiCosts(0)]
public IActionResult Start(string name)
{
@ -59,7 +59,7 @@ namespace Squidex.Controllers.Api.EventConsumers
}
[HttpPut]
[Route("event-consumers/{name}/stop")]
[Route("event-consumers/{name}/stop/")]
[ApiCosts(0)]
public IActionResult Stop(string name)
{
@ -71,7 +71,7 @@ namespace Squidex.Controllers.Api.EventConsumers
}
[HttpPut]
[Route("event-consumers/{name}/reset")]
[Route("event-consumers/{name}/reset/")]
[ApiCosts(0)]
public IActionResult Reset(string name)
{

2
src/Squidex/Controllers/Api/Schemas/SchemaFieldsController.cs

@ -77,7 +77,7 @@ namespace Squidex.Controllers.Api.Schemas
/// 404 => Schema or app not found.
/// </returns>
[HttpPut]
[Route("apps/{app}/schemas/{name}/fields/ordering")]
[Route("apps/{app}/schemas/{name}/fields/ordering/")]
[ProducesResponseType(typeof(ErrorDto), 400)]
[ApiCosts(1)]
public async Task<IActionResult> PutFieldOrdering(string app, string name, [FromBody] ReorderFields request)

4
src/Squidex/Controllers/Api/Schemas/SchemasController.cs

@ -190,7 +190,7 @@ namespace Squidex.Controllers.Api.Schemas
/// </returns>
[MustBeAppDeveloper]
[HttpPut]
[Route("apps/{app}/schemas/{name}/publish")]
[Route("apps/{app}/schemas/{name}/publish/")]
[ProducesResponseType(typeof(ErrorDto), 400)]
[ApiCosts(1)]
public async Task<IActionResult> PublishSchema(string app, string name)
@ -212,7 +212,7 @@ namespace Squidex.Controllers.Api.Schemas
/// </returns>
[MustBeAppDeveloper]
[HttpPut]
[Route("apps/{app}/schemas/{name}/unpublish")]
[Route("apps/{app}/schemas/{name}/unpublish/")]
[ProducesResponseType(typeof(ErrorDto), 400)]
[ApiCosts(1)]
public async Task<IActionResult> UnpublishSchema(string app, string name)

8
src/Squidex/Controllers/Api/Statistics/UsagesController.cs

@ -55,7 +55,7 @@ namespace Squidex.Controllers.Api.Statistics
/// 404 => App not found.
/// </returns>
[HttpGet]
[Route("apps/{app}/usages/calls/month")]
[Route("apps/{app}/usages/calls/month/")]
[ProducesResponseType(typeof(CurrentCallsDto), 200)]
[ApiCosts(0)]
public async Task<IActionResult> GetMonthlyCalls(string app)
@ -79,7 +79,7 @@ namespace Squidex.Controllers.Api.Statistics
/// 400 => Range between from date and to date is not valid or has more than 100 days.
/// </returns>
[HttpGet]
[Route("apps/{app}/usages/calls/{fromDate}/{toDate}")]
[Route("apps/{app}/usages/calls/{fromDate}/{toDate}/")]
[ProducesResponseType(typeof(CallsUsageDto[]), 200)]
[ApiCosts(0)]
public async Task<IActionResult> GetUsages(string app, DateTime fromDate, DateTime toDate)
@ -110,7 +110,7 @@ namespace Squidex.Controllers.Api.Statistics
/// 404 => App not found.
/// </returns>
[HttpGet]
[Route("apps/{app}/usages/storage/today")]
[Route("apps/{app}/usages/storage/today/")]
[ProducesResponseType(typeof(CurrentStorageDto), 200)]
[ApiCosts(0)]
public async Task<IActionResult> GetCurrentStorageSize(string app)
@ -134,7 +134,7 @@ namespace Squidex.Controllers.Api.Statistics
/// 400 => Range between from date and to date is not valid or has more than 100 days.
/// </returns>
[HttpGet]
[Route("apps/{app}/usages/storage/{fromDate}/{toDate}")]
[Route("apps/{app}/usages/storage/{fromDate}/{toDate}/")]
[ProducesResponseType(typeof(StorageUsageDto[]), 200)]
[ApiCosts(0)]
public async Task<IActionResult> GetStorageSizes(string app, DateTime fromDate, DateTime toDate)

10
src/Squidex/Controllers/Api/Users/UserManagementController.cs

@ -37,7 +37,7 @@ namespace Squidex.Controllers.Api.Users
}
[HttpGet]
[Route("user-management")]
[Route("user-management/")]
[ApiCosts(0)]
public async Task<IActionResult> GetUsers([FromQuery] string query = null, [FromQuery] int skip = 0, [FromQuery] int take = 10)
{
@ -56,7 +56,7 @@ namespace Squidex.Controllers.Api.Users
}
[HttpGet]
[Route("user-management/{id}")]
[Route("user-management/{id}/")]
[ApiCosts(0)]
public async Task<IActionResult> GetUser(string id)
{
@ -73,7 +73,7 @@ namespace Squidex.Controllers.Api.Users
}
[HttpPost]
[Route("user-management")]
[Route("user-management/")]
[ApiCosts(0)]
public async Task<IActionResult> PostUser([FromBody] CreateUserDto request)
{
@ -85,7 +85,7 @@ namespace Squidex.Controllers.Api.Users
}
[HttpPut]
[Route("user-management/{id}")]
[Route("user-management/{id}/")]
[ApiCosts(0)]
public async Task<IActionResult> PutUser(string id, [FromBody] UpdateUserDto request)
{
@ -110,7 +110,7 @@ namespace Squidex.Controllers.Api.Users
}
[HttpPut]
[Route("user-management/{id}/unlock/.")]
[Route("user-management/{id}/unlock/")]
[ApiCosts(0)]
public async Task<IActionResult> UnlockUser(string id)
{

4
src/Squidex/Controllers/Api/Users/UsersController.cs

@ -64,7 +64,7 @@ namespace Squidex.Controllers.Api.Users
/// </returns>
[Authorize]
[HttpGet]
[Route("users")]
[Route("users/")]
[ProducesResponseType(typeof(UserDto[]), 200)]
public async Task<IActionResult> GetUsers(string query)
{
@ -110,7 +110,7 @@ namespace Squidex.Controllers.Api.Users
/// 404 => User not found.
/// </returns>
[HttpGet]
[Route("users/{id}/picture")]
[Route("users/{id}/picture/")]
[ProducesResponseType(200)]
public async Task<IActionResult> GetUserPicture(string id)
{

8
src/Squidex/Controllers/Api/Webhooks/WebhooksController.cs

@ -119,7 +119,7 @@ namespace Squidex.Controllers.Api.Webhooks
/// All events for the specified schemas will be sent to the url. The timeout is 2 seconds.
/// </remarks>
[HttpPut]
[Route("apps/{app}/webhooks/{id}")]
[Route("apps/{app}/webhooks/{id}/")]
[ProducesResponseType(typeof(ErrorDto), 400)]
[ApiCosts(1)]
public async Task<IActionResult> PutWebhook(string app, Guid id, [FromBody] CreateWebhookDto request)
@ -143,7 +143,7 @@ namespace Squidex.Controllers.Api.Webhooks
/// 404 => Webhook or app not found.
/// </returns>
[HttpDelete]
[Route("apps/{app}/webhooks/{id}")]
[Route("apps/{app}/webhooks/{id}/")]
[ApiCosts(1)]
public async Task<IActionResult> DeleteWebhook(string app, Guid id)
{
@ -163,7 +163,7 @@ namespace Squidex.Controllers.Api.Webhooks
/// 404 => App not found.
/// </returns>
[HttpGet]
[Route("apps/{app}/webhooks/events")]
[Route("apps/{app}/webhooks/events/")]
[ProducesResponseType(typeof(WebhookEventsDto), 200)]
[ApiCosts(0)]
public async Task<IActionResult> GetEvents(string app, [FromQuery] int skip = 0, [FromQuery] int take = 20)
@ -200,7 +200,7 @@ namespace Squidex.Controllers.Api.Webhooks
/// 404 => App or webhook event not found.
/// </returns>
[HttpPut]
[Route("apps/{app}/webhooks/events/{id}")]
[Route("apps/{app}/webhooks/events/{id}/")]
[ApiCosts(0)]
public async Task<IActionResult> PutEvent(string app, Guid id)
{

22
src/Squidex/Controllers/ContentApi/ContentsController.cs

@ -49,7 +49,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppReader]
[HttpGet]
[HttpPost]
[Route("content/{app}/graphql")]
[Route("content/{app}/graphql/")]
[ApiCosts(2)]
public async Task<IActionResult> PostGraphQL([FromBody] GraphQLQuery query)
{
@ -67,7 +67,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppReader]
[HttpGet]
[Route("content/{app}/{name}")]
[Route("content/{app}/{name}/")]
[ApiCosts(2)]
public async Task<IActionResult> GetContents(string name, [FromQuery] bool archived = false, [FromQuery] string ids = null)
{
@ -114,7 +114,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppReader]
[HttpGet]
[Route("content/{app}/{name}/{id}")]
[Route("content/{app}/{name}/{id}/")]
[ApiCosts(1)]
public async Task<IActionResult> GetContent(string name, Guid id)
{
@ -136,7 +136,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppReader]
[HttpGet]
[Route("content/{app}/{name}/{id}/{version}")]
[Route("content/{app}/{name}/{id}/{version}/")]
[ApiCosts(1)]
public async Task<IActionResult> GetContentVersion(string name, Guid id, int version)
{
@ -169,7 +169,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppEditor]
[HttpPut]
[Route("content/{app}/{name}/{id}")]
[Route("content/{app}/{name}/{id}/")]
[ApiCosts(1)]
public async Task<IActionResult> PutContent(string name, Guid id, [FromBody] NamedContentData request)
{
@ -187,7 +187,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppEditor]
[HttpPatch]
[Route("content/{app}/{name}/{id}")]
[Route("content/{app}/{name}/{id}/")]
[ApiCosts(1)]
public async Task<IActionResult> PatchContent(string name, Guid id, [FromBody] NamedContentData request)
{
@ -205,7 +205,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppEditor]
[HttpPut]
[Route("content/{app}/{name}/{id}/publish")]
[Route("content/{app}/{name}/{id}/publish/")]
[ApiCosts(1)]
public async Task<IActionResult> PublishContent(string name, Guid id)
{
@ -220,7 +220,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppEditor]
[HttpPut]
[Route("content/{app}/{name}/{id}/unpublish")]
[Route("content/{app}/{name}/{id}/unpublish/")]
[ApiCosts(1)]
public async Task<IActionResult> UnpublishContent(string name, Guid id)
{
@ -235,7 +235,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppEditor]
[HttpPut]
[Route("content/{app}/{name}/{id}/archive")]
[Route("content/{app}/{name}/{id}/archive/")]
[ApiCosts(1)]
public async Task<IActionResult> ArchiveContent(string name, Guid id)
{
@ -250,7 +250,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppEditor]
[HttpPut]
[Route("content/{app}/{name}/{id}/restore")]
[Route("content/{app}/{name}/{id}/restore/")]
[ApiCosts(1)]
public async Task<IActionResult> RestoreContent(string name, Guid id)
{
@ -265,7 +265,7 @@ namespace Squidex.Controllers.ContentApi
[MustBeAppEditor]
[HttpDelete]
[Route("content/{app}/{name}/{id}")]
[Route("content/{app}/{name}/{id}/")]
[ApiCosts(1)]
public async Task<IActionResult> DeleteContent(string name, Guid id)
{

12
src/Squidex/Controllers/UI/Account/AccountController.cs

@ -73,21 +73,21 @@ namespace Squidex.Controllers.UI.Account
}
[HttpGet]
[Route("account/forbidden")]
[Route("account/forbidden/")]
public IActionResult Forbidden()
{
throw new SecurityException("User is not allowed to login.");
}
[HttpGet]
[Route("account/lockedout")]
[Route("account/lockedout/")]
public IActionResult LockedOut()
{
return View();
}
[HttpGet]
[Route("account/accessdenied")]
[Route("account/accessdenied/")]
public IActionResult AccessDenied()
{
return View();
@ -101,7 +101,7 @@ namespace Squidex.Controllers.UI.Account
}
[HttpGet]
[Route("account/logout/.")]
[Route("account/logout/")]
public async Task<IActionResult> Logout(string logoutId)
{
var context = await interactions.GetLogoutContextAsync(logoutId);
@ -119,7 +119,7 @@ namespace Squidex.Controllers.UI.Account
}
[HttpGet]
[Route("account/logout-redirect/.")]
[Route("account/logout-redirect/")]
public async Task<IActionResult> LogoutRedirect()
{
await signInManager.SignOutAsync();
@ -128,7 +128,7 @@ namespace Squidex.Controllers.UI.Account
}
[HttpGet]
[Route("account/signup/.")]
[Route("account/signup/")]
public IActionResult Signup(string returnUrl = null)
{
return LoginView(returnUrl, false, false);

2
src/Squidex/Controllers/UI/Error/ErrorController.cs

@ -14,7 +14,7 @@ namespace Squidex.Controllers.UI.Error
[SwaggerIgnore]
public sealed class ErrorController : Controller
{
[Route("error")]
[Route("error/")]
public IActionResult Error()
{
return View();

2
src/Squidex/Controllers/UI/Profile/PortalController.cs

@ -27,7 +27,7 @@ namespace Squidex.Controllers.UI.Profile
}
[HttpGet]
[Route("/account/portal")]
[Route("/account/portal/")]
public async Task<IActionResult> Portal()
{
var userId = User.FindFirst(OpenIdClaims.Subject).Value;

12
src/Squidex/Controllers/UI/Profile/ProfileController.cs

@ -53,7 +53,7 @@ namespace Squidex.Controllers.UI.Profile
}
[HttpGet]
[Route("/account/profile")]
[Route("/account/profile/")]
public async Task<IActionResult> Profile(string successMessage = null)
{
var user = await userManager.GetUserAsync(User);
@ -87,7 +87,7 @@ namespace Squidex.Controllers.UI.Profile
}
[HttpPost]
[Route("/account/profile/update")]
[Route("/account/profile/update/")]
public Task<IActionResult> UpdateProfile(ChangeProfileModel model)
{
return MakeChangeAsync(user => userManager.UpdateAsync(user, model.Email, model.DisplayName),
@ -95,7 +95,7 @@ namespace Squidex.Controllers.UI.Profile
}
[HttpPost]
[Route("/account/profile/login-remove")]
[Route("/account/profile/login-remove/")]
public Task<IActionResult> RemoveLogin(RemoveLoginModel model)
{
return MakeChangeAsync(user => userManager.RemoveLoginAsync(user, model.LoginProvider, model.ProviderKey),
@ -103,7 +103,7 @@ namespace Squidex.Controllers.UI.Profile
}
[HttpPost]
[Route("/account/profile/password-set")]
[Route("/account/profile/password-set/")]
public Task<IActionResult> SetPassword(SetPasswordModel model)
{
return MakeChangeAsync(user => userManager.AddPasswordAsync(user, model.Password),
@ -111,7 +111,7 @@ namespace Squidex.Controllers.UI.Profile
}
[HttpPost]
[Route("/account/profile/password-change")]
[Route("/account/profile/password-change/")]
public Task<IActionResult> ChangePassword(ChangePasswordModel model)
{
return MakeChangeAsync(user => userManager.ChangePasswordAsync(user, model.OldPassword, model.Password),
@ -119,7 +119,7 @@ namespace Squidex.Controllers.UI.Profile
}
[HttpPost]
[Route("/account/profile/upload-picture")]
[Route("/account/profile/upload-picture/")]
public Task<IActionResult> UploadPicture(List<IFormFile> file)
{
return MakeChangeAsync(async user =>

Loading…
Cancel
Save