Merge branch 'master' of https://github.com/navikt/testnorge into feature/kdi-institusjonsopphold-frontend

Author: betsytraran

.github/workflows/app.dolly-auth-local.yml

@@ -0,0 +1,23 @@
+name: dolly-auth-local
+
+on:
+  push:
+    paths:
+      - plugins/**
+      - .nais/dolly-auth-local.yaml
+      - .github/workflows/app.dolly-auth-lokal.yml
+
+jobs:
+  deploy:
+    name: Deploy dolly-auth-local
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: nais/deploy/actions/deploy@fa754451577294aae42872a69b888b3470478ec1 # v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: ".nais/dolly-auth-local.yml"

.github/workflows/app.team-dolly-lokal-app.yml

@@ -5,6 +5,7 @@ on:
     paths:
       - plugins/**
       - .nais/team-dolly-lokal-app.yml
+      - .nais/dolly-lokal-auth.yaml
       - .github/workflows/app.team-dolly-lokal-app.yml
 
 jobs:

.nais/dolly-auth-local.yml

@@ -0,0 +1,30 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: "dolly-auth-local"
+  namespace: "dolly"
+spec:
+  image: "europe-north1-docker.pkg.dev/nais-management-233d/nais/localauth:latest"
+  port: 8080
+  replicas:
+    min: 1
+    max: 1
+  liveness:
+    path: "/internal/healthz"
+  readiness:
+    path: "/internal/healthz"
+  resources:
+    limits:
+      memory: "256Mi"
+    requests:
+      cpu: "10m"
+      memory: "32Mi"
+  ingresses:
+    - https://dolly-auth-local.intern.dev.nav.no
+  azure:
+    application:
+      enabled: true
+      allowAllUsers: true
+  env:
+    - name: LOCALAUTH_PUBLIC_URL
+      value: "https://dolly-auth-local.intern.dev.nav.no"

.nais/dolly-local-auth.yml

@@ -0,0 +1,30 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: "dolly-local-auth"
+  namespace: "dolly"
+spec:
+  image: "europe-north1-docker.pkg.dev/nais-management-233d/nais/localauth:latest"
+  port: 8080
+  replicas:
+    min: 1
+    max: 1
+  liveness:
+    path: "/internal/healthz"
+  readiness:
+    path: "/internal/healthz"
+  resources:
+    limits:
+      memory: "256Mi"
+    requests:
+      cpu: "10m"
+      memory: "32Mi"
+  ingresses:
+    - https://dolly-local-auth.intern.dev.nav.no
+  azure:
+    application:
+      enabled: true
+      allowAllUsers: true
+  env:
+    - name: LOCALAUTH_PUBLIC_URL
+      value: "https://dolly-local-auth.intern.dev.nav.no"

.nais/localauth.yml

@@ -0,0 +1,30 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: "localauth"
+  namespace: "dolly"
+spec:
+  image: "europe-north1-docker.pkg.dev/nais-management-233d/nais/localauth:latest"
+  port: 8080
+  replicas:
+    min: 1
+    max: 1
+  liveness:
+    path: "/internal/healthz"
+  readiness:
+    path: "/internal/healthz"
+  resources:
+    limits:
+      memory: "256Mi"
+    requests:
+      cpu: "10m"
+      memory: "32Mi"
+  ingresses:
+    - https://localauth-dolly.intern.dev.nav.no
+  azure:
+    application:
+      enabled: true
+      allowAllUsers: true
+  env:
+    - name: LOCALAUTH_PUBLIC_URL
+      value: "https://localauth-dolly.intern.dev.nav.no"

apps/altinn3-tilgang-service/config.dev.yml

@@ -27,12 +27,14 @@ spec:
   accessPolicy:
     inbound:
       rules:
+        - application: dolly-backend
+        - application: dolly-backend-dev
         - application: dolly-frontend-dev
-        - application: testnav-dolly-proxy
-          cluster: dev-fss
         - application: dolly-texas-proxy
         - application: team-dolly-lokal-app
         - application: testnav-bruker-service-dev
+        - application: testnav-dolly-proxy
+          cluster: dev-fss
         - application: testnav-oversikt-frontend
         - application: testnorge-profil-api-dev
     outbound:

apps/altinn3-tilgang-service/config.prod.yml

@@ -27,19 +27,23 @@ spec:
   accessPolicy:
     inbound:
       rules:
+        - application: dolly-backend
+          cluster: dev-gcp
+        - application: dolly-backend-dev
+          cluster: dev-gcp
         - application: dolly-frontend
           cluster: dev-gcp
         - application: dolly-idporten
           cluster: dev-gcp
-        - application: team-dolly-lokal-app
+        - application: dolly-texas-proxy
           cluster: dev-gcp
-        - application: testnav-oversikt-frontend
+        - application: team-dolly-lokal-app
           cluster: dev-gcp
         - application: testnav-altinn3-tilgang-proxy
           cluster: dev-gcp
         - application: testnav-dolly-proxy
           cluster: dev-fss
-        - application: dolly-texas-proxy
+        - application: testnav-oversikt-frontend
           cluster: dev-gcp
     outbound:
       external:

apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/Altinn3TilgangServiceApplicationStarter.java

@@ -28,4 +28,4 @@ public static void main(String[] args) {
                         new NaisPkcs8ConversionInitializer())
                 .run(args);
     }
-}
+}

apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/controller/v2/BrukerController.java

@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.Collections;
@@ -35,17 +36,24 @@ public class BrukerController {
 
     @PostMapping
     public Mono<BrukerDTO> createBruker(
-            @RequestBody BrukerDTO brukerDTO
-    ) {
+            @RequestBody BrukerDTO brukerDTO) {
+
         return validateService.validateOrganiasjonsnummerAccess(brukerDTO.organisasjonsnummer())
                 .then(userService.create(brukerDTO))
                 .map(User::toDTO);
     }
 
+    @GetMapping("/alle")
+    public Flux<BrukerDTO> getAlleBrukere() {
+
+        return userService.getAllUsers()
+                .map(User::toDTO);
+    }
+
     @GetMapping
     public Mono<List<BrukerDTO>> getBrukere(
-            @RequestParam String organisasjonsnummer
-    ) {
+            @RequestParam String organisasjonsnummer) {
+
         return validateService.validateOrganiasjonsnummerAccess(organisasjonsnummer)
                 .then(userService.getUserFromOrganisasjonsnummer(organisasjonsnummer))
                 .map(User::toDTO)
@@ -55,41 +63,42 @@ public Mono<List<BrukerDTO>> getBrukere(
     @GetMapping("/{id}")
     public Mono<BrukerDTO> getBruker(
             @PathVariable String id,
-            @RequestHeader(UserConstant.USER_HEADER_JWT) String jwt
-    ) {
+            @RequestHeader(UserConstant.USER_HEADER_JWT) String jwt) {
+
         return jwtService.verify(jwt, id)
                 .then(userService.getUser(id))
                 .map(User::toDTO);
     }
 
     @PutMapping()
     public Mono<BrukerDTO> updateBruker(
-            @RequestBody BrukerDTO bruker
-    ) {
+            @RequestBody BrukerDTO bruker) {
+
         return validateService.validateOrganiasjonsnummerAccess(bruker.organisasjonsnummer())
                 .then(userService.updateUser(bruker))
                 .map(User::toDTO);
     }
 
     @GetMapping("/brukernavn/{brukernavn}")
     public Mono<String> getBrukernavn(
-            @PathVariable String brukernavn
-    ) {
+            @PathVariable String brukernavn) {
+
         return userService.getUserByBrukernavn(brukernavn)
                 .map(User::getBrukernavn);
     }
 
     @DeleteMapping("/{id}")
     public Mono<Void> deleteBruker(
             @PathVariable String id,
-            @RequestHeader(UserConstant.USER_HEADER_JWT) String jwt
-    ) {
+            @RequestHeader(UserConstant.USER_HEADER_JWT) String jwt) {
+
         return jwtService.verify(jwt, id)
                 .then(userService.delete(id));
     }
 
     @PostMapping("/{id}/token")
     public Mono<String> getToken(@PathVariable String id) {
+
         return userService.getUser(id, true)
                 .doOnNext(user -> validateService.validateOrganiasjonsnummerAccess(user.getOrganisasjonsnummer()))
                 .flatMap(jwtService::getToken);

apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/service/v2/UserService.java

@@ -11,15 +11,17 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
 
 @Service("userServiceV2")
 @RequiredArgsConstructor
 public class UserService {
+
     private final CryptographyService cryptographyService;
-    private final UserRepository repository;
+    private final UserRepository userRepository;
     private final GetAuthenticatedUserId getAuthenticatedUserId;
 
     public Mono<User> create(BrukerDTO bruker) {
@@ -35,7 +37,7 @@ public Mono<User> create(BrukerDTO bruker) {
                     entity.setNew(true);
                     return entity;
                 })
-                .flatMap(repository::save)
+                .flatMap(userRepository::save)
                 .map(User::new);
 
     }
@@ -47,17 +49,22 @@ public Mono<User> getUserFromOrganisasjonsnummer(String organisasjonsnummer) {
                 .flatMap(this::getUser);
     }
 
+    public Flux<User> getAllUsers() {
+
+        return userRepository.findAll()
+                .map(User::new);
+    }
 
     public Mono<User> getUser(String id) {
         return getUser(id, false);
     }
 
     public Mono<User> getUser(String id, boolean loggedIn) {
-        return repository.findById(id).flatMap(entity -> {
+        return userRepository.findById(id).flatMap(entity -> {
             if (loggedIn) {
                 entity.setNew(false);
                 entity.setSistInnlogget(LocalDateTime.now());
-                return repository.save(entity);
+                return userRepository.save(entity);
             }
             return Mono.just(entity);
         }).map(User::new);
@@ -67,26 +74,26 @@ public Mono<User> updateUser(BrukerDTO bruker) {
         return getAuthenticatedUserId
                 .call()
                 .map(userId -> cryptographyService.createId(userId, bruker.organisasjonsnummer()))
-                .flatMap(repository::findById)
+                .flatMap(userRepository::findById)
                 .switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.NOT_FOUND, "Bruker ikke funnet.")))
                 .flatMap(entity -> {
                     entity.setEpost(bruker.epost());
-                    return repository.save(entity);
+                    return userRepository.save(entity);
                 })
                 .map(User::new);
     }
 
     public Mono<User> getUserByBrukernavn(String username) {
-        return repository.findByBrukernavn(username).map(User::new);
+        return userRepository.findByBrukernavn(username).map(User::new);
     }
 
     public Mono<Void> delete(String id) {
-        return repository.deleteById(id);
+        return userRepository.deleteById(id);
     }
 
     private Mono<Void> validateCreateUser(String userId, String representing) {
         var id = cryptographyService.createId(userId, representing);
-        return repository.existsById(id)
+        return userRepository.existsById(id)
                 .doOnNext(exists -> {
                     if (Boolean.TRUE.equals(exists)) {
                         throw new UserAlreadyExistsException(id);