diff --git a/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs b/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs index e8ae41d..fcda905 100644 --- a/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Communications/GetInvitesEndpoint.cs @@ -2,9 +2,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Communications; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; using static PostFundManagement.Application.Extensions.General; namespace PostFundManagement.Api.Endpoints.Communications; diff --git a/PostFundManagement.Api/Endpoints/Communications/SendInviteEndpoint.cs b/PostFundManagement.Api/Endpoints/Communications/SendInviteEndpoint.cs index 3b18a88..0eab0e2 100644 --- a/PostFundManagement.Api/Endpoints/Communications/SendInviteEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Communications/SendInviteEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Communications; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Communications; diff --git a/PostFundManagement.Api/Endpoints/Communications/SyncIdentityUserEndpoint.cs b/PostFundManagement.Api/Endpoints/Communications/SyncIdentityUserEndpoint.cs index 703a493..3ce7bdb 100644 --- a/PostFundManagement.Api/Endpoints/Communications/SyncIdentityUserEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Communications/SyncIdentityUserEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Communications.Events; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Communications; diff --git a/PostFundManagement.Api/Endpoints/Evidence/CreateIndicatorEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/CreateIndicatorEndpoint.cs index 1165275..735d48a 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/CreateIndicatorEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/CreateIndicatorEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Evidence; diff --git a/PostFundManagement.Api/Endpoints/Evidence/CreateMilestoneEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/CreateMilestoneEndpoint.cs index e62047d..fb667d7 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/CreateMilestoneEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/CreateMilestoneEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Evidence; diff --git a/PostFundManagement.Api/Endpoints/Evidence/GetEvidenceFilesEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/GetEvidenceFilesEndpoint.cs index c35b980..42d3a05 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/GetEvidenceFilesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/GetEvidenceFilesEndpoint.cs @@ -2,8 +2,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Evidence; diff --git a/PostFundManagement.Api/Endpoints/Evidence/GetIndicatorsEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/GetIndicatorsEndpoint.cs index d97485e..a7c2bb5 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/GetIndicatorsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/GetIndicatorsEndpoint.cs @@ -2,9 +2,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Evidence; diff --git a/PostFundManagement.Api/Endpoints/Evidence/GetMilestonesEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/GetMilestonesEndpoint.cs index 6658f0a..cd5bf92 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/GetMilestonesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/GetMilestonesEndpoint.cs @@ -2,9 +2,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Evidence; diff --git a/PostFundManagement.Api/Endpoints/Evidence/GetProjectMilestonesEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/GetProjectMilestonesEndpoint.cs index 01fa6b1..8af68df 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/GetProjectMilestonesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/GetProjectMilestonesEndpoint.cs @@ -1,9 +1,9 @@ -using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; -using PostFundManagement.Domain.Models; -using PostFundManagement.Domain.Extensions; using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Evidence; +using PostFundManagement.Domain.Abstractions; +using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Evidence; diff --git a/PostFundManagement.Api/Endpoints/Evidence/RecordIndicatorAmountEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/RecordIndicatorAmountEndpoint.cs index c06efa1..f47b467 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/RecordIndicatorAmountEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/RecordIndicatorAmountEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Evidence; diff --git a/PostFundManagement.Api/Endpoints/Evidence/UploadEvidenceFilesEndpoint.cs b/PostFundManagement.Api/Endpoints/Evidence/UploadEvidenceFilesEndpoint.cs index eaeb4ca..291be95 100644 --- a/PostFundManagement.Api/Endpoints/Evidence/UploadEvidenceFilesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Evidence/UploadEvidenceFilesEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Evidence; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Evidence; diff --git a/PostFundManagement.Api/Endpoints/Execution/ApproveDisbursementEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/ApproveDisbursementEndpoint.cs index 29b6042..a66d77f 100644 --- a/PostFundManagement.Api/Endpoints/Execution/ApproveDisbursementEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/ApproveDisbursementEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Execution; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Execution; diff --git a/PostFundManagement.Api/Endpoints/Execution/CreateDisbursementEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/CreateDisbursementEndpoint.cs index efc1389..4e95fcb 100644 --- a/PostFundManagement.Api/Endpoints/Execution/CreateDisbursementEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/CreateDisbursementEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Execution; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Execution; diff --git a/PostFundManagement.Api/Endpoints/Execution/CreateRiskEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/CreateRiskEndpoint.cs index 277669f..c10a61a 100644 --- a/PostFundManagement.Api/Endpoints/Execution/CreateRiskEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/CreateRiskEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Execution; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Execution; diff --git a/PostFundManagement.Api/Endpoints/Execution/GetDisbursementsEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/GetDisbursementsEndpoint.cs index 837606e..055d62c 100644 --- a/PostFundManagement.Api/Endpoints/Execution/GetDisbursementsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/GetDisbursementsEndpoint.cs @@ -1,10 +1,10 @@ -using PostFundManagement.Domain; -using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; -using PostFundManagement.Domain.Models; -using PostFundManagement.Domain.Extensions; using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Execution; +using PostFundManagement.Domain; +using PostFundManagement.Domain.Abstractions; +using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Execution; diff --git a/PostFundManagement.Api/Endpoints/Execution/GetProjectRisksEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/GetProjectRisksEndpoint.cs index 019455a..e452fd6 100644 --- a/PostFundManagement.Api/Endpoints/Execution/GetProjectRisksEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/GetProjectRisksEndpoint.cs @@ -1,9 +1,9 @@ -using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; -using PostFundManagement.Domain.Models; -using PostFundManagement.Domain.Extensions; using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Execution; +using PostFundManagement.Domain.Abstractions; +using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Execution; diff --git a/PostFundManagement.Api/Endpoints/Execution/GetRisksEndpoint.cs b/PostFundManagement.Api/Endpoints/Execution/GetRisksEndpoint.cs index 69e2746..e4afa7d 100644 --- a/PostFundManagement.Api/Endpoints/Execution/GetRisksEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Execution/GetRisksEndpoint.cs @@ -2,8 +2,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Execution; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Execution; diff --git a/PostFundManagement.Api/Endpoints/Governance/CreateOrganisationEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/CreateOrganisationEndpoint.cs index 622f0dd..cc581f8 100644 --- a/PostFundManagement.Api/Endpoints/Governance/CreateOrganisationEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/CreateOrganisationEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Governance; diff --git a/PostFundManagement.Api/Endpoints/Governance/DashboardEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/DashboardEndpoint.cs index 941c165..e293b2a 100644 --- a/PostFundManagement.Api/Endpoints/Governance/DashboardEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/DashboardEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Governance; diff --git a/PostFundManagement.Api/Endpoints/Governance/GetInstrumentsEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/GetInstrumentsEndpoint.cs index 27e9b8a..cdb8212 100644 --- a/PostFundManagement.Api/Endpoints/Governance/GetInstrumentsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/GetInstrumentsEndpoint.cs @@ -1,9 +1,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Governance; diff --git a/PostFundManagement.Api/Endpoints/Governance/GetOrganisationByIdEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/GetOrganisationByIdEndpoint.cs index a62c4ab..a869d75 100644 --- a/PostFundManagement.Api/Endpoints/Governance/GetOrganisationByIdEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/GetOrganisationByIdEndpoint.cs @@ -1,9 +1,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Governance; diff --git a/PostFundManagement.Api/Endpoints/Governance/GetOrganisationsEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/GetOrganisationsEndpoint.cs index c449184..1b3bd87 100644 --- a/PostFundManagement.Api/Endpoints/Governance/GetOrganisationsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/GetOrganisationsEndpoint.cs @@ -2,9 +2,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Governance; diff --git a/PostFundManagement.Api/Endpoints/Governance/GetPortfoliosEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/GetPortfoliosEndpoint.cs index 57e9c58..4539d37 100644 --- a/PostFundManagement.Api/Endpoints/Governance/GetPortfoliosEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/GetPortfoliosEndpoint.cs @@ -1,9 +1,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Governance; diff --git a/PostFundManagement.Api/Endpoints/Governance/GetProgrammesEndpoint.cs b/PostFundManagement.Api/Endpoints/Governance/GetProgrammesEndpoint.cs index 769bbc1..c6fddea 100644 --- a/PostFundManagement.Api/Endpoints/Governance/GetProgrammesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Governance/GetProgrammesEndpoint.cs @@ -1,9 +1,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Governance; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Governance; diff --git a/PostFundManagement.Api/Endpoints/Grants/CreateAwardEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/CreateAwardEndpoint.cs index 8546e7c..4d424cc 100644 --- a/PostFundManagement.Api/Endpoints/Grants/CreateAwardEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/CreateAwardEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/CreateBudgetEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/CreateBudgetEndpoint.cs index cef4d82..cbf7f9c 100644 --- a/PostFundManagement.Api/Endpoints/Grants/CreateBudgetEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/CreateBudgetEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/CreateContractEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/CreateContractEndpoint.cs index 68778af..8219ce7 100644 --- a/PostFundManagement.Api/Endpoints/Grants/CreateContractEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/CreateContractEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/ExecuteContractEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/ExecuteContractEndpoint.cs index baf3452..415c44b 100644 --- a/PostFundManagement.Api/Endpoints/Grants/ExecuteContractEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/ExecuteContractEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetAwardByIdEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetAwardByIdEndpoint.cs index 0735947..2a3cfd3 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetAwardByIdEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetAwardByIdEndpoint.cs @@ -1,9 +1,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetAwardsEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetAwardsEndpoint.cs index 8910dad..1c662ba 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetAwardsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetAwardsEndpoint.cs @@ -1,10 +1,10 @@ -using PostFundManagement.Domain; -using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; -using PostFundManagement.Domain.Models; -using PostFundManagement.Domain.Extensions; using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Grants; +using PostFundManagement.Domain; +using PostFundManagement.Domain.Abstractions; +using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetBudgetByIdEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetBudgetByIdEndpoint.cs index d7ae8f9..a856583 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetBudgetByIdEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetBudgetByIdEndpoint.cs @@ -1,9 +1,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetBudgetsEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetBudgetsEndpoint.cs index 11b2723..6a14b34 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetBudgetsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetBudgetsEndpoint.cs @@ -1,10 +1,10 @@ -using PostFundManagement.Domain; -using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; -using PostFundManagement.Domain.Models; -using PostFundManagement.Domain.Extensions; using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Grants; +using PostFundManagement.Domain; +using PostFundManagement.Domain.Abstractions; +using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetContractByIdEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetContractByIdEndpoint.cs index 4f7aed8..c8ce7e8 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetContractByIdEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetContractByIdEndpoint.cs @@ -1,9 +1,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Grants/GetContractsEndpoint.cs b/PostFundManagement.Api/Endpoints/Grants/GetContractsEndpoint.cs index a31a768..e962e8a 100644 --- a/PostFundManagement.Api/Endpoints/Grants/GetContractsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Grants/GetContractsEndpoint.cs @@ -2,9 +2,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Grants; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Grants; diff --git a/PostFundManagement.Api/Endpoints/Projects/CreateActivityEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/CreateActivityEndpoint.cs index 9c71643..ab01dee 100644 --- a/PostFundManagement.Api/Endpoints/Projects/CreateActivityEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/CreateActivityEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Projects; diff --git a/PostFundManagement.Api/Endpoints/Projects/CreateProjectEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/CreateProjectEndpoint.cs index 2e7ea7a..ad7fb88 100644 --- a/PostFundManagement.Api/Endpoints/Projects/CreateProjectEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/CreateProjectEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Projects; diff --git a/PostFundManagement.Api/Endpoints/Projects/GetActivitiesEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/GetActivitiesEndpoint.cs index 781f266..0030ffa 100644 --- a/PostFundManagement.Api/Endpoints/Projects/GetActivitiesEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/GetActivitiesEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Projects; diff --git a/PostFundManagement.Api/Endpoints/Projects/GetProjectByIdEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/GetProjectByIdEndpoint.cs index 234ec13..b2eccb2 100644 --- a/PostFundManagement.Api/Endpoints/Projects/GetProjectByIdEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/GetProjectByIdEndpoint.cs @@ -1,9 +1,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Projects; diff --git a/PostFundManagement.Api/Endpoints/Projects/GetProjectsEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/GetProjectsEndpoint.cs index 8dc79ad..a6aa318 100644 --- a/PostFundManagement.Api/Endpoints/Projects/GetProjectsEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/GetProjectsEndpoint.cs @@ -2,9 +2,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Projects; diff --git a/PostFundManagement.Api/Endpoints/Projects/UpdateProjectEndpoint.cs b/PostFundManagement.Api/Endpoints/Projects/UpdateProjectEndpoint.cs index a0185fb..a2cfbcb 100644 --- a/PostFundManagement.Api/Endpoints/Projects/UpdateProjectEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Projects/UpdateProjectEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Projects; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Projects; diff --git a/PostFundManagement.Api/Endpoints/Users/GetUsersEndpoint.cs b/PostFundManagement.Api/Endpoints/Users/GetUsersEndpoint.cs index 66e9064..f260647 100644 --- a/PostFundManagement.Api/Endpoints/Users/GetUsersEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Users/GetUsersEndpoint.cs @@ -2,9 +2,9 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Users; using PostFundManagement.Domain; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Models; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Users; diff --git a/PostFundManagement.Api/Endpoints/Users/SyncUserEndpoint.cs b/PostFundManagement.Api/Endpoints/Users/SyncUserEndpoint.cs index 63b42b2..3ac6553 100644 --- a/PostFundManagement.Api/Endpoints/Users/SyncUserEndpoint.cs +++ b/PostFundManagement.Api/Endpoints/Users/SyncUserEndpoint.cs @@ -1,8 +1,8 @@ using PostFundManagement.Application.Extensions; using PostFundManagement.Application.Services.Users; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; using PostFundManagement.Domain.Extensions; +using PostFundManagement.Domain.Security; namespace PostFundManagement.Api.Endpoints.Users; diff --git a/PostFundManagement.Api/Program.cs b/PostFundManagement.Api/Program.cs index 92f6836..2b79b04 100644 --- a/PostFundManagement.Api/Program.cs +++ b/PostFundManagement.Api/Program.cs @@ -1,5 +1,5 @@ -using PostFundManagement.Application.Api.Filters; using PostFundManagement.Application.Extensions; +using PostFundManagement.Application.Filters; using PostFundManagement.Domain.Extensions; using PostFundManagement.Domain.Health; using PostFundManagement.Domain.Mediator; diff --git a/PostFundManagement.Application/Extensions/Api.cs b/PostFundManagement.Application/Extensions/Api.cs index c9cbafd..b093b5a 100644 --- a/PostFundManagement.Application/Extensions/Api.cs +++ b/PostFundManagement.Application/Extensions/Api.cs @@ -1,7 +1,7 @@ using Asp.Versioning; using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api; -using PostFundManagement.Domain.Api.Configuration; +using PostFundManagement.Domain.Security; +using PostFundManagement.Domain.Security.Configuration; namespace PostFundManagement.Application.Extensions; diff --git a/PostFundManagement.Application/Extensions/Security.cs b/PostFundManagement.Application/Extensions/Security.cs index e76361d..8ce32ae 100644 --- a/PostFundManagement.Application/Extensions/Security.cs +++ b/PostFundManagement.Application/Extensions/Security.cs @@ -1,6 +1,6 @@ using PostFundManagement.Application.Services.Shared; -using PostFundManagement.Domain.Api.Configuration; -using PostFundManagement.Domain.Sdk; +using PostFundManagement.Domain.Security.Configuration; +using PostFundManagement.Domain.Security.Sdk; using PostFundManagement.Infrastructure.Database; namespace PostFundManagement.Application.Extensions; diff --git a/PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs b/PostFundManagement.Application/Filters/ActiveUserFilter.cs similarity index 96% rename from PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs rename to PostFundManagement.Application/Filters/ActiveUserFilter.cs index b8680b8..da1bf9a 100644 --- a/PostFundManagement.Application/Api/Filters/ActiveUserFilter.cs +++ b/PostFundManagement.Application/Filters/ActiveUserFilter.cs @@ -2,7 +2,7 @@ using static PostFundManagement.Application.Extensions.General; using static PostFundManagement.Domain.Extensions.Constants; -namespace PostFundManagement.Application.Api.Filters; +namespace PostFundManagement.Application.Filters; public sealed class ActiveUserFilter(IdentityService identityService) : IEndpointFilter { diff --git a/PostFundManagement.Application/Services/Shared/TokenService.cs b/PostFundManagement.Application/Services/Shared/TokenService.cs index aeb627a..f046b34 100644 --- a/PostFundManagement.Application/Services/Shared/TokenService.cs +++ b/PostFundManagement.Application/Services/Shared/TokenService.cs @@ -1,7 +1,6 @@ -using PostFundManagement.Domain.Abstractions; -using PostFundManagement.Domain.Api.Configuration; -using PostFundManagement.Domain.Api.Models; -using PostFundManagement.Domain.Sdk; +using PostFundManagement.Domain.Security.Configuration; +using PostFundManagement.Domain.Security.Models; +using PostFundManagement.Domain.Security.Sdk; namespace PostFundManagement.Application.Services.Shared; @@ -9,11 +8,11 @@ public sealed class TokenService(ISecurityConnectApi connectApi, IOptions> GenerateAsync(CancellationToken cancellationToken = default) + public async Task> GenerateAsync(CancellationToken cancellationToken = default) { try { - var request = new Domain.Api.Models.TokenRequest + var request = new Domain.Security.Models.TokenRequest { ClientId = clientSettings.ClientId, ClientSecret = clientSettings.ClientSecret, @@ -30,11 +29,11 @@ public sealed class TokenService(ISecurityConnectApi connectApi, IOptions(contentRaw); + var tokenResponse = JsonSerializer.Deserialize(contentRaw); return !string.IsNullOrWhiteSpace(tokenResponse?.AccessToken) ? Result.Ok(tokenResponse) - : Result.Fail(new Error("Authentication succeeded, but no access token was found in the response payload.")); + : Result.Fail(new Error("Authentication succeeded, but no access token was found in the response payload.")); } try diff --git a/PostFundManagement.Domain/Sdk/ISecurityConnectApi.cs b/PostFundManagement.Domain/Sdk/ISecurityConnectApi.cs deleted file mode 100644 index eac858b..0000000 --- a/PostFundManagement.Domain/Sdk/ISecurityConnectApi.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace PostFundManagement.Domain.Sdk; - -public interface ISecurityConnectApi -{ - [Post("/connect/token")] - ValueTask GetToken([Body(BodySerializationMethod.UrlEncoded)] Api.Models.TokenRequest request, CancellationToken cancellationToken = default); -} \ No newline at end of file diff --git a/PostFundManagement.Domain/Api/ApiVersionTargetAttribute.cs b/PostFundManagement.Domain/Security/ApiVersionTargetAttribute.cs similarity index 80% rename from PostFundManagement.Domain/Api/ApiVersionTargetAttribute.cs rename to PostFundManagement.Domain/Security/ApiVersionTargetAttribute.cs index 2e0d1d1..1fde059 100644 --- a/PostFundManagement.Domain/Api/ApiVersionTargetAttribute.cs +++ b/PostFundManagement.Domain/Security/ApiVersionTargetAttribute.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Domain.Api; +namespace PostFundManagement.Domain.Security; [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public sealed class ApiVersionTargetAttribute(int majorVersion) : Attribute diff --git a/PostFundManagement.Domain/Api/Configuration/MachineIdentity.cs b/PostFundManagement.Domain/Security/Configuration/MachineIdentity.cs similarity index 78% rename from PostFundManagement.Domain/Api/Configuration/MachineIdentity.cs rename to PostFundManagement.Domain/Security/Configuration/MachineIdentity.cs index 6811135..c740234 100644 --- a/PostFundManagement.Domain/Api/Configuration/MachineIdentity.cs +++ b/PostFundManagement.Domain/Security/Configuration/MachineIdentity.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Domain.Api.Configuration; +namespace PostFundManagement.Domain.Security.Configuration; public sealed class MachineIdentity { diff --git a/PostFundManagement.Domain/Api/Configuration/SecurityClientSettings.cs b/PostFundManagement.Domain/Security/Configuration/SecurityClientSettings.cs similarity index 81% rename from PostFundManagement.Domain/Api/Configuration/SecurityClientSettings.cs rename to PostFundManagement.Domain/Security/Configuration/SecurityClientSettings.cs index 0c383dc..777389d 100644 --- a/PostFundManagement.Domain/Api/Configuration/SecurityClientSettings.cs +++ b/PostFundManagement.Domain/Security/Configuration/SecurityClientSettings.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Domain.Api.Configuration; +namespace PostFundManagement.Domain.Security.Configuration; public sealed class SecurityClientSettings { diff --git a/PostFundManagement.Domain/Api/Configuration/SecuritySettings.cs b/PostFundManagement.Domain/Security/Configuration/SecuritySettings.cs similarity index 78% rename from PostFundManagement.Domain/Api/Configuration/SecuritySettings.cs rename to PostFundManagement.Domain/Security/Configuration/SecuritySettings.cs index 349a194..9ec93e7 100644 --- a/PostFundManagement.Domain/Api/Configuration/SecuritySettings.cs +++ b/PostFundManagement.Domain/Security/Configuration/SecuritySettings.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Domain.Api.Configuration; +namespace PostFundManagement.Domain.Security.Configuration; public sealed class SecuritySettings { diff --git a/PostFundManagement.Domain/Api/Models/TokenErrorResponse.cs b/PostFundManagement.Domain/Security/Models/TokenErrorResponse.cs similarity index 84% rename from PostFundManagement.Domain/Api/Models/TokenErrorResponse.cs rename to PostFundManagement.Domain/Security/Models/TokenErrorResponse.cs index 00c8e48..2ebf9c1 100644 --- a/PostFundManagement.Domain/Api/Models/TokenErrorResponse.cs +++ b/PostFundManagement.Domain/Security/Models/TokenErrorResponse.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Domain.Api.Models; +namespace PostFundManagement.Domain.Security.Models; public sealed class TokenErrorResponse { diff --git a/PostFundManagement.Domain/Api/Models/TokenRequest.cs b/PostFundManagement.Domain/Security/Models/TokenRequest.cs similarity index 89% rename from PostFundManagement.Domain/Api/Models/TokenRequest.cs rename to PostFundManagement.Domain/Security/Models/TokenRequest.cs index 6114592..4043bc6 100644 --- a/PostFundManagement.Domain/Api/Models/TokenRequest.cs +++ b/PostFundManagement.Domain/Security/Models/TokenRequest.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Domain.Api.Models; +namespace PostFundManagement.Domain.Security.Models; public sealed class TokenRequest { diff --git a/PostFundManagement.Domain/Api/Models/TokenResponse.cs b/PostFundManagement.Domain/Security/Models/TokenResponse.cs similarity index 86% rename from PostFundManagement.Domain/Api/Models/TokenResponse.cs rename to PostFundManagement.Domain/Security/Models/TokenResponse.cs index f79e736..420d19f 100644 --- a/PostFundManagement.Domain/Api/Models/TokenResponse.cs +++ b/PostFundManagement.Domain/Security/Models/TokenResponse.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Domain.Api.Models; +namespace PostFundManagement.Domain.Security.Models; public sealed class TokenResponse { diff --git a/PostFundManagement.Domain/Api/OpenApiBearerSecuritySchemeTransformer.cs b/PostFundManagement.Domain/Security/OpenApiBearerSecuritySchemeTransformer.cs similarity index 92% rename from PostFundManagement.Domain/Api/OpenApiBearerSecuritySchemeTransformer.cs rename to PostFundManagement.Domain/Security/OpenApiBearerSecuritySchemeTransformer.cs index d090efc..0c9a853 100644 --- a/PostFundManagement.Domain/Api/OpenApiBearerSecuritySchemeTransformer.cs +++ b/PostFundManagement.Domain/Security/OpenApiBearerSecuritySchemeTransformer.cs @@ -1,4 +1,4 @@ -namespace PostFundManagement.Domain.Api; +namespace PostFundManagement.Domain.Security; public sealed class OpenApiBearerSecuritySchemeTransformer : IOpenApiDocumentTransformer { diff --git a/PostFundManagement.Domain/Security/Sdk/ISecurityConnectApi.cs b/PostFundManagement.Domain/Security/Sdk/ISecurityConnectApi.cs new file mode 100644 index 0000000..080cb4a --- /dev/null +++ b/PostFundManagement.Domain/Security/Sdk/ISecurityConnectApi.cs @@ -0,0 +1,7 @@ +namespace PostFundManagement.Domain.Security.Sdk; + +public interface ISecurityConnectApi +{ + [Post("/connect/token")] + ValueTask GetToken([Body(BodySerializationMethod.UrlEncoded)] Models.TokenRequest request, CancellationToken cancellationToken = default); +} \ No newline at end of file