-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Koblet på tilgangskontroll + omskriving av plukk oppgave.
- Loading branch information
Showing
10 changed files
with
169 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
app/src/main/kotlin/no/nav/aap/oppgave/plukk/PlukkOppgaveService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
package no.nav.aap.oppgave.plukk | ||
|
||
import no.nav.aap.komponenter.dbconnect.DBConnection | ||
import no.nav.aap.komponenter.httpklient.httpclient.tokenprovider.OidcToken | ||
import no.nav.aap.oppgave.OppgaveRepository | ||
import no.nav.aap.oppgave.filter.FilterRepository | ||
import tilgang.Operasjon | ||
import tilgang.TilgangRequest | ||
|
||
class PlukkOppgaveService(val connection: DBConnection) { | ||
|
||
fun plukkNesteOppgave(filterId: Long, ident: String, token: OidcToken): NesteOppgaveDto? { | ||
val oppgaveRepo = OppgaveRepository(connection) | ||
val filterRepo = FilterRepository(connection) | ||
val filter = filterRepo.hentFilter(filterId) | ||
if (filter == null) { | ||
throw IllegalArgumentException("Finner ikke filter med id: $filterId") | ||
} | ||
val nesteOppgave = oppgaveRepo.finnNesteOppgave(filter) | ||
if (nesteOppgave != null) { | ||
val tilgangRequest = TilgangRequest( | ||
saksnummer = nesteOppgave.saksnummer!!, | ||
behandlingsreferanse = nesteOppgave.behandlingRef!!.toString(), | ||
avklaringsbehovKode = nesteOppgave.avklaringsbehovKode, | ||
operasjon = Operasjon.SAKSBEHANDLE | ||
) | ||
if (TilgangGateway.harTilgang(tilgangRequest, token)) { | ||
|
||
oppgaveRepo.reserverOppgave(nesteOppgave.oppgaveId, ident) | ||
} | ||
} | ||
return nesteOppgave | ||
} | ||
|
||
} |
43 changes: 43 additions & 0 deletions
43
app/src/main/kotlin/no/nav/aap/oppgave/plukk/TilgangGateway.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package no.nav.aap.oppgave.plukk | ||
|
||
import tilgang.TilgangRequest | ||
import tilgang.TilgangResponse | ||
import no.nav.aap.komponenter.httpklient.httpclient.ClientConfig | ||
import no.nav.aap.komponenter.httpklient.httpclient.RestClient | ||
import no.nav.aap.komponenter.httpklient.httpclient.post | ||
import no.nav.aap.komponenter.httpklient.httpclient.request.PostRequest | ||
import no.nav.aap.komponenter.httpklient.httpclient.tokenprovider.OidcToken | ||
import no.nav.aap.komponenter.httpklient.httpclient.tokenprovider.azurecc.OnBehalfOfTokenProvider | ||
import no.nav.aap.komponenter.config.requiredConfigForKey | ||
import java.net.URI | ||
|
||
object TilgangGateway { | ||
private val baseUrl = URI.create(requiredConfigForKey("integrasjon.tilgang.url")) | ||
private val config = ClientConfig(scope = requiredConfigForKey("integrasjon.tilgang.scope")) | ||
|
||
private val client = RestClient.withDefaultResponseHandler( | ||
config = config, | ||
tokenProvider = OnBehalfOfTokenProvider, | ||
) | ||
|
||
fun harTilgang(body: TilgangRequest, currentToken: OidcToken): Boolean { | ||
val respons = query( | ||
body, | ||
currentToken = currentToken | ||
) | ||
return respons.tilgang | ||
} | ||
|
||
private fun query(body: TilgangRequest, currentToken: OidcToken): TilgangResponse { | ||
val httpRequest = PostRequest( | ||
body = body, | ||
currentToken = currentToken | ||
) | ||
return requireNotNull( | ||
client.post<_, TilgangResponse>( | ||
uri = baseUrl.resolve("/tilgang"), | ||
request = httpRequest | ||
) | ||
) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.