Commit 4f2b415d authored by Eric Dieckman's avatar Eric Dieckman
Browse files

Move api controllers to controllers

parent 2b34dd90

src/api/Controllers/Api/AreasApiController.cs→src/api/Controllers/AreasController.cs

+3 −3
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ using Cals.Visor.Models; 
using Microsoft.AspNetCore.Mvc;

using Microsoft.EntityFrameworkCore;



namespace Cals.Visor.Api.Controllers.Api;

namespace Cals.Visor.Api.Controllers;

[Route("api/areas")]

[ApiController]

public class AreasApiController : ControllerBase

public class AreasController : ControllerBase

{

    private readonly ApplicationDbContext _context;



    public AreasApiController(ApplicationDbContext context) => _context = context;

    public AreasController(ApplicationDbContext context) => _context = context;



    // GET: /api/areas

    [ProducesResponseType<Area>(StatusCodes.Status200OK)]

src/api/Controllers/Api/AuthApiController.cs→src/api/Controllers/AuthController.cs

+3 −3
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ using Cals.Visor.Identity; 
using Cals.Visor.Api.Authorization;

using Microsoft.AspNetCore.Mvc;



namespace Cals.Visor.Api.Controllers.Api;

namespace Cals.Visor.Api.Controllers;



[Route("api/auth")]

[ApiController]

public class AuthApiController : ControllerBase

public class AuthController : ControllerBase

{

    private readonly AppGroups _appGroups;



    public AuthApiController(AppGroups appGroups)

    public AuthController(AppGroups appGroups)

    {

        _appGroups = appGroups;

    }

src/api/Controllers/ErrorController.cs

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
using Cals.Visor.Application.Interfaces;

using Microsoft.AspNetCore.Authorization;

using Microsoft.AspNetCore.Diagnostics;

using Microsoft.AspNetCore.Mvc;

using MimeKit;



namespace Cals.Web.ErrorHandling;



public class ErrorController : Controller

{

    private readonly IEmailService _emailService;



    public ErrorController(IEmailService emailService)

    {

        _emailService = emailService;

    }



    [Route("~/error")]

    [Route("~/error/{statusCode:int}")]

    [AllowAnonymous]

    public async Task<IActionResult> Error(int? statusCode = null)

    {

        var model = new ErrorModel();



        if (statusCode == null)

            statusCode = HttpContext.Response.StatusCode;



        model.StatusCode = statusCode.Value;



        IStatusCodeReExecuteFeature? feature = HttpContext.Features.Get<IStatusCodeReExecuteFeature>();



        // get routing data

        EndpointModel? endpointModel = EndpointExtractor.Extract(HttpContext);



        HttpRequest request = HttpContext.Request;



        var errorModel = new ErrorEmailModel()

        {

            Query = request.Query,

            Cookies = request.Cookies,

            Headers = request.Headers,

            RouteValues = request.RouteValues,

            Endpoint = endpointModel,

            StatusCode = statusCode.Value,

            IpAddress = HttpContext.Connection.RemoteIpAddress?.ToString(),

            UserId = "Unknown",

            Uri = new Uri($"{HttpContext.Request.Scheme}://{HttpContext.Request.Host}{feature?.OriginalPath}"),

        };



        if (HttpContext.User.Identity != null && HttpContext.User.Identity.IsAuthenticated)

            errorModel.UserId = HttpContext.User.Identity.Name;



        MimeEntity emailBody = ErrorEmailCreator.CreateStatusCodeEmail(errorModel);



        if (model.StatusCode != 500 || model.StatusCode != 404)

            await _emailService.SendAdminAsync($"{statusCode.Value} Error: {errorModel.Uri}", emailBody);



        return View(model);

    }

}

src/api/Controllers/HomeController.cs

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
using Cals.Cqrs;

using Microsoft.AspNetCore.Mvc;



namespace Cals.Visor.Api.Controllers;



public class HomeController : Controller

{

    private readonly IRequestProcessor _requestProcessor;



    public HomeController(IRequestProcessor requestProcessor)

    {

        _requestProcessor = requestProcessor;

    }



    public IActionResult Index()

    {

        return View();

    }

}

src/api/Controllers/Api/LocationsApiController.cs→src/api/Controllers/LocationsController.cs

+3 −3
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ using Microsoft.AspNetCore.Http; 
using Microsoft.AspNetCore.Mvc;

using Microsoft.EntityFrameworkCore;



namespace Cals.Visor.Api.Controllers.Api;

namespace Cals.Visor.Api.Controllers;

[Route("api/locations")]

[ApiController]

public class LocationsApiController : ControllerBase

public class LocationsController : ControllerBase

{

    private readonly ApplicationDbContext _context;



    public LocationsApiController(ApplicationDbContext context) => _context = context;

    public LocationsController(ApplicationDbContext context) => _context = context;



    // GET: /api/locations

    [ProducesResponseType<IList<Location>>(StatusCodes.Status200OK)]