saherelm/xSaherElmApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor xApi from Side Affect Changes ...

Browse Source
This commit is contained in:
saherelm
2026-05-16 01:15:29 +03:30
parent 1f4b6e7c9a
commit b346b3c1ef
6 changed files with 2 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Base/XIBaseV1Controller.cs
-33
View File
@@ -1,33 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using xCommons.Attributes;
using xCommons.Configurations;
using xCommons.Providers;
using xIdentityService.Controllers;
using xIdentityService.Interfaces;
namespace xApi.Base
{
[ApiController]
[ApiVersion("1.0")]
[RequireXPowered(true)]
[Route("api/v{version:apiVersion}/[controller]")]
public abstract class XIBaseV1Controller : XIBaseController
{
//
#region Constructor ...
protected XIBaseV1Controller(
ILogger<XIBaseV1Controller> logger,
XAppConfiguration appConfiguration,
IXIdentityProvider identityProvider,
XValidationProvider validationProvider
) : base(
logger,
appConfiguration,
identityProvider,
validationProvider
)
{ }
#endregion
}
}
Base/XIBaseV1EntityController.cs
-122
View File
@@ -1,122 +0,0 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Logging;
using xCommons.Attributes;
using xCommons.Configurations;
using xCommons.Extensions;
using xCommons.Providers;
using xDataService.Interfaces;
using xIdentityService.Controllers;
using xIdentityService.Interfaces;
using xModels.Base;
using xPushService.Base;
using xPushService.Constants;
namespace xApi.Base
{
//
// TODO: Fix this ...
// [ApiController]
// [ApiVersion("1.0")]
// [RequireXPowered(true)]
// [Route("api/v{version:apiVersion}/entities/[controller]")]
// public abstract class XIBaseV1EntityController<TEntity, TKey> : XIBaseEntityController<TEntity, TKey>
// where TEntity : XBaseEntity<TKey>
// {
// //
// #region Constructor ...
// protected XIBaseV1EntityController(
// ILogger<XIBaseV1EntityController<TEntity, TKey>> logger,
// XAppConfiguration appConfiguration,
// IXIdentityProvider identityProvider,
// XValidationProvider validationProvider,
// IXBaseRepository<TEntity, TKey> repository
// ) : base(
// logger,
// appConfiguration,
// identityProvider,
// validationProvider,
// repository
// )
// { }
// #endregion
// }
// public abstract class XIBaseV1EntityHubController<TEntity, TKey> : XIBaseV1EntityController<TEntity, TKey>
// where TEntity : XBaseEntity<TKey>
// {
// //
// #region Props ...
// public IHubContext<XBaseEntityHub<TEntity, TKey>> Hub { get; }
// #endregion
// //
// #region Constructor ...
// protected XIBaseV1EntityHubController(
// ILogger<XIBaseV1EntityHubController<TEntity, TKey>> logger,
// XAppConfiguration appConfiguration,
// IXIdentityProvider identityProvider,
// XValidationProvider validationProvider,
// IXBaseRepository<TEntity, TKey> repository,
// IHubContext<XBaseEntityHub<TEntity, TKey>> hub = null
// ) : base(
// logger,
// appConfiguration,
// identityProvider,
// validationProvider,
// repository
// )
// {
// Hub = hub;
// }
// #endregion
// //
// #region Hub ...
// [NonAction]
// public async Task SendPush(
// string action,
// string payLoad
// )
// {
// //
// var actions = new List<string>
// {
// XBaseEntityHubAction.Add.GetStringValue(),
// XBaseEntityHubAction.Update.GetStringValue(),
// XBaseEntityHubAction.Delete.GetStringValue(),
// XBaseEntityHubAction.AddMany.GetStringValue(),
// XBaseEntityHubAction.DeleteMany.GetStringValue(),
// XBaseEntityHubAction.UpdateMany.GetStringValue(),
// XBaseEntityHubAction.AddOrUpdate.GetStringValue(),
// };
// //
// // Validate ...
// var isValid =
// !Hub.IsNull() &&
// !action.IsNullOrEmpty() &&
// !payLoad.IsNullOrEmpty() &&
// actions.Contains(action);
// if (!isValid)
// {
// return;
// }
// //
// // Retrieve Connection Id ...
// var connectionId = GetConnectionId();
// var clients = Hub.Clients.All;
// if (!connectionId.IsNullOrEmpty())
// {
// clients = Hub.Clients.AllExcept(connectionId);
// }
// //
// await clients.SendAsync(action, payLoad, connectionId);
// }
// #endregion
// }
}
Base/XIBaseV1ProviderController.cs
-29
View File
@@ -1,29 +0,0 @@
using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.Logging;
using xCommons.Configurations;
using xCommons.Providers;
using xIdentityService.Controllers;
using xIdentityService.Interfaces;
namespace xApi.Base
{
[Route("api/v{version:apiVersion}/services/[controller]")]
public abstract class XIBaseV1ProviderController : XIBaseProviderController
{
//
#region Constructor ...
protected XIBaseV1ProviderController(
ILogger logger,
XAppConfiguration appConfiguration,
IXIdentityProvider identityProvider,
XValidationProvider validationProvider
) : base(
logger,
appConfiguration,
identityProvider,
validationProvider
)
{ }
#endregion
}
}
Controllers/AccountController.cs
+1 -1
View File
@@ -13,7 +13,7 @@ namespace xApi.Controllers
/// </summary>
[AllowAnonymous]
[RequireXPowered(true)]
public partial class AccountController : XIBaseController
public partial class AccountController : XBaseIdentityController
{
//
#region Props ...
Controllers/TestIdentity.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace xApi.Controllers {
/// Test all Authentication Policies ...
/// </summary>
[RequireXPowered (false)]
public class TestIdentity : XIBaseController {
public class TestIdentity : XBaseIdentityController {
public TestIdentity (
ILogger<TestIdentity> logger,
XAppConfiguration appConfiguration,
Startup.cs
-9
View File
@@ -154,15 +154,6 @@ namespace xApi
endpoints.MapControllers();
});
//
#region XPushService ...
// //
// var helper = new XPushServiceHelper();
// //
// app.UseXPushService(helper);
#endregion
//
// Use xDataService Middleware ...
app.UseXServices(