Merge branch 'main' into openapi

pagopa · Jan 31, 2024 · dd046c2 · dd046c2
2 parents b0732e6 + bcbe0b4
commit dd046c2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/apps/nextjs-website/CHANGELOG.md b/apps/nextjs-website/CHANGELOG.md
@@ -1,5 +1,11 @@
 # nextjs-website
 
+## 0.7.2
+
+### Patch Changes
+
+- b9b9a21: Fix XSS issue
+
 ## 0.7.1
 
 ### Patch Changes

diff --git a/apps/nextjs-website/package.json b/apps/nextjs-website/package.json
@@ -1,6 +1,6 @@
 {
  "name": "nextjs-website",
- "version": "0.7.1",
+ "version": "0.7.2",
  "private": true,
  "scripts": {
  "download-docs": "./scripts/fetch-docs.sh 61cec243ab8124c887da276f23c4973d9b6a22ab",

diff --git a/apps/nextjs-website/src/_contents/translations.ts b/apps/nextjs-website/src/_contents/translations.ts
@@ -320,7 +320,7 @@ export const translations = {
  confirmLogin: {
  title: 'Verifica la tua identità',
  body: (email: string) =>
- `Abbiamo inviato un codice di verifica a <b>${email}</b><br>Il codice scade tra 3 minuti.`,
+ `Abbiamo inviato un codice di verifica a ${email} Il codice scade tra 3 minuti.`,
  code: 'Codice di verifica',
  checkJunkMail:
  'Non hai ricevuto alcuna email? Controlla la posta indesiderata oppure',
@@ -380,7 +380,7 @@ export const translations = {
  confirmSignUp: {
  confirmSignUp: 'Conferma che sei tu',
  description: (email: string) =>
- `Abbiamo inviato una e-mail a <strong>${email}</strong>. <br/> Clicca sul bottone contenuto al suo interno per verificarla.`,
+ `Abbiamo inviato una e-mail a ${email}. Clicca sul bottone contenuto al suo interno per verificarla.`,
  didntReceiveEmail:
  "Non hai ricevuto l'e-mail? Controlla se nella posta indesiderata oppure",
  resendEmail: 'Reinvia e-mail',

diff --git a/apps/nextjs-website/src/components/organisms/Auth/ConfirmLogin.tsx b/apps/nextjs-website/src/components/organisms/Auth/ConfirmLogin.tsx
@@ -60,13 +60,9 @@ const ConfirmLogin = ({ email, onConfirmLogin }: confirmLoginProps) => {
  {confirmLogin.title}
  </Typography>
  {email && (
- <Typography
- variant='body2'
- mb={6}
- dangerouslySetInnerHTML={{
- __html: confirmLogin.body(email),
- }}
- />
+ <Typography variant='body2' mb={6}>
+ {confirmLogin.body(email)}
+ </Typography>
  )}
  <Typography
  variant='body1'

diff --git a/apps/nextjs-website/src/components/organisms/Auth/ConfirmSignUp.tsx b/apps/nextjs-website/src/components/organisms/Auth/ConfirmSignUp.tsx
@@ -34,13 +34,9 @@ const ConfirmSignUp = ({ email, onBack }: ConfirmSignUpProps) => {
  <Typography variant='h4' pt={5} mb={4} textAlign='center'>
  {confirmSignUp.confirmSignUp}
  </Typography>
- <Typography
- variant='body2'
- mb={2}
- dangerouslySetInnerHTML={{
- __html: confirmSignUp.description(email),
- }}
- />
+ <Typography variant='body2' mb={2}>
+ {confirmSignUp.description(email)}
+ </Typography>
  <ResendEmail email={email} text={confirmSignUp.didntReceiveEmail} />
  <Divider />
  <Stack

diff --git a/package-lock.json b/package-lock.json