Skip to content
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

pto-admin -> poao-admin #1872

Merged
merged 9 commits into from
Mar 24, 2025
Merged

pto-admin -> poao-admin #1872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6920afa
Gå over til poao-admin
tu55eladd Mar 20, 2025
876e0da
Merge branch 'dev' into poao-admin
tu55eladd Mar 20, 2025
714f591
Update src/main/java/no/nav/pto/veilarbportefolje/admin/v2/AdminV2Con…
tu55eladd Mar 20, 2025
eaf5076
Update src/main/java/no/nav/pto/veilarbportefolje/admin/v1/AdminContr…
tu55eladd Mar 20, 2025
baa5d2e
Krev at admin-brukere er internbrukere
tu55eladd Mar 20, 2025
e2970e4
Merge branch 'poao-admin' of github.com:tu55eladd/veilarbportefolje i…
tu55eladd Mar 20, 2025
54ba011
Merge branch 'dev' into poao-admin
tu55eladd Mar 24, 2025
67f623a
sjekk på internbruker i AdminV2Controller
Mar 24, 2025
f3a670e
Merge branch 'dev' into poao-admin
JulieHillRoa Mar 24, 2025
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
3 changes: 0 additions & 3 deletions .nais/application/application-config-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ spec:
- application: veilarbpersonflate
namespace: poao
cluster: dev-gcp
- application: pto-admin
namespace: pto
cluster: dev-fss
- application: azure-token-generator
namespace: nais
cluster: dev-gcp
Expand Down
3 changes: 0 additions & 3 deletions .nais/application/application-config-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ spec:
- application: veilarbpersonflate
namespace: poao
cluster: prod-gcp
- application: pto-admin
namespace: pto
cluster: prod-fss
outbound:
external:
- host: team-obo-unleash-api.nav.cloud.nais.io
Expand Down
6 changes: 3 additions & 3 deletions .nais/application/gcp/application-config-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ spec:
- application: veilarbpersonflate
namespace: poao
cluster: dev-gcp
- application: pto-admin
namespace: pto
cluster: dev-fss
- application: poao-admin
namespace: poao
cluster: dev-gcp
- application: azure-token-generator
namespace: nais
cluster: dev-gcp
Expand Down
6 changes: 3 additions & 3 deletions .nais/application/gcp/application-config-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ spec:
namespace: obo
- application: veilarbpersonflate
namespace: poao
- application: pto-admin
namespace: pto
cluster: prod-fss
- application: poao-admin
namespace: poao
cluster: prod-gcp
- application: inngar
namespace: dab
cluster: prod-gcp
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ den gamle.
#### Fremgangsmåte

1. Gjør endringer i `src/main/resources/opensearch_settings.json`, commit, push og deploy
2. Gå til pto-admin i riktig miljø (dev/prod) og velg "Veilarbportefolje" i dropdown
2. Gå til poao-admin i riktig miljø (dev/prod) og velg "Veilarbportefolje" i dropdown
3. Utfør en "Hovedindeksering". Bruk referansen i response til å følge med i loggene. Denne jobben gjør oppdatering av
alle brukere i eksisterende indeks. Formålet er å se hvor lang tid det tar å indeksere alle brukerne.
4. Når man oppretter ny indeks (neste steg), så vil ikke endringer som kommer underveis
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/no/nav/pto/veilarbportefolje/admin/v1/AdminController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;

import static no.nav.pto.veilarbportefolje.auth.AuthUtils.erSystemkallFraAzureAd;
import static no.nav.pto.veilarbportefolje.auth.AuthUtils.hentApplikasjonFraContex;
import static no.nav.pto.veilarbportefolje.opensearch.OpensearchConfig.BRUKERINDEKS_ALIAS;
import static no.nav.pto.veilarbportefolje.util.SecureLog.secureLog;
Expand All @@ -37,8 +36,8 @@
@RequiredArgsConstructor
@Tag(name = "Admin", description = "Admin-funksjonalitet som ikke er tilgjengelig for vanlige brukere. Funksjonaliteten er kun tilgjengelig for medlemmer av applikasjonens forvaltningsteam.")
public class AdminController {
private final String PTO_ADMIN = new DownstreamApi(EnvironmentUtils.isProduction().orElse(false) ?
"prod-fss" : "dev-fss", "pto", "pto-admin").toString();
private final String POAO_ADMIN = new DownstreamApi(EnvironmentUtils.isProduction().orElse(false) ?
"prod-gcp" : "dev-gcp", "poao", "poao-admin").toString();
private final AktorClient aktorClient;
private final OppfolgingAvsluttetService oppfolgingAvsluttetService;
private final HovedIndekserer hovedIndekserer;
Expand Down Expand Up @@ -230,10 +229,10 @@ public void testHentUnderOppfolging() {
}

private void sjekkTilgangTilAdmin() {
boolean erSystemBrukerFraAzure = erSystemkallFraAzureAd(authContextHolder);
boolean erPtoAdmin = PTO_ADMIN.equals(hentApplikasjonFraContex(authContextHolder));
boolean erInternBrukerFraAzure = authContextHolder.erInternBruker();
boolean erPoaoAdmin = POAO_ADMIN.equals(hentApplikasjonFraContex(authContextHolder));

if (erPtoAdmin && erSystemBrukerFraAzure) {
if (erPoaoAdmin && erInternBrukerFraAzure) {
return;
}
throw new ResponseStatusException(HttpStatus.FORBIDDEN);
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/no/nav/pto/veilarbportefolje/admin/v2/AdminV2Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
@RequiredArgsConstructor
@Tag(name = "Admin V2", description = "Admin-funksjonalitet V2 som ikke er tilgjengelig for vanlige brukere. Funksjonaliteten er kun tilgjengelig for medlemmer av applikasjonens forvaltningsteam.")
public class AdminV2Controller {
private final String PTO_ADMIN = new DownstreamApi(EnvironmentUtils.isProduction().orElse(false) ?
"prod-fss" : "dev-fss", "pto", "pto-admin").toString();
private final String POAO_ADMIN = new DownstreamApi(EnvironmentUtils.isProduction().orElse(false) ?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Får ikke lov å kommentere der nede når det ikke er noen endring der, men når denne er endret til POAO_ADMIN, hva sjekker den da på i sjekken på linje 55 i denne filen?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Her tror jeg at jeg bare godkjente en suggestion på github fra slovrid (?), så har ikke åpna editoren og sett at det feila

"prod-gcp" : "dev-gcp", "poao", "poao-admin").toString();
private final AktorClient aktorClient;
private final OpensearchIndexer opensearchIndexer;
private final AuthContextHolder authContextHolder;
Expand All @@ -51,10 +51,10 @@ public String indeksAktoerId(@RequestBody AdminIndexAktorRequest adminIndexAktor
}

private void sjekkTilgangTilAdmin() {
boolean erSystemBrukerFraAzure = erSystemkallFraAzureAd(authContextHolder);
boolean erPtoAdmin = PTO_ADMIN.equals(hentApplikasjonFraContex(authContextHolder));
boolean erInternBrukerFraAzure = authContextHolder.erInternBruker();
boolean erPoaoAdmin = POAO_ADMIN.equals(hentApplikasjonFraContex(authContextHolder));

if (erPtoAdmin && erSystemBrukerFraAzure) {
if (erPoaoAdmin && erInternBrukerFraAzure) {
return;
}
throw new ResponseStatusException(HttpStatus.FORBIDDEN);
Expand Down