Merge remote-tracking branch 'origin/develop' into feature/VDX-298

# Conflicts:
#	packages/oid4vci-demo-frontend/src/configs/account.banqup.json

Author: sanderPostma

packages/oid4vci-demo-frontend/public/banqup_verify_identity_id_card.svg

@@ -8,6 +8,8 @@
   "credentials_success_right_pane_button_caption": "Go to {{verifierUrlCaption}}",
   "credentials_success_right_pane_paragraph": "Your {{credentialName}} credential has been\r\nsuccessfully issued to you.\r\n\nYou can use it to verify your identity whenever you\r\ninteract with other parties.",
   "credentials_success_right_pane_title": "Congratulations!",
+  "credentials_success_right_pane_verified_account_paragraph": "\r\n\n\nThe Verified {{credentialName}} credential proofs that UnifiedPost\nhas been able to verify that you have access to the  e-mail address you provided.\r\n\nYou can use this credential to login to your UnifiedPost account.",
+  "credentials_success_right_pane_verified_account_title": "You have received your Verified {{name}} credential",
   "credentials_success_right_pane_valid_id_title": "You have received your Verified {{name}} credential",
   "credentials_success_right_pane_valid_id_paragraph": "\r\n\n\nThe Verified {{credentialName}} credential proofs that\nUnifiedPost has been able to verify that you have a valid ID document\nand that you are linked to this valid ID document.\r\n\nYou can use this credential to manage your UnifiedPost account.",
   "credentials_success_right_pane_registered_company_paragraph": "\r\n\n\nThe Verified {{credentialName}} credential proofs that\nUnifiedPost has been able to verify that your company is a registered company.\r\n\nYou can use this credential to transact your UnifiedPost account.",
@@ -44,6 +46,7 @@
   "sharing_data_company_fill_out_right_pane_paragraph": "Please fill in and review your company details.",
   "sharing_data_right_pane_title": "Provide your data",
   "manual_fill_data_right_pane_title": "Manually fill out details",
+  "manual_fill_data_company_right_pane_title_tell_us_more_company": "Tell us more about your company",
   "manual_fill_data_right_pane_title_banqup": "Personal details",
   "manual_fill_data_company_right_pane_title": "Company details",
   "action_open_wallet_caption": "Open in wallet",
@@ -64,9 +67,10 @@
   "ssi_information_request_page_form_place_of_birth_label": "Place of birth",
   "ssi_information_request_page_form_date_of_birth_label": "Date of birth",
   "ssi_information_request_page_form_terms_and_conditions_label": "I agree to the <a href=\"{{url}}\" target=\"_blank\">terms & conditions</a>",
-  "ssi_information_request_page_form_tax_registration_number_label": "TRN",
+  "ssi_information_request_page_form_tax_registration_number_label": "Tax Registration number TRN",
   "ssi_information_request_page_form_contact_first_name_label": "Contact first name",
   "ssi_information_request_page_form_contact_last_name_label": "Contact last name",
+  "ssi_information_request_page_form_contact_bsn_label": "Contact BSN",
   "coc_sharing_data_right_pane_title": "Share your details",
   "coc_sharing_data_right_pane_top_paragraph": "Almost there! Please provide any missing details if necessary.",
   "coc_credential_verify_request_right_pane_bottom_paragraph": "Scan this QR code using your wallet's QR scanner. When you already on your phone open your wallet by clicking on the Open in wallet button.",
@@ -90,7 +94,7 @@
   "paragraph_scan_this_qr": "Scan this QR code using your wallet's QR scanner. When you already on your phone open your wallet by clicking on the Open in wallet button.",
   "paragraph_confirm_email": "Confirm your account by entering the 5 digit confirmation code from the email.",
   "loading_verify_company_information_caption": "Verifying the company information",
-  "loading_verify_identity_information_caption": "Verifying your identity.",
+  "loading_verify_identity_information_caption": "Verifying your identity",
   "loading_verify_information_description": "Please wait, you will automatically go to the next step.",
   "welcome_title": "Welcome!",
   "welcome_page_confirm_account_subtitle": "We’ll first need to confirm your account",

packages/oid4vci-demo-frontend/public/banqup_verify_identity_progress_bar.svg

@@ -7,6 +7,8 @@
   "credentials_success_right_pane_button_caption": "Ga naar {{verifierUrlCaption}}",
   "credentials_success_right_pane_paragraph": "Je {{credentialName}} credential is met succes aan je uitgereikt.\n\nU kunt het gebruiken om je identiteit te verifiëren wanneer je interactie heeft met andere partijen.",
   "credentials_success_right_pane_title": "Gefeliciteerd!",
+  "credentials_success_right_pane_verified_account_paragraph": "\r\n\n\nThe Verified {{credentialName}} credential proofs that UnifiedPost\nhas been able to verify that you have access to the  e-mail address you provided.\r\n\nYou can use this credential to login to your UnifiedPost account.",
+  "credentials_success_right_pane_verified_account_title": "You have received your Verified {{name}} credential",
   "credentials_success_right_pane_valid_id_title": "U heeft je geverifieerde {{name}} credential ontvangen",
   "credentials_success_right_pane_valid_id_paragraph": "\r\n\n\nDe geverifieerde {{credentialName}} credential bewijst dat\nUnifiedPost heeft kunnen verifiëren dat je een geldig identiteitsbewijs hebt\nn dat je aan dit geldige identiteitsbewijs bent gekoppeld.",
   "credentials_success_right_pane_registered_company_paragraph": "\n\n\nDe geverifieerde {{credentialName}} credential bewijst dat\nUnifiedPost heeft kunnen verifiëren dat je bedrijf een geregistreerd bedrijf is.\r\n\nU kunt deze credential gebruiken om je UnifiedPost-account af te handelen.",
@@ -45,6 +47,7 @@
   "sharing_data_company_fill_out_right_pane_paragraph": "Vul je bedrijfsgegevens in en controleer deze.",
   "sharing_data_right_pane_title": "Deel je gegevens",
   "manual_fill_data_right_pane_title": "Handmatig gegevens invullen",
+  "manual_fill_data_company_right_pane_title_tell_us_more_company": "Vertel ons meer over uw bedrijf",
   "manual_fill_data_right_pane_title_banqup": "Persoonlijke gegevens",
   "manual_fill_data_company_right_pane_title": "Bedrijf details",
   "sharing_data_success_right_pane_button_caption": "Volgende",
@@ -66,9 +69,10 @@
   "ssi_information_request_page_form_place_of_birth_label": "Geboorteplaats",
   "ssi_information_request_page_form_date_of_birth_label": "Geboortedatum",
   "ssi_information_request_page_form_terms_and_conditions_label": "Ik ga akkoord met de <a href=\"{{url}}\" target=\"_blank\">algemene voorwaarden</a>",
-  "ssi_information_request_page_form_tax_registration_number_label": "RSIN",
+  "ssi_information_request_page_form_tax_registration_number_label": "Belastingnummer RSIN",
   "ssi_information_request_page_form_contact_first_name_label": "Contact voornaam",
   "ssi_information_request_page_form_contact_last_name_label": "Contact achternaam",
+  "ssi_information_request_page_form_contact_bsn_label": "Contact BSN",
   "ssi_information_request_page_form_vat_number_label": "BTW identificatienummer",
   "coc_sharing_data_right_pane_title": "Deel je gegevens",
   "coc_sharing_data_right_pane_top_paragraph": "Bijna klaar! Verstrek alstublieft ontbrekende gegevens indien nodig.",

packages/oid4vci-demo-frontend/public/locales/development/en/translation.json

@@ -72,7 +72,7 @@ const Form: FC<Props> = (props: Props): ReactElement => {
                 return <InputField
                     label={field.label ? t(field.label) ?? undefined : undefined}
                     type={field.type}
-                    readonly={field.readonly || formInitData?.[field.id] !== undefined}
+                    readonly={field.readonly || formInitData?.[field.id] !== undefined || Boolean(field.readonlyWhenAbsentInPayload)}
                     defaultValue={defaultValue}
                     customValidation={field.customValidation ? new RegExp(field.customValidation) : undefined}
                     onChange={async (value: FormFieldValue): Promise<void> => onChangeValue(value, field.key)}

packages/oid4vci-demo-frontend/public/locales/development/nl/translation.json

@@ -1,9 +1,10 @@
 {
   "general": {
-    "credentialName": "Account credential",
+    "credentialName": "Account",
     "oid4vpAgentBaseUrl": "https://agent.banqup.demo.sphereon.com",
     "oid4vciAgentBaseUrl": "https://agent.banqup.demo.sphereon.com",
-    "downloadUrl": "https://agent.demo.sphereon.com/#/download"
+    "downloadUrl": "https://agent.demo.sphereon.com/#/download",
+    "verifierUrl": "https:/account.banqup.demo.sphereon.com"
   },
   "pages": {
     "downloadSphereonWallet": {
@@ -130,11 +131,20 @@
       }
     },
     "issueSuccess": {
-      "photoRight": "bank/undraw_messenger_re_8bky_grey.svg",
-      "backgroundColor": "#01224B",
+      "leftPaneWidth": "40%",
+      "backgroundColor": "#0E0B31",
       "logo": {
-        "src": "bank/guest_credential.svg"
+        "src": "banqup/logo.svg"
       },
+      "rightPaneTitle": "credentials_success_right_pane_verified_account_title",
+      "rightPaneParagraph": "credentials_success_right_pane_verified_account_paragraph",
+      "rightPaneButtonCaption": "label_continue",
+      "rightPaneTextHeight": "40%",
+      "rightPaneTextMarginTop": "0",
+      "rightPaneTextMarginBottom": "10%",
+      "rightPaneButtonWidth": "135px",
+      "rightPaneButtonHeight": "48px",
+      "rightPaneButtonStepId": "toCompanyFlow",
       "mobile": {
       }
     },
@@ -270,7 +280,13 @@
         {
           "id": "issueSuccess",
           "operation": "navigate",
-          "path": "https://banqup.demo.sphereon.com"
+          "path": "/credentials/issue/success",
+          "nextId": "toIdentityFlow"
+        },
+        {
+          "id": "toIdentityFlow",
+          "operation": "navigate",
+          "path": "https://identity.banqup.demo.sphereon.com"
         },
         {
           "id": "downloadSphereonWallet",

packages/oid4vci-demo-frontend/src/components/Form/index.tsx

@@ -1,6 +1,6 @@
 {
   "general": {
-    "credentialName": "Identity credential",
+    "credentialName": "Identity",
     "oid4vpAgentBaseUrl": "https://agent.banqup.demo.sphereon.com",
     "oid4vciAgentBaseUrl": "https://agent.banqup.demo.sphereon.com",
     "downloadUrl": "https://agent.banqup.demo.sphereon.com/#/download",
@@ -239,6 +239,14 @@
       "rightPaneButtonStepId": "toCompanyFlow",
       "mobile": {
       }
+    },
+    "verifyIdentity": {
+      "leftPaneWidth": "40%",
+      "sharing_data_right_pane_title": "loading_verify_identity_information_caption",
+      "backgroundColor": "#0E0B31",
+      "logo": {
+        "src": "banqup/logo.svg"
+      }
     }
   },
   "routes": [
@@ -257,6 +265,12 @@
           "id": "welcome",
           "operation": "navigate",
           "path": "/welcome",
+          "nextId": "verifyIdentity"
+        },
+        {
+          "id": "verifyIdentity",
+          "operation": "navigate",
+          "path": "/verify/identity",
           "nextId": "infoRequest"
         },
         {

packages/oid4vci-demo-frontend/src/configs/account.banqup.json

@@ -123,8 +123,8 @@
     },
     "infoRequest": {
       "leftPaneWidth": "40%",
-      "sharing_data_right_pane_title": "manual_fill_data_right_pane_title_banqup",
-      "sharing_data_right_pane_paragraph": "sharing_data_fill_out_right_pane_paragraph",
+      "sharing_data_right_pane_title": "manual_fill_data_company_right_pane_title_tell_us_more_company",
+      "sharing_data_right_pane_paragraph": "sharing_data_company_fill_out_right_pane_paragraph",
       "primaryButtonResourceId": "label_continue",
       "primaryButtonManualResourceId": "label_continue",
       "backgroundColor": "#0E0B31",
@@ -162,6 +162,16 @@
             "required": true
           }
         ],
+        [
+          {
+            "id": "bsnNumber",
+            "key": "bsn",
+            "label": "ssi_information_request_page_form_contact_bsn_label",
+            "type": "text",
+            "required": true,
+            "readonlyWhenAbsentInPayload": true
+          }
+        ],
         [
           {
             "id": "companyEmailAddress",

packages/oid4vci-demo-frontend/src/configs/identity.banqup.json

@@ -91,6 +91,18 @@ export interface SSILoadingPageConfig extends PageConfig {
     },
 }
 
+export interface SSIIdentityVerificationPageConfig extends PageConfig {
+    leftPaneWidth?: string
+    backgroundColor?: string
+    logo?: ImageProperties
+    sharing_data_right_pane_title: string
+    mobile?: {
+        logo?: ImageProperties
+        backgroundColor?: string
+        image?: string
+    },
+}
+
 export interface SSIWelcomePageConfig extends PageConfig {
     leftPaneWidth?: string
     backgroundColor?: string
@@ -130,12 +142,12 @@ export interface SSICredentialIssuedSuccessPageConfig extends PageConfig {
     photoLeft?: string
     photoRight: string
     rightPaneButtonStepId?: string
-    rightPaneTitle: string
-    rightPaneParagraph: string
-    rightPaneButtonCaption: string
-    rightPaneTextHeight: string
-    rightPaneTextMarginTop: string
-    rightPaneTextMarginBottom: string
+    rightPaneTitle?: string
+    rightPaneParagraph?: string
+    rightPaneButtonCaption?: string
+    rightPaneTextHeight?: string
+    rightPaneTextMarginTop?: string
+    rightPaneTextMarginBottom?: string
     rightPaneButtonWidth?: string
     rightPaneButtonHeight?: string
 }
@@ -208,6 +220,7 @@ export interface DataFormElement {
     key: string
     type: HTMLInputTypeAttribute
     required?: boolean
+    readonlyWhenAbsentInPayload?: boolean
     defaultValue?: FormFieldValue
     label?: string
     labelUrl?: string
@@ -390,6 +403,7 @@ export interface VCIConfigPages {
     SSICredentialsLandingPage: SSICredentialsLandingPageConfig
     SSILoadingPage: SSILoadingPageConfig
     SSIWelcomePage: SSIWelcomePageConfig
+    SSIIdentityVerificationPage: SSIIdentityVerificationPageConfig
 }
 
 export interface VCIConfigRoute {

packages/oid4vci-demo-frontend/src/configs/legal-entity.banqup.json

@@ -69,8 +69,8 @@ const SSICredentialIssuedSuccessPage: React.FC = () => {
                             flexGrow: 1,
                             textAlign: 'center'
                         }}
-                        title={t(pageConfig.rightPaneTitle, {name: generalConfig.credentialName}).split('\n')}
-                        lines={t(pageConfig.rightPaneParagraph, {credentialName: generalConfig.credentialName}).split('\r\n')}/>
+                        title={t(pageConfig.rightPaneTitle ?? 'credentials_success_right_pane_title', {name: generalConfig.credentialName}).split('\n')}
+                        lines={t(pageConfig.rightPaneParagraph ?? 'credentials_success_right_pane_paragraph', {credentialName: generalConfig.credentialName}).split('\r\n')}/>
                     <div style={{
                         width: '342px',
                         height: '397px',
@@ -80,7 +80,7 @@ const SSICredentialIssuedSuccessPage: React.FC = () => {
                     </div>
                     <div style={{display: 'flex',flexDirection: 'row'}}>
                         <SSIPrimaryButton
-                            caption={t(pageConfig.rightPaneButtonCaption, {verifierUrlCaption: generalConfig.verifierUrlCaption ?? 'start'})}
+                            caption={t(pageConfig.rightPaneButtonCaption ?? 'credentials_success_right_pane_button_caption', {verifierUrlCaption: generalConfig.verifierUrlCaption ?? 'start'})}
                             style={{
                                width: pageConfig.rightPaneButtonWidth ?? '300px',
                                height: pageConfig.rightPaneButtonHeight ?? '42px'