Redirect av personer født før 1963 i BFF #1629
Draft
Conversation
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
bjorngi
force-pushed
the
redirect-1963-bff
branch
from
fbfe8c8 to
8ed509b
Compare
bjorngi
force-pushed
the
redirect-1963-bff
branch
from
4e62e98 to
a3fbd74
Compare
bjorngi
commented
Jan 13, 2025
| @@ -174,11 +306,13 @@ app.get('/pensjon/kalkulator/veileder?*', (_req: Request, res: Response) => { | |||
| } | |||
| }) | |||
|
|
|||
| app.get('*', (_req: Request, res: Response) => { | |||
| app.get('*', redirect163Middleware, async (_req: Request, res: Response) => { | |||
There was a problem hiding this comment.
Sjekker redirect163Middleware før man blir servert kalkulator
bjorngi
commented
Jan 13, 2025
| - host: pensjonskalkulator-unleash-api.nav.cloud.nais.io | ||
| inbound: | ||
| rules: | ||
| - application: wonderwalled-idporten # only in dev |
There was a problem hiding this comment.
Tillater å kunne hente ut idporten token fra https://wonderwalled-idporten.intern.dev.nav.no/api/obo?aud=dev-gcp:pensjonskalkulator:pensjonskalkulator-frontend
bjorngi
commented
Jan 13, 2025
Comment on lines
+32
to
+59
| const env = ensureEnv({ | ||
| unleashUrl: 'UNLEASH_SERVER_API_URL', | ||
| unleashToken: 'UNLEASH_SERVER_API_TOKEN', | ||
| unleashEnv: 'UNLEASH_SERVER_API_ENV', | ||
| detaljertKalkulatorUrl: 'DETALJERT_KALKULATOR_URL', | ||
| }) | ||
|
|
||
| export const isFoedtFoer1963 = (foedselsdato: string): boolean => { | ||
| const LAST_DAY_1962 = new Date(1962, 11, 31) | ||
| return ( | ||
| isBefore(new Date(foedselsdato), LAST_DAY_1962) || | ||
| isSameDay(new Date(foedselsdato), LAST_DAY_1962) | ||
| ) | ||
| } | ||
|
|
||
| const unleash = initialize({ | ||
| url: `${env.unleashUrl}/api`, | ||
| appName: 'pensjonskalkulator-frontend', | ||
| environment: env.unleashEnv, | ||
| customHeaders: { | ||
| Authorization: env.unleashToken, | ||
| }, | ||
| }) | ||
|
|
||
| unleash.on('synchronized', () => { | ||
| logger.info('Unleash synchronized') | ||
| }) | ||
|
|
There was a problem hiding this comment.
Setter opp unleash for BFF
bjorngi
commented
Jan 13, 2025
Comment on lines
+114
to
+119
| app.get('/internal/health/liveness', (_req: Request, res: Response) => { | ||
| res.sendStatus(200) | ||
| }) | ||
|
|
||
| app.get('/internal/health/readiness', (_req: Request, res: Response) => { | ||
| res.sendStatus(200) |
There was a problem hiding this comment.
Flytter health endepunkter slik at de ikke spammer loggene
bjorngi
commented
Jan 13, 2025
Comment on lines
+144
to
+163
| app.use( | ||
| '/pensjon/kalkulator/redirect/detaljert-kalkulator', | ||
| express.urlencoded({ extended: true }), | ||
| async (req: Request, res: Response) => { | ||
| if (AUTH_PROVIDER === 'idporten') { | ||
| res.redirect(`${env.detaljertKalkulatorUrl}`) | ||
| return | ||
| } else if (AUTH_PROVIDER === 'azure') { | ||
| const { fnr } = req.body | ||
| const url = new URL(env.detaljertKalkulatorUrl) | ||
| const loggedOnName = await getUsernameFromAzureToken(req) | ||
|
|
||
| url.searchParams.append('_brukerId', fnr) | ||
| url.searchParams.append('_loggedOnName', loggedOnName) | ||
| res.redirect(url.toString()) | ||
| return | ||
| } | ||
| } | ||
| ) | ||
|
|
There was a problem hiding this comment.
Nytt endepunkt for å kunne redirigere til detaljert kalkulator (både del A og del B)
bjorngi
commented
Jan 13, 2025
| interface IKalkulatorRedirectProps { | ||
| fnr: string | ||
| } | ||
| export const KalkulatorRedirect: React.FC<IKalkulatorRedirectProps> = ({ |
There was a problem hiding this comment.
Komponent for å redirigere med fnr (trengs for å kunne sende til Del B)
bjorngi
commented
Jan 13, 2025
Comment on lines
210
to
215
| } else if ( | ||
| personData?.foedselsdato && | ||
| isFoedtFoer1963(personData?.foedselsdato) && | ||
| veilederBorgerFnr | ||
| ) { | ||
| return <KalkulatorRedirect fnr={veilederBorgerFnr} /> |
There was a problem hiding this comment.
Sende til Del B for veileder
bjorngi
commented
Jan 13, 2025
| @@ -5,8 +5,7 @@ export const externalUrls = { | |||
| dinPensjonBeholdning: 'https://www.nav.no/pensjon/opptjening/nb/', | |||
| dinPensjonEndreSoeknad: | |||
| 'https://www.nav.no/pensjon/selvbetjening/alderspensjon/endringssoknad', | |||
| detaljertKalkulator: | |||
| 'https://www.nav.no/pselv/simulering.jsf?simpleMode=true', | |||
| detaljertKalkulator: '/pensjon/kalkulator/redirect/detaljert-kalkulator', | |||
There was a problem hiding this comment.
Bruk eget endepunkt i BFF for redirigering til detaljert kalkulator
bjorngi
commented
Jan 13, 2025
src/router/loaders.tsx
Outdated
| @@ -48,52 +40,6 @@ export const directAccessGuard = async () => { | |||
| } | |||
|
|
|||
| // //////////////////////////////////////// | |||
There was a problem hiding this comment.
Fjern bruk at feature toggle i kalkulator klient (gjøres i BFF)
bjorngi
commented
Jan 13, 2025
| @@ -0,0 +1,16 @@ | |||
| export const ensureEnv = <T extends Record<string, string>>(variables: T) => { | |||
There was a problem hiding this comment.
Stopper applikasjonen å starte dersom miljøvariabler mangler i BFF
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.