diff --git a/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Core/SystemRegister/RegisteredSystemDTO.cs b/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Core/SystemRegister/RegisteredSystemDTO.cs index 980048e1..dfd3527c 100644 --- a/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Core/SystemRegister/RegisteredSystemDTO.cs +++ b/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Core/SystemRegister/RegisteredSystemDTO.cs @@ -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 DefaultRights { get; set; } = []; } \ No newline at end of file diff --git a/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Integration/SystemRegister/SystemRegisterClient.cs b/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Integration/SystemRegister/SystemRegisterClient.cs index 06f15f4a..e4711496 100644 --- a/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Integration/SystemRegister/SystemRegisterClient.cs +++ b/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Integration/SystemRegister/SystemRegisterClient.cs @@ -10,38 +10,65 @@ private static async Task> 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 theList = new() diff --git a/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Mocks/Mocks/SystemRegister/SystemRegisterClientMock.cs b/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Mocks/Mocks/SystemRegister/SystemRegisterClientMock.cs index b3b95997..13a8b22a 100644 --- a/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Mocks/Mocks/SystemRegister/SystemRegisterClientMock.cs +++ b/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI.Mocks/Mocks/SystemRegister/SystemRegisterClientMock.cs @@ -8,43 +8,43 @@ private static async Task> 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 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 theList = new() { regsys1, regsys2, diff --git a/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI/Controllers/SystemRegisterController.cs b/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI/Controllers/SystemRegisterController.cs index 8953db48..59b636b7 100644 --- a/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI/Controllers/SystemRegisterController.cs +++ b/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI/Controllers/SystemRegisterController.cs @@ -27,16 +27,4 @@ public async Task GetListOfRegisteredSystems(CancellationToken can return Ok(lista); } - [HttpGet("product/{productId}")] - public async Task GetDefaultRightsForProductName(string productId, CancellationToken cancellationToken = default) - { - List 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); - } } diff --git a/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI/appsettings.AT21.json b/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI/appsettings.AT21.json new file mode 100644 index 00000000..178fe035 --- /dev/null +++ b/bff/src/Altinn.Authentication.UI/Altinn.Authentication.UI/appsettings.AT21.json @@ -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/" + } +} \ No newline at end of file