Skip to content

Commit

Permalink
forgot order matters
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason Paige committed Mar 11, 2024
1 parent 403fd63 commit f36300f
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 22 deletions.
26 changes: 26 additions & 0 deletions b2c/b2c_injection_reference/mfa-email.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<div id="api" data-name="SelfAsserted">
<div class="buttons">
</div>
<div class="intro">
<p>Please provide the following details.</p>
</div>
<form id="attributeVerification" action="JavaScript:void(0);">
<div id="passwordEntryMismatch" class="error pageLevel" style="display: none;" aria-hidden="true">The password entry fields do not match. Please enter the same password in both fields and try again.</div>
<div id="requiredFieldMissing" class="error pageLevel" style="display: none;" aria-hidden="true">A required field is missing. Please fill out all required fields and try again.</div>
<div id="fieldIncorrect" class="error pageLevel" style="display: none;" aria-hidden="true">One or more fields are filled out incorrectly. Please check your entries and try again.</div>
<div id="claimVerificationServerError" class="error pageLevel" style="display: none;" aria-hidden="true"></div>
<div id="attributeList" class="attr">
<ul>
<li class="Readonly"><div class="attrEntry"><div><div class="verificationInfoText" id="readOnlyEmail_intro" style="display: inline;" aria-hidden="false" role="alert" aria-live="polite">Verification is necessary. Please click Send button.</div><div class="verificationInfoText" id="readOnlyEmail_info" style="display:none" aria-hidden="true" role="alert">Verification code has been sent to your inbox. Please copy it to the input box below.</div><div class="verificationSuccessText" id="readOnlyEmail_success" style="display:none" aria-hidden="true" role="alert">E-mail address verified. You can now continue.</div><div class="verificationErrorText error" id="readOnlyEmail_fail_retry" style="display:none" aria-hidden="true" role="alert">That code is incorrect. Please try again.</div><div class="verificationErrorText error" id="readOnlyEmail_fail_no_retry" style="display:none" aria-hidden="true" role="alert">You've made too many incorrect attempts. Please try again later.</div><div class="verificationErrorText error" id="readOnlyEmail_fail_throttled" style="display:none" aria-hidden="true" role="alert">There have been too many requests to verify this email address. Please wait a while, then try again.</div><div class="verificationErrorText error" id="readOnlyEmail_fail_code_expired" style="display:none" aria-hidden="true" role="alert">That code is expired. Please request a new code.</div><div class="verificationErrorText error" id="readOnlyEmail_fail_server" style="display:none" aria-hidden="true" role="alert">We are having trouble verifying your email address. Please enter a valid email address and try again.</div><div class="verificationErrorText error" id="readOnlyEmail_incorrect_format" style="display:none" aria-hidden="true" role="alert">Incorrect format.</div></div><label id="readOnlyEmail_label" for="readOnlyEmail">Email Address</label><div class="error itemLevel" role="alert"></div><input id="readOnlyEmail" class="textInput" type="text" placeholder="Email Address" aria-label="Email Address" value="jason.paige@hmcts.net" aria-required="true" disabled="" readonly="readonly" autofocus="autofocus"><a class="helpLink tiny" href="javascript:void(0)" data-help="">What is this?</a><div class="buttons verify" data-claim_id="readOnlyEmail"><div class="working" id="readOnlyEmail_ver_wait" aria-label="Please wait" aria-hidden="true" style="display: none;"></div><label id="readOnlyEmail_ver_input_label" for="readOnlyEmail_ver_input" aria-hidden="true" style="display: none;">Verification code</label><input class="verifyInput" id="readOnlyEmail_ver_input" type="text" autocomplete="off" placeholder="Verification code" style="display: none;" aria-hidden="true"><button class="sendButton" id="readOnlyEmail_ver_but_send" type="button" aria-label="Send verification code" style="display: inline;" aria-hidden="false">Send verification code</button><button class="verifyButton" id="readOnlyEmail_ver_but_verify" type="button" aria-label="Verify code" style="display: none;" aria-hidden="true">Verify code</button><button class="sendButton" id="readOnlyEmail_ver_but_resend" type="button" aria-label="Send new code" style="display: none;" aria-hidden="true">Send new code</button><button class="defaultButton" id="readOnlyEmail_ver_but_default" type="button" aria-label="Default" style="display: none;">Default</button></div></div></li>
</ul>
</div>
<div class="buttons">
<button id="continue" type="submit" form="attributeVerification" aria-disabled="false" aria-label="Continue">Continue</button><button id="cancel" aria-label="Cancel" formnovalidate="">Cancel</button>
</div>

<div class="verifying-modal">
<div id="verifying_blurb"></div>
</div>
</form>

</div>
2 changes: 1 addition & 1 deletion b2c/custom_policies/ProfileEdit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<PolicyId>B2C_1A_TrustFrameworkExtensions</PolicyId>
</BasePolicy>
<RelyingParty>
<DefaultUserJourney ReferenceId="ProfileEdit" />
<UserJourneyBehaviors>
<ScriptExecution>Allow</ScriptExecution>
</UserJourneyBehaviors>
<DefaultUserJourney ReferenceId="ProfileEdit" />
<TechnicalProfile Id="PolicyProfile">
<DisplayName>PolicyProfile</DisplayName>
<Protocol Name="OpenIdConnect" />
Expand Down
6 changes: 3 additions & 3 deletions b2c/custom_policies/SignUpOrSignin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
</BuildingBlocks>

<RelyingParty>
<UserJourneyBehaviors>
<ScriptExecution>Allow</ScriptExecution>
</UserJourneyBehaviors>
<DefaultUserJourney ReferenceId="CustomSignUpSignIn" />
<Endpoints>
<!--points to refresh token journey when app makes refresh token request-->
<Endpoint Id="Token" UserJourneyReferenceId="RedeemRefreshToken" />
<Endpoint Id="UserInfo" UserJourneyReferenceId="UserInfoJourney" />
</Endpoints>
<UserJourneyBehaviors>
<ScriptExecution>Allow</ScriptExecution>
</UserJourneyBehaviors>
<TechnicalProfile Id="PolicyProfile">
<DisplayName>PolicyProfile</DisplayName>
<Protocol Name="OpenIdConnect" />
Expand Down
51 changes: 34 additions & 17 deletions b2c/views/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,8 @@
}
.govuk-button,
#api button,
#api #email_ver_but_send {
#api #email_ver_but_send,
#api #readOnlyEmail_ver_but_send {
font-family: "GDS Transport", arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
Expand Down Expand Up @@ -1715,76 +1716,88 @@
}
@media print {
.govuk-button, #api button,
#api #email_ver_but_send {
#api #email_ver_but_send,
#api #readOnlyEmail_ver_but_send {
font-family: sans-serif;
}
}
@media (min-width: 40.0625em) {
.govuk-button, #api button,
#api #email_ver_but_send {
#api #email_ver_but_send,
#api #readOnlyEmail_ver_but_send {
font-size: 1.1875rem;
line-height: 1;
}
}
@media print {
.govuk-button, #api button,
#api #email_ver_but_send {
#api #email_ver_but_send,
#api #readOnlyEmail_ver_but_send {
font-size: 14pt;
line-height: 19px;
}
}
@media (min-width: 40.0625em) {
.govuk-button, #api button,
#api #email_ver_but_send {
#api #email_ver_but_send,
#api #readOnlyEmail_ver_but_send {
margin-bottom: 32px;
}
}
@media (min-width: 40.0625em) {
.govuk-button, #api button,
#api #email_ver_but_send {
#api #email_ver_but_send,
#api #readOnlyEmail_ver_but_send {
width: auto;
}
}
.govuk-button:link, .govuk-button:visited, .govuk-button:active, .govuk-button:hover,
#api button:link, #api button:visited, #api button:active, #api button:hover,
#api #email_ver_but_send:link, #api #email_ver_but_send:visited, #api #email_ver_but_send:active, #api #email_ver_but_send:hover {
#api #email_ver_but_send:link, #api #email_ver_but_send:visited, #api #email_ver_but_send:active, #api #email_ver_but_send:hover,
#api #readOnlyEmail_ver_but_send:link, #api #readOnlyEmail_ver_but_send:visited, #api #readOnlyEmail_ver_but_send:active, #api #readOnlyEmail_ver_but_send:hover {
color: #ffffff;
text-decoration: none;
}
.govuk-button::-moz-focus-inner,
#api button::-moz-focus-inner,
#api #email_ver_but_send::-moz-focus-inner {
#api #email_ver_but_send::-moz-focus-inner,
#api #readOnlyEmail_ver_but_send::-moz-focus-inner {
padding: 0;
border: 0;
}
.govuk-button:hover,
#api button:hover,
#api #email_ver_but_send:hover {
#api #email_ver_but_send:hover,
#api #readOnlyEmail_ver_but_send:hover {
background-color: #005a30;
}
.govuk-button:active,
#api button:active,
#api #email_ver_but_send:active {
#api #email_ver_but_send:active,
#api #readOnlyEmail_ver_but_send:active {
top: 2px;
}
.govuk-button:focus,
#api button:focus,
#api #email_ver_but_send:focus {
#api #email_ver_but_send:focus,
#api #readOnlyEmail_ver_but_send:focus {
border-color: #ffdd00;
outline: 3px solid transparent;
box-shadow: inset 0 0 0 1px #ffdd00;
}
.govuk-button:focus:not(:active):not(:hover),
#api button:focus:not(:active):not(:hover),
#api #email_ver_but_send:focus:not(:active):not(:hover) {
#api #email_ver_but_send:focus:not(:active):not(:hover),
#api #readOnlyEmail_ver_but_send:focus:not(:active):not(:hover) {
border-color: #ffdd00;
color: #0b0c0c;
background-color: #ffdd00;
box-shadow: 0 2px 0 #0b0c0c;
}
.govuk-button::before,
#api button::before,
#api #email_ver_but_send::before {
#api #email_ver_but_send::before,
#api #readOnlyEmail_ver_but_send::before {
content: "";
display: block;
position: absolute;
Expand All @@ -1796,24 +1809,28 @@
}
.govuk-button:active::before,
#api button:active::before,
#api #email_ver_but_send:active::before {
#api #email_ver_but_send:active::before,
#api #readOnlyEmail_ver_but_send:active::before {
top: -4px;
}

.govuk-button[disabled],
#api button[disabled],
#api #email_ver_but_send[disabled] {
#api #email_ver_but_send[disabled],
#api #readOnlyEmail_ver_but_send[disabled] {
opacity: 0.5;
}
.govuk-button[disabled]:hover,
#api button[disabled]:hover,
#api #email_ver_but_send[disabled]:hover {
#api #email_ver_but_send[disabled]:hover,
#api #readOnlyEmail_ver_but_send[disabled]:hover {
background-color: #00703c;
cursor: not-allowed;
}
.govuk-button[disabled]:active,
#api button[disabled]:active,
#api #email_ver_but_send[disabled]:active {
#api #email_ver_but_send[disabled]:active,
#api #readOnlyEmail_ver_but_send[disabled]:active {
top: 0;
box-shadow: 0 2px 0 #002d18;
}
Expand Down
2 changes: 1 addition & 1 deletion b2c/views/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<link rel="mask-icon" href="https://presastg.blob.core.windows.net/pre-b2c-container/assets/images/govuk-icon-mask.svg" color="#0b0c0c">
<link rel="apple-touch-icon" href="https://presastg.blob.core.windows.net/pre-b2c-container/assets/images/govuk-icon-180.png">

<script src="./js/b2c.js" defer></script>
<script src="https://presastg.blob.core.windows.net/pre-b2c-container/js/b2c.js" defer></script>
</head>
<body class="govuk-template__body">
<script>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
Expand Down

0 comments on commit f36300f

Please sign in to comment.