Skip to content

just two minor nitpicks #1719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simen-rekkedal wants to merge 1 commit into
base: main
Choose a base branch
from
Open

just two minor nitpicks #1719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Authentication/Controllers/RequestSystemUserController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public async Task<ActionResult<RequestSystemResponse>> CreateRequest([FromBody]
{
string platform = _generalSettings.PlatformEndpoint;
OrganisationNumber? vendorOrgNo = RetrieveOrgNoFromToken();
if (vendorOrgNo is null || vendorOrgNo == OrganisationNumber.Empty())
if (vendorOrgNo is null || vendorOrgNo == OrganisationNumber.Empty())
{
return ProblemInstance.Create(Altinn.Authentication.Core.Problems.Problem.Vendor_Orgno_NotFound).ToActionResult();
}
Expand All @@ -112,7 +112,7 @@ public async Task<ActionResult<RequestSystemResponse>> CreateRequest([FromBody]
OrgNo = createRequest.PartyOrgNo,
SystemId = createRequest.SystemId,
};

SystemUserInternalDTO? existing = await _systemUserService.GetSystemUserByExternalRequestId(externalRequestId, cancellationToken);
if (existing is not null)
{
Expand All @@ -129,15 +129,15 @@ public async Task<ActionResult<RequestSystemResponse>> CreateRequest([FromBody]

// This is a new Request
response = await _requestSystemUser.CreateRequest(createRequest, vendorOrgNo);
if (response.IsSuccess)

if (!response.IsSuccess)
{
string fullCreatedUri = platform + CREATEDURIMIDSECTION + response.Value.Id;
response.Value.ConfirmUrl = CONFIRMURL1 + _generalSettings.HostName + CONFIRMURL2 + response.Value.Id + REPORTEESELECTIONPARAMETER;
return Created(fullCreatedUri, response.Value);
return response.Problem.ToActionResult();
}

return response.Problem.ToActionResult();
string fullCreatedUri = platform + CREATEDURIMIDSECTION + response.Value.Id;
response.Value.ConfirmUrl = CONFIRMURL1 + _generalSettings.HostName + CONFIRMURL2 + response.Value.Id + REPORTEESELECTIONPARAMETER;
return Created(fullCreatedUri, response.Value);
}

/// <summary>
Expand Down
10 changes: 0 additions & 10 deletions src/Authentication/Services/SystemUserService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,16 +683,6 @@ public async Task<Result<bool>> ValidateAccessPackages(List<AccessPackage> acces
return Problem.AccessPackage_NotFound;
}

//if (systemInfo.AccessPackages.Count == 0)
//{
// return Problem.AccessPackage_NotFound;
//}

//if (accessPackages.Count > systemInfo.AccessPackages.Count)
//{
// return Problem.AccessPackage_NotFound;
//}

List<string> notFoundPackages = [];
List<string> notDelegablePackages = [];
foreach (AccessPackage accessPackage in accessPackages)
Expand Down
Loading