Skip to content

Commit 996ff10

Browse files
committed
Fixes #927
1 parent a999bdd commit 996ff10

6 files changed

Lines changed: 60 additions & 7 deletions

File tree

myconext-server/src/main/resources/application.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ host_headers:
9191
service_desk: servicedesk.test2.eduid.nl
9292
mijn_ediuid: mijn.test2.eduid.nl
9393
#Only for testing purposes
94-
active: mijn.test2.eduid.nl
94+
active: servicedesk.test2.eduid.nl
95+
# active: mijn.test2.eduid.nl
9596

9697
feature:
9798
webauthn: True

servicedesk-gui/src/App.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@
1212

1313
.react-datepicker-popper {
1414
z-index: 3 !important;
15+
}
16+
17+
strong {
18+
font-weight: 600 !important;
1519
}

servicedesk-gui/src/locale/en.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,17 @@ const en = {
3737
},
3838
tabs: {
3939
home: "Home",
40-
verify: "Identity check"
40+
verify: "Identity check eduID"
41+
},
42+
info: {
43+
title: "Verify someone's identity",
44+
subTitle: "An eduID user has made an appointment to have his identity verified.",
45+
verify1: "Ask for <strong>the eduID verification code</strong>",
46+
verify2: "This code should already be generated by the user in her/his eduID.",
47+
verify3: "Does the user not have a code, ask the user to make one on the spot by starting the verification process in eduID."
4148
},
4249
verification: {
43-
header: "Enter the verification code",
50+
header: "Enter the eduID verification code",
4451
proceed: "Continue",
4552
error: "No user found for verification code {{code}}",
4653
info: "The person generated this code in eduID.",

servicedesk-gui/src/locale/nl.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,17 @@ const nl = {
3737
},
3838
tabs: {
3939
home: "Home",
40-
verify: "Identiteitscontrole"
40+
verify: "Identiteitscontrole eduID"
41+
},
42+
info: {
43+
title: "Verifieer iemands identiteit",
44+
subTitle: "Een eduID gebruiker heeft een afspraak gemaakt om zijn identiteit te laten verifiëren.",
45+
verify1: "Vraag naar <strong>een eduID verificatie code</strong>",
46+
verify2: "Deze code heeft de gebruiker eerder gegenereerd in zijn/haar eduID.",
47+
verify3: "Heeft de gebruiker géén code, vraag de gebruiker deze dan alsnog te maken door het verificatieprocess in eduID te starten."
4148
},
4249
verification: {
43-
header: "Vul de controlecode in",
50+
header: "Voer de eduID verificatie code in",
4451
proceed: "Ga verder",
4552
error: "Geen gebruiker gevonden voor de verificatiecode {{code}}",
4653
info: "Deze code heeft de persoon gegenereerd in eduID",

servicedesk-gui/src/tabs/Verification.jsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {Button, CodeValidation, ErrorIndicator} from "@surfnet/sds";
55
import AlertIcon from "@surfnet/sds/icons/functional-icons/info.svg";
66
import {getUserControlCode} from "../api/index.js";
77
import {useAppStore} from "../stores/AppStore.js";
8+
import DOMPurify from "dompurify";
89

910
const Verification = ({proceed}) => {
1011

@@ -32,6 +33,18 @@ const Verification = ({proceed}) => {
3233
}
3334

3435
return (
36+
<>
37+
<div className="info">
38+
<h2>{I18n.t("info.title")}</h2>
39+
<p className="info">{I18n.t("info.subTitle")}</p>
40+
<p
41+
dangerouslySetInnerHTML={{__html: DOMPurify.sanitize(I18n.t("info.verify1"))}}/>
42+
<ul>
43+
<li>{I18n.t("info.verify2")}</li>
44+
<li>{I18n.t("info.verify3")}</li>
45+
</ul>
46+
47+
</div>
3548
<div className="verification">
3649
<h4>{I18n.t("verification.header")}</h4>
3750
<div className="code-validation">
@@ -53,6 +66,7 @@ const Verification = ({proceed}) => {
5366
</div>
5467

5568
</div>
69+
</>
5670
);
5771

5872
};

servicedesk-gui/src/tabs/Verification.scss

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,27 @@
11
@use "../styles/vars.scss" as *;
22

3+
div.info {
4+
margin-top: 40px;
5+
max-width: 660px;
6+
h2 {
7+
margin-bottom: 15px;
8+
}
9+
10+
p.info {
11+
margin-bottom: 25px;
12+
}
13+
14+
ul {
15+
list-style: inherit;
16+
17+
li {
18+
margin-left: 16px;
19+
}
20+
}
21+
}
322

423
div.verification {
5-
margin: 40px 0 25px 0;
24+
margin: 30px 0 25px 0;
625
border: 1px solid var(--sds--color--gray--300);
726
border-radius: 8px;
827
max-width: $verification-width;
@@ -29,8 +48,9 @@ div.verification {
2948

3049
svg {
3150
color: var(--sds--color--white);
51+
3252
circle.bg {
33-
fill:var(--sds--color--blue--400);
53+
fill: var(--sds--color--blue--400);
3454
}
3555
}
3656
}

0 commit comments

Comments
 (0)