Skip to content

Commit

Permalink
Merge branch 'master' into cleanup/jwtdecoder-autoconfiguration
Browse files Browse the repository at this point in the history
  • Loading branch information
rfc3092 committed Jan 16, 2025
2 parents f24ad20 + f4ad3bd commit 59a7e06
Show file tree
Hide file tree
Showing 85 changed files with 201 additions and 185 deletions.
4 changes: 2 additions & 2 deletions apps/adresse-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service

spring:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ALTINN_URL: https://platform.tt02.altinn.no
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
MASKINPORTEN_CLIENT_JWK: dummy
MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
Expand All @@ -22,8 +22,8 @@ spring:
baseline-on-migrate: true
url: jdbc:postgresql://localhost:5432/testnav-altinn3-tilgang-local
user: testnav-altinn3-tilgang-local
password: ${sm://testnav-altinn3-tilgang-local}
password: ${sm\://testnav-altinn3-tilgang-local}
r2dbc:
url: r2dbc:postgresql://localhost:5432/testnav-altinn3-tilgang-local
username: testnav-altinn3-tilgang-local
password: ${sm://testnav-altinn3-tilgang-local}
password: ${sm\://testnav-altinn3-tilgang-local}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand All @@ -8,4 +8,4 @@ spring:
oauth2:
resourceserver:
aad:
accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
accepted-audience: ${sm\://azure-app-client-id}, api://${sm\://azure-app-client-id}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
4 changes: 2 additions & 2 deletions apps/bruker-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
CRYPTOGRAPHY_SECRET: DUMMY SUPER SECRET CRYPTOGRAPHY KEY THAT IS NOT SECURE
JWT_SECRET: DUMMY SUPER SECRET JWT KEY THAT IS NOT SECURE

Expand Down
4 changes: 2 additions & 2 deletions apps/budpro-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,17 @@ public List<TpOrdning> getTp() {
}

public enum TpYtelseType {
AFP,
ALDER,
UFORE,
GJENLEVENDE,
BARN,
AFP,
BETINGET_TP,
GJENLEVENDE,
LIVSVARIG_AFP,
OPPSATT_BTO_PEN,
OVERGANGSTILLEGG,
PAASLAGSPENSJON,
SAERALDER,
UFORE,
UKJENT
}

Expand Down
10 changes: 5 additions & 5 deletions apps/dolly-backend/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

dolly:
client:
Expand All @@ -14,7 +14,7 @@ spring:
datasource:
url: jdbc:postgresql://localhost:5432/testnav-dolly-backend-local
username: testnav-dolly-backend-local
password: ${sm://testnav-dolly-backend-local}
password: ${sm\://testnav-dolly-backend-local}

management:
endpoints:
Expand All @@ -30,8 +30,8 @@ management:
azure:
app:
client:
id: ${sm://azure-app-client-id}
secret: ${sm://azure-app-client-secret}
id: ${sm\://azure-app-client-id}
secret: ${sm\://azure-app-client-secret}

open:
search:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const Bestillingsveileder = ({ error, sendBestilling }) => {

if (!location.state) {
location.state = {
antall: 1,
antall: '1',
identtype: 'FNR',
mal: null,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { UseFormReturn } from 'react-hook-form/dist/types'
import { yupResolver } from '@hookform/resolvers/yup'

const initialValues = {
antall: 1,
antall: '1',
identtype: Options('identtype')[0].value,
mal: null as unknown as string,
}
Expand Down Expand Up @@ -99,7 +99,13 @@ export const NyIdent = ({ brukernavn, onAvbryt, onSubmit }: NyBestillingProps) =
options={Options('identtype')}
isClearable={false}
/>
<FormTextInput name="antall" label="Antall" type="number" size="medium" />
<FormTextInput
name="antall"
label="Antall"
type="number"
size="medium"
onBlur={(event) => formMethods.setValue('antall', event?.target?.value || '1')}
/>
</div>
<div className="ny-bestilling-form_maler">
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,10 @@ export const AlderspensjonForm = () => {
adresseUtenTilDato ||
_.get(formMethods.getValues(), 'pdldata.person.bostedsadresse')?.reduce((prev, curr) => {
if (
!prev.gyldigTilOgMed ||
!curr.gyldigTilOgMed ||
curr.gyldigTilOgMed?.isValid?.() === false ||
prev.gyldigTilOgMed?.isValid?.() === false
!prev?.gyldigTilOgMed ||
!curr?.gyldigTilOgMed ||
curr?.gyldigTilOgMed?.isValid?.() === false ||
prev?.gyldigTilOgMed?.isValid?.() === false
)
return null
return isAfter(parseISO(prev.gyldigTilOgMed), parseISO(curr.gyldigTilOgMed)) ? prev : curr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
position: relative;
}


.navds-date .rdp-button {
position: unset;
.dolly-form-input.small {
margin-right: 0;
}

&& .navds-button {
.navds-date .rdp-button {
position: unset;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const YtelseForm = ({ path, header, initialYtelser }: any) => {
<FormSelect
name={`${path}.type`}
label="Ytelse"
size="xsmall"
size="medium"
isClearable={false}
options={Options('tjenestepensjonYtelseType')}
/>
Expand Down
6 changes: 6 additions & 0 deletions apps/dolly-frontend/src/main/js/src/service/SelectOptions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,12 @@ const selectOptions = {
{ value: 'GJENLEVENDE', label: 'Gjenlevendepensjon' },
{ value: 'BARN', label: 'Barnepensjon' },
{ value: 'AFP', label: 'AFP-pensjon' },
{ value: 'BETINGET_TP', label: 'Betinget TP' },
{ value: 'LIVSVARIG_AFP ', label: 'Livsvarig AFP' },
{ value: 'OPPSATT_BTO_PEN', label: 'Oppsatt bruttopensjon' },
{ value: 'OVERGANGSTILLEGG', label: 'Overgangstillegg' },
{ value: 'PAASLAGSPENSJON', label: 'Påslagspensjon' },
{ value: 'SAERALDER', label: 'Særalder' },
],

tpOrdninger: [],
Expand Down
6 changes: 3 additions & 3 deletions apps/dolly-frontend/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
POST_LOGOUT_REDIRECT_URI: 'http://localhost:3000/login'
REDIS_HOST: localhost
TOKEN_X_ISSUER: dummy
Expand All @@ -17,7 +17,7 @@ spring:
aad:
authorization-grant-type: authorization_code
redirect-uri: 'http://localhost:3000/login/oauth2/code/{registrationId}'
scope: openid, offline_access, ${sm://azure-app-client-id}/.default
scope: openid, offline_access, ${sm\://azure-app-client-id}/.default
client-id: ${AZURE_APP_CLIENT_ID}
client-secret: ${AZURE_APP_CLIENT_SECRET}
provider:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
4 changes: 2 additions & 2 deletions apps/miljoer-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Loading

0 comments on commit 59a7e06

Please sign in to comment.