Skip to content

Commit

Permalink
Merge pull request #1637 from SUNET/cat-freja-samordnings
Browse files Browse the repository at this point in the history
Cat freja samordnings
  • Loading branch information
eunjuhuss authored Feb 27, 2024
2 parents 660104e + 4a02715 commit b24f383
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 44 deletions.
5 changes: 4 additions & 1 deletion src/components/Dashboard/VerifyIdentity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,10 @@ function AccordionItemSwedish(): JSX.Element | null {
<AccordionItemTemplate
icon={<img height="35" className="circle-icon" alt="Sweden" src={SeFlag} />}
title={
<FormattedMessage description="accordion item swedish title" defaultMessage="Swedish personal ID number" />
<FormattedMessage
description="accordion item swedish title"
defaultMessage="Swedish personal ID or coordination number"
/>
}
additionalInfo={
<FormattedMessage
Expand Down
22 changes: 14 additions & 8 deletions src/components/Help.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ export function Help(): JSX.Element {
<strong>
<FormattedMessage
description="swedish nin - heading"
defaultMessage={`If you have a Swedish personal identity number`}
defaultMessage={`If you have a Swedish personal identity number or coordination number`}
/>
</strong>
<FormattedMessage
Expand All @@ -548,7 +548,10 @@ export function Help(): JSX.Element {
<ul className="bullets">
<li>
<em>
<FormattedMessage description="swedish nin post - heading" defaultMessage="post:" />
<FormattedMessage
description="swedish nin post - heading"
defaultMessage="post - for Swedish personal identity number holders:"
/>
</em>
&nbsp;
<FormattedMessage
Expand All @@ -560,7 +563,10 @@ export function Help(): JSX.Element {
</li>
<li>
<em>
<FormattedMessage description="swedish nin mobile - heading" defaultMessage="mobile:" />
<FormattedMessage
description="swedish nin mobile - heading"
defaultMessage="mobile - for Swedish personal identity number holders:"
/>
</em>
&nbsp;
<FormattedMessage
Expand All @@ -574,7 +580,7 @@ export function Help(): JSX.Element {
<em>
<FormattedMessage
description="swedish nin freja - heading"
defaultMessage="Freja+ (digital ID-card):"
defaultMessage="Freja+ (digital ID-card) - for Swedish personal identity or coordination number holders:"
/>
</em>
&nbsp;
Expand All @@ -589,7 +595,7 @@ export function Help(): JSX.Element {
<em>
<FormattedMessage
description="swedish nin bankid - heading"
defaultMessage="BankID (electronic identification system):"
defaultMessage="BankID (electronic identification system) - for Swedish personal identity number holders:"
/>
</em>
&nbsp;
Expand Down Expand Up @@ -653,7 +659,7 @@ export function Help(): JSX.Element {
<FormattedMessage
description="what is freja - paragraph"
defaultMessage={`Freja+ is a digital ID-card (a verified Freja eID) free of charge, available to
holders of a Swedish personal identification number.`}
holders of a Swedish personal identification number or coordination number.`}
/>
</p>
<p>
Expand Down Expand Up @@ -723,8 +729,8 @@ export function Help(): JSX.Element {
<FormattedMessage
description="what if verification for freja fails - paragraph"
defaultMessage={`Reinstall the app, redo the registration and make sure that you have entered the
correct expiration date as well as written down the correct reference number of the chosen form of
ID and personal identity number (personnummer).`}
correct expiration date as well as the correct reference number of the chosen form of
ID and personal identity number or coordination number.`}
/>
</p>
</article>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/BankID-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test("renders bankID as expected", async () => {
nav.click();
});
expect(screen.getByRole("heading", { name: "Choose your principal identification method" })).toBeInTheDocument();
const swedishMethodAccordion = screen.getByRole("button", { name: /Swedish personal ID number/i });
const swedishMethodAccordion = screen.getByRole("button", { name: /Swedish personal ID or coordination number/i });
act(() => {
swedishMethodAccordion.click();
});
Expand Down
6 changes: 4 additions & 2 deletions src/tests/VerifyIdentity-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ test("renders verifyIdentity, non verified user", async () => {
render(<VerifyIdentity />);
expect(screen.getByRole("heading", { name: /Connect your identity to your eduID/i })).toBeInTheDocument();
// show two options for verification, swedish id and eu id
const swedishAccordion = screen.getByRole("button", { name: /swedish personal ID number With a digital ID-card/i });
const swedishAccordion = screen.getByRole("button", {
name: /swedish personal ID or coordination number With a digital ID-card/i,
});
expect(swedishAccordion).toBeEnabled();
const eidasAccordion = screen.getByRole("button", { name: /EU citizen/i });
expect(eidasAccordion).toBeEnabled();
Expand Down Expand Up @@ -55,7 +57,7 @@ test("renders verifyIdentity as expected, verified with eidas", async () => {
expect(screen.getByText(/19850101/i)).toBeInTheDocument();
// after eidas verification, still showing swedish identification options
expect(
screen.getByRole("button", { name: /swedish personal ID number With a digital ID-card/i })
screen.getByRole("button", { name: /swedish personal ID or coordination number With a digital ID-card/i })
).toBeInTheDocument();
});

Expand Down
64 changes: 32 additions & 32 deletions src/translation/extractedMessages.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@
"developer_comment": "eidas freja instructions step3",
"string": "The app will generate a QR-code"
},
"1tt2b7": {
"developer_comment": "what if verification for freja fails - paragraph",
"string": "Reinstall the app, redo the registration and make sure that you have entered the correct expiration date as well as the correct reference number of the chosen form of ID and personal identity number or coordination number."
},
"2D7weB": {
"developer_comment": "orcid connect button",
"string": "Add ORCID account"
Expand Down Expand Up @@ -437,10 +441,6 @@
"developer_comment": "explanation text for letter proofing",
"string": "by post"
},
"9ftFZW": {
"developer_comment": "swedish nin mobile - heading",
"string": "mobile:"
},
"9t9vVw": {
"developer_comment": "what is svipe - paragraph 1",
"string": "Svipe iD is based on an identity verification platform using biometric documents from over 140 countries, e.g. passports and ID-cards, combined with the users mobile device face-recognition ability, to create a verified digital identity than can be used remotely."
Expand Down Expand Up @@ -501,10 +501,6 @@
"developer_comment": "how change language - paragraph",
"string": "To change the default language you can log into eduID and select your language preference in the Personal information area in eduID. The default language is based on the language setting that your browser uses. You can also change the displayed language in the footer of the webpage. Available options are Swedish and English."
},
"C+b7F7": {
"developer_comment": "swedish nin - heading",
"string": "If you have a Swedish personal identity number"
},
"CBJ51T": {
"developer_comment": "explanation text for letter proofing",
"string": "To request a new code, proceed by clicking the button below."
Expand Down Expand Up @@ -858,10 +854,6 @@
"developer_comment": "what is accessibility report - paragraph 2",
"string": "It is of outmost importance to us that as many as possible are able to use the service in a convenient and safe manner and is one of the many ways eduID is always striving to improve."
},
"MeVXBf": {
"developer_comment": "what is freja - paragraph",
"string": "Freja+ is a digital ID-card (a verified Freja eID) free of charge, available to holders of a Swedish personal identification number."
},
"MnbIkV": {
"developer_comment": "no error information message",
"string": "There is no technical information available"
Expand Down Expand Up @@ -950,6 +942,10 @@
"developer_comment": "Ladok account linking",
"string": "The list of higher education institutions could not be loaded at this time"
},
"P2JYwK": {
"developer_comment": "what is freja - paragraph",
"string": "Freja+ is a digital ID-card (a verified Freja eID) free of charge, available to holders of a Swedish personal identification number or coordination number."
},
"P7d2zq": {
"developer_comment": "button save",
"string": "save"
Expand Down Expand Up @@ -1022,10 +1018,6 @@
"developer_comment": "delete.confirm_button",
"string": "Delete my eduID"
},
"Qu1QyR": {
"developer_comment": "swedish nin bankid - heading",
"string": "BankID (electronic identification system):"
},
"R3n7aY": {
"developer_comment": "Use other device",
"string": "The request has been aborted"
Expand Down Expand Up @@ -1253,6 +1245,10 @@
"developer_comment": "accordion item svipe title",
"string": "All other countries"
},
"Xi2uNT": {
"developer_comment": "accordion item swedish title",
"string": "Swedish personal ID or coordination number"
},
"XrBwSu": {
"developer_comment": "eidas freja instruction tip1",
"string": "Tip: Use the app to find your nearest agent"
Expand Down Expand Up @@ -1392,10 +1388,6 @@
"developer_comment": "use bankid - list definition",
"string": "How to use BankID with eduID:"
},
"b/o0DY": {
"developer_comment": "swedish nin freja - heading",
"string": "Freja+ (digital ID-card):"
},
"bCIMPQ": {
"developer_comment": "security key title",
"string": "Make your eduID more secure"
Expand Down Expand Up @@ -1520,10 +1512,6 @@
"cred.credential_type": {
"string": "Credential type."
},
"cs88WE": {
"developer_comment": "accordion item swedish title",
"string": "Swedish personal ID number"
},
"csrf.try-again": {
"string": "There was a problem with your submission, please try again"
},
Expand Down Expand Up @@ -1705,6 +1693,10 @@
"error_navet_task": {
"string": "Communication problem with Navet"
},
"evIsxX": {
"developer_comment": "swedish nin freja - heading",
"string": "Freja+ (digital ID-card) - for Swedish personal identity or coordination number holders:"
},
"ewgN8J": {
"developer_comment": "ErrorURL identification failure",
"string": "You need to re-confirm your identity in the eduID Dashboard to access this service."
Expand Down Expand Up @@ -1932,10 +1924,6 @@
"developer_comment": "about eidas - handle",
"string": "About eIDAS"
},
"kFNEXu": {
"developer_comment": "swedish nin post - heading",
"string": "post:"
},
"kHCeni": {
"string": "Enter the six digit code sent to {email} to verify your email address. You can also copy and paste the code from the email into the input field."
},
Expand Down Expand Up @@ -2031,10 +2019,6 @@
"letter.wrong-code": {
"string": "Incorrect code"
},
"lic2YR": {
"developer_comment": "what if verification for freja fails - paragraph",
"string": "Reinstall the app, redo the registration and make sure that you have entered the correct expiration date as well as written down the correct reference number of the chosen form of ID and personal identity number (personnummer)."
},
"ljDyEx": {
"developer_comment": "Signup, code expired",
"string": "To receive a new code, click the link below. You will be redirected to the register page."
Expand Down Expand Up @@ -2233,6 +2217,10 @@
"developer_comment": "Terms of use (common footer)",
"string": "Any person found violating or suspected of violating these rules can be disabled from eduID.se for investigation. Furthermore, legal action can be taken."
},
"o4XlTZ": {
"developer_comment": "swedish nin bankid - heading",
"string": "BankID (electronic identification system) - for Swedish personal identity number holders:"
},
"o4jkq9": {
"developer_comment": "Help",
"string": "Help"
Expand Down Expand Up @@ -2558,6 +2546,10 @@
"developer_comment": "verify identity",
"string": "The button below will take you to an external identification site, where you by identifying yourself with Svipe ID will verify your identity towards eduID."
},
"sbCA3x": {
"developer_comment": "swedish nin - heading",
"string": "If you have a Swedish personal identity number or coordination number"
},
"security.description_invalid_format": {
"developer_comment": "Error message for max length",
"string": "The description is too long"
Expand Down Expand Up @@ -2605,6 +2597,10 @@
"security.webauthn_register_success": {
"string": "Security key added"
},
"shCOk2": {
"developer_comment": "swedish nin mobile - heading",
"string": "mobile - for Swedish personal identity number holders:"
},
"signup.already-verified": {
"string": "You have already verified your account."
},
Expand Down Expand Up @@ -2806,6 +2802,10 @@
"developer_comment": "extra security heading",
"string": "Select an extra security option"
},
"vQ4UOq": {
"developer_comment": "swedish nin post - heading",
"string": "post - for Swedish personal identity number holders:"
},
"vQpAQz": {
"developer_comment": "verification status sub text",
"string": "Your eduID is ready to use."
Expand Down

0 comments on commit b24f383

Please sign in to comment.