Skip to content

Commit

Permalink
Sr at21 integration test config (#227)
Browse files Browse the repository at this point in the history 
* changed some configs

* minor cosmetic fixes

* small fixes

* added packages for application insight

* refactor program cs for readability and extensibility

* removed code that was moved to extension file from program cs

* bedre mock data

* bedre mockdata

* puttet defaultrights inni dto

* AT21 appsettings

* comments
  • Loading branch information
@simen-rekkedal
simen-rekkedal authored Apr 23, 2024
1 parent 9c9d005 commit e213d8d
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 64 deletions.
1 change: 1 addition & 0 deletions ...inn.Authentication.UI/Altinn.Authentication.UI.Core/SystemRegister/RegisteredSystemDTO.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ public class RegisteredSystemDTO
public string SystemTypeId { get; set; } = string.Empty;
public string SystemVendor { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public List<DefaultRightsDTO> DefaultRights { get; set; } = [];
}
57 changes: 42 additions & 15 deletions ...entication.UI/Altinn.Authentication.UI.Integration/SystemRegister/SystemRegisterClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,65 @@ private static async Task<List<RegisteredSystemDTO>> MockTestHelper()

RegisteredSystemDTO regsys1 = new()
{
SystemTypeId = "fancy_system_name",
SystemVendor = "Fancy System Name",
Description = "Vårt nye system som kan brukes til Alt."
SystemTypeId = "4human_hr_system_2024_2",
SystemVendor = "4Human",
Description = "4Humans HR system 2024 versjon.",
DefaultRights =
[
new DefaultRightsDTO { Right = "Sykemelding - Oppgi leder", ServiceProvider = "Arbeids- og velferdsetaten (NAV)" },
new DefaultRightsDTO { Right = "Søknad om sykepenger", ServiceProvider = "Arbeids- og velferdsetaten (NAV)" }
]

};

RegisteredSystemDTO regsys2 = new()
{
SystemTypeId = "bra_system_navn",
SystemVendor = "Bra System Navn",
Description = "Rapporter naboens feilparkering i gata"
SystemTypeId = "din_lokale_regnskapspartner",
SystemVendor = "Din Lokale Regnskapspartner AS",
Description = "Regnskap og Revisor tjenester",
DefaultRights =
[
new DefaultRightsDTO { Right = "MVA rapportering", ServiceProvider = "Skatteetaten" },
new DefaultRightsDTO { Right = "Årsregnskap", ServiceProvider = "Skatteetaten" }
]
};

RegisteredSystemDTO regsys3 = new()
{
SystemTypeId = "decent_system_name",
SystemVendor = "Decent System Name",
Description = "Rapporter helgeovertid"
SystemTypeId = "fiken_smabedrift",
SystemVendor = "Fiken",
Description = "Fiken Småbedrift pakken",
DefaultRights =
[
new DefaultRightsDTO { Right = "MVA rapportering", ServiceProvider = "Skatteetaten" },
new DefaultRightsDTO { Right = "Årsregnskap", ServiceProvider = "Skatteetaten" }
]
};

RegisteredSystemDTO regsys4 = new()
{
SystemTypeId = "awesome_system_name",
SystemVendor ="Awesome System Name",
Description = "Tja, det virker ihvertfall"
SystemTypeId = "visma_mva_pakke",
SystemVendor ="Visma",
Description = "Visma MVA rapportering",
DefaultRights =
[
new DefaultRightsDTO { Right = "MVA rapportering", ServiceProvider = "Skatteetaten" }
]

};

RegisteredSystemDTO regsys5 = new()
{
SystemTypeId = "cool_system_name",
SystemVendor ="Cool System Name",
Description = "Enda bedre enn konkurrentene"
SystemTypeId = "visma_skatt_totalpakke",
SystemVendor ="Visma",
Description = "Visma Totalpakke for alle skatterapporterings behov",
DefaultRights =
[
new DefaultRightsDTO { Right = "MVA rapportering", ServiceProvider = "Skatteetaten" },
new DefaultRightsDTO { Right = "Årsregnskap", ServiceProvider = "Skatteetaten" },
new DefaultRightsDTO { Right = "Bytte av Revisor", ServiceProvider = "Skatteetaten" },
new DefaultRightsDTO { Right = "Levere Lakselus", ServiceProvider = "Mattilsynet" },
]
};

List<RegisteredSystemDTO> theList = new()
Expand Down
74 changes: 37 additions & 37 deletions ...cation.UI/Altinn.Authentication.UI.Mocks/Mocks/SystemRegister/SystemRegisterClientMock.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,43 @@ private static async Task<List<RegisteredSystemDTO>> MockTestHelper()
{
await Task.Delay(250);

RegisteredSystemDTO regsys1 = new()
{
SystemTypeId = "fancy_system_name",
SystemVendor = "Fancy System Name",
Description = "Vårt nye system som kan brukes til Alt."
};

RegisteredSystemDTO regsys2 = new()
{
SystemTypeId = "bra_system_navn",
SystemVendor = "Bra System Navn",
Description = "Rapporter naboens feilparkering i gata"
};

RegisteredSystemDTO regsys3 = new()
{
SystemTypeId = "decent_system_name",
SystemVendor = "Decent System Name",
Description = "Rapporter helgeovertid"
};

RegisteredSystemDTO regsys4 = new()
{
SystemTypeId = "awesome_system_name",
SystemVendor = "Awesome System Name",
Description = "Tja, det virker ihvertfall"

};

RegisteredSystemDTO regsys5 = new()
{
SystemTypeId = "cool_system_name",
SystemVendor = "Cool System Name",
Description = "Enda bedre enn konkurrentene"
};

List<RegisteredSystemDTO> theList = new()
RegisteredSystemDTO regsys1 = new()
{
SystemTypeId = "4human_hr_system_2024_2",
SystemVendor = "4Human",
Description = "4Humans HR system 2024 versjon."
};

RegisteredSystemDTO regsys2 = new()
{
SystemTypeId = "din_lokale_regnskapspartner",
SystemVendor = "Din Lokale Regnskapspartner AS",
Description = "Regnskap og Revisor tjenester"
};

RegisteredSystemDTO regsys3 = new()
{
SystemTypeId = "fiken_smabedrift",
SystemVendor = "Fiken",
Description = "Fiken Småbedrift pakken"
};

RegisteredSystemDTO regsys4 = new()
{
SystemTypeId = "visma_mva_pakke",
SystemVendor = "Visma",
Description = "Visma MVA rapportering"

};

RegisteredSystemDTO regsys5 = new()
{
SystemTypeId = "visma_skatt_totalpakke",
SystemVendor = "Visma",
Description = "Visma Totalpakke for alle skatterapporterings behov"
};

List<RegisteredSystemDTO> theList = new()
{
regsys1,
regsys2,
Expand Down
12 changes: 0 additions & 12 deletions ...Altinn.Authentication.UI/Altinn.Authentication.UI/Controllers/SystemRegisterController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,4 @@ public async Task<ActionResult> GetListOfRegisteredSystems(CancellationToken can
return Ok(lista);
}

[HttpGet("product/{productId}")]
public async Task<ActionResult> GetDefaultRightsForProductName(string productId, CancellationToken cancellationToken = default)
{
List<DefaultRightsDTO> lista = new();
DefaultRightsDTO l1 = new() { Right = "Mva Registrering", ServiceProvider = "Skatteetaten" };
DefaultRightsDTO l2 = new() { Right = "Lønns Rapportering", ServiceProvider = "Skatteetaten" };
DefaultRightsDTO l3 = new() { Right = "Lakselus Rapportering", ServiceProvider = "Mattilsynet" };
lista.Add(l1);
lista.Add(l2);
lista.Add(l3);
return Ok(lista);
}
}
15 changes: 15 additions & 0 deletions bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI/appsettings.AT21.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"PlatformSettings": {
"ApiAuthenticationEndpoint": "https://platform.at21.altinn.cloud/authentication/api/v1/",
"ApiProfileEndpoint": "https://platform.at21.altinn.cloud/profile/api/v1/",
"OpenIdWellKnownEndpoint": "https://platform.at21.altinn.cloud/authentication/api/v1/openid/"
},
"GeneralSettings": {
"FrontendBaseUrl": "https://authn.ui.at21.altinn.cloud",
"Hostname": "at21.altinn.cloud",
"UseMockData": false
},
"KeyVaultSettings": {
"SecretUri": "https://altinn-at21-authnui-kv.vault.azure.net/"
}
}

0 comments on commit e213d8d

Please sign in to comment.