Merge branch 'main' into fix/CVE-2025-66478

Author: SmirlakisParis

package.json

@@ -5,7 +5,7 @@
 	"type": "module",
 	"author": "Paraskevas (Paris) SMYRLAKIS",
 	"scripts": {
-		"dev": "next dev --turbopack",
+		"dev": "next dev --turbopack -H 0.0.0.0",
 		"build": "next build --turbopack",
 		"start": "next start",
 		"format": "prettier --write .",

src/components/atoms/AdditionalInfoActions.tsx

@@ -149,9 +149,7 @@ export default function AdditionalInfoActions({
 								disabled={disabled || busy !== null}
 								onClick={provideExtrasSameDevice}
 							>
-								{busy === 'provide'
-									? 'Starting…'
-									: 'Provide additional qualifications (Same Device)'}
+								{busy === 'provide' ? 'Starting…' : 'Provide additional qualifications'}
 							</Button>
 						)}
 						{/* Only show QR Code button on desktop */}

src/components/atoms/ApplyCrossDeviceButton.tsx

@@ -38,7 +38,7 @@ export default function ApplyCrossDeviceButton({ jobId }: { jobId: string }) {
 			color="primary"
 			startIcon={!pending ? <QrCode2OutlinedIcon /> : undefined}
 		>
-			{pending ? <CircularProgress size={20} /> : 'Apply (cross device)'}
+			{pending ? <CircularProgress size={20} /> : 'Apply'}
 		</Button>
 	);
 }

src/components/atoms/ApplySameDeviceButton.tsx

@@ -53,7 +53,7 @@ export default function ApplySameDeviceButton({ jobId }: { jobId: string }) {
 			color="secondary" // your yellow/orange
 			startIcon={!pending ? <AccountBalanceWalletOutlinedIcon /> : undefined}
 		>
-			{pending ? <CircularProgress size={20} /> : 'Apply (same device)'}
+			{pending ? <CircularProgress size={20} /> : 'Apply'}
 		</Button>
 	);
 }

src/components/atoms/EmployeeIssuanceActions.tsx

@@ -98,7 +98,7 @@ export default function EmployeeIssuanceActions({ applicationId }: { application
 						disabled={busy}
 						onClick={() => issueEmployeeCredential('same-device')}
 					>
-						{busy ? 'Issuing…' : 'Issue Employee ID (Same Device)'}
+						{busy ? 'Issuing…' : 'Issue Employee ID'}
 					</Button>
 				)}
 				{/* Only show QR Code button on desktop */}

src/components/atoms/LogoBox.tsx

@@ -8,32 +8,32 @@ export default function LogoBox() {
 				mb: 2,
 				bgcolor: 'white',
 				p: 2,
-				pb: '25px',
 				border: 1,
 				borderColor: 'divider',
 				display: 'flex',
 				flexDirection: 'row',
-				gap: 3,
+				gap: 2,
 				alignItems: 'center',
 				justifyContent: 'center',
+				overflow: 'hidden',
 			}}
 		>
 			<Image
 				src="/logo-european-commission.svg"
 				alt="European Commission"
-				width={180}
-				height={80}
+				width={160}
+				height={70}
 				priority
-				style={{ objectFit: 'contain', marginLeft: '-16px' }}
+				style={{ objectFit: 'contain' }}
 			/>
-			<Box sx={{ width: '2px', height: '26px', bgcolor: 'primary.main', marginTop: '20px' }} />
+			<Box sx={{ width: '2px', height: '40px', bgcolor: 'primary.main' }} />
 			<Image
 				src="/eudi-wallet-official.svg"
 				alt="EU Digital Identity Wallet"
-				width={140}
-				height={50}
+				width={130}
+				height={45}
 				priority
-				style={{ objectFit: 'contain', marginTop: '33px' }}
+				style={{ objectFit: 'contain' }}
 			/>
 		</Box>
 	);

src/components/atoms/SigningActions.tsx

@@ -147,7 +147,7 @@ export default function SigningActions({
 						disabled={busy}
 						onClick={startCrossDevice}
 					>
-						Sign contract (Cross Device)
+						Sign contract
 					</Button>
 				)}
 				{/* Only show Same Device button on mobile */}
@@ -160,7 +160,7 @@ export default function SigningActions({
 						disabled={busy}
 						onClick={startSameDevice}
 					>
-						{busy ? 'Starting…' : 'Sign contract (Same Device)'}
+						{busy ? 'Starting…' : 'Sign contract'}
 					</Button>
 				)}
 			</Stack>

src/components/atoms/TaxResidencyActions.tsx

@@ -111,7 +111,7 @@ export default function TaxResidencyActions({ applicationId }: { applicationId:
 						disabled={busy !== null}
 						onClick={provideTaxResidencySameDevice}
 					>
-						{busy === 'same' ? 'Starting…' : 'Provide Tax Residency (Same Device)'}
+						{busy === 'same' ? 'Starting…' : 'Provide Tax Residency'}
 					</Button>
 				)}
 				{/* Only show QR Code button on desktop */}

src/components/organisms/VacancyApplicationSection.tsx

@@ -2,6 +2,8 @@
 
 import AccountBalanceWalletIcon from '@mui/icons-material/AccountBalanceWallet';
 import { Box, Chip, Stack, Typography } from '@mui/material';
+import { useState, useEffect } from 'react';
+import { isMobile } from 'react-device-detect';
 
 import ApplyCrossDeviceButton from '@/components/atoms/ApplyCrossDeviceButton';
 import ApplySameDeviceButton from '@/components/atoms/ApplySameDeviceButton';
@@ -20,6 +22,12 @@ export default function VacancyApplicationSection({
 	vacancyId,
 	requiredCredentials,
 }: VacancyApplicationSectionProps) {
+	const [mounted, setMounted] = useState(false);
+
+	useEffect(() => {
+		setMounted(true);
+	}, []);
+
 	// Filter out basic credentials (NONE, PID)
 	const optionalCredentials = requiredCredentials.filter(
 		(cred) => cred !== 'NONE' && cred !== 'PID',
@@ -64,8 +72,10 @@ export default function VacancyApplicationSection({
 			)}
 
 			<Stack spacing={2}>
-				<ApplySameDeviceButton jobId={vacancyId} />
-				<ApplyCrossDeviceButton jobId={vacancyId} />
+				{/* Only show Same Device button on mobile */}
+				{mounted && isMobile && <ApplySameDeviceButton jobId={vacancyId} />}
+				{/* Only show Cross Device button on desktop */}
+				{mounted && !isMobile && <ApplyCrossDeviceButton jobId={vacancyId} />}
 			</Stack>
 		</Box>
 	);

src/core/domain/services/verification/CredentialVerificationService.ts

@@ -5,6 +5,7 @@ import { CredentialType } from '@/core/domain/value-objects';
 import { Inject } from '@/core/infrastructure/config/container';
 import { createLogger } from '@/core/infrastructure/logging/Logger';
 import { VpTokenRequest } from '@/core/shared/types/types/eudi';
+import { env } from '@env';
 
 import { DiplomaQueryService } from './queries/DiplomaQueryService';
 import { PidQueryService } from './queries/PidQueryService';
@@ -83,19 +84,9 @@ export class CredentialVerificationService {
 		};
 
 		// Add redirect URI for same-device flow
-		// NOTE: EUDI Verifier is rejecting redirect templates with InvalidWalletResponseTemplate error
-		// Disabling same-device flow redirect until verifier backend is fixed
-		// See: https://github.com/eu-digital-identity-wallet/eudi-srv-web-verifier-endpoint-23220-4-kt/issues/XXX
 		if (options.sameDeviceFlow) {
-			this.logger.warn(
-				'Same-device flow requested but redirect template disabled due to verifier bug',
-				{
-					applicationId: options.applicationId,
-				},
-			);
-			// Uncomment when verifier supports redirect templates:
-			// const base = env.NEXT_PUBLIC_APP_URI.replace(/\/+$/, '');
-			// payload.wallet_response_redirect_uri_template = `${base}/applications/${options.applicationId}/callback?response_code={response_code}`;
+			const base = env.NEXT_PUBLIC_APP_URI.replace(/\/+$/, '');
+			payload.wallet_response_redirect_uri_template = `${base}/applications/${options.applicationId}/callback?response_code={RESPONSE_CODE}`;
 		}
 
 		return payload;