Skip to content

Commit 3227832

Browse files
authored
Merge pull request #1 from bolt-io/patch-2-PR-resolution
Patch 2 pr resolution
2 parents cd510d0 + 63440d1 commit 3227832

File tree

2 files changed

+4
-34
lines changed

2 files changed

+4
-34
lines changed

articles/active-directory-b2c/custom-email-mailjet.md

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -406,13 +406,6 @@ For more information, see [Self-asserted technical profile](restful-technical-pr
406406
<DisplayName>Local Account</DisplayName>
407407
<TechnicalProfiles>
408408
<TechnicalProfile Id="LocalAccountSignUpWithLogonEmail">
409-
<Metadata>
410-
<!--OTP validation error messages-->
411-
<Item Key="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</Item>
412-
<Item Key="UserMessageIfMaxRetryAttempted">You have exceeded the number of retries allowed.</Item>
413-
<Item Key="UserMessageIfInvalidCode">You have entered the wrong code.</Item>
414-
<Item Key="UserMessageIfSessionConflict">Cannot verify the code, please try again later.</Item>
415-
</Metadata>
416409
<DisplayClaims>
417410
<DisplayClaim DisplayControlReferenceId="emailVerificationControl" />
418411
<DisplayClaim ClaimTypeReferenceId="displayName" Required="true" />
@@ -423,13 +416,6 @@ For more information, see [Self-asserted technical profile](restful-technical-pr
423416
</DisplayClaims>
424417
</TechnicalProfile>
425418
<TechnicalProfile Id="LocalAccountDiscoveryUsingEmailAddress">
426-
<Metadata>
427-
<!--OTP validation error messages-->
428-
<Item Key="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</Item>
429-
<Item Key="UserMessageIfMaxRetryAttempted">You have exceeded the number of retries allowed.</Item>
430-
<Item Key="UserMessageIfInvalidCode">You have entered the wrong code.</Item>
431-
<Item Key="UserMessageIfSessionConflict">Cannot verify the code, please try again later.</Item>
432-
</Metadata>
433419
<DisplayClaims>
434420
<DisplayClaim DisplayControlReferenceId="emailVerificationControl" />
435421
</DisplayClaims>
@@ -566,18 +552,18 @@ The Localization element allows you to support multiple locales or languages in
566552
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
567553
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
568554
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
569-
<LocalizedString ElementType="ClaimType" ElementId="email" StringId="DisplayName">Eamil</LocalizedString>
555+
<LocalizedString ElementType="ClaimType" ElementId="email" StringId="DisplayName">Email</LocalizedString>
570556
<!-- Email validation error messages-->
571557
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</LocalizedString>
572558
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfMaxRetryAttempted">You have exceeded the number of retries allowed.</LocalizedString>
559+
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfMaxNumberOfCodeGenerated">You have exceeded the number of code generation attempts allowed.</LocalizedString>
573560
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfInvalidCode">You have entered the wrong code.</LocalizedString>
574561
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionConflict">Cannot verify the code, please try again later.</LocalizedString>
575562
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfVerificationFailedRetryAllowed">The verification has failed, please try again.</LocalizedString>
576563
</LocalizedStrings>
577564
</LocalizedResources>
578565
```
579566

580-
After you add the localized strings, remove the OTP validation error messages metadata from the LocalAccountSignUpWithLogonEmail and LocalAccountDiscoveryUsingEmailAddress technical profiles.
581567

582568
## Next steps
583569

articles/active-directory-b2c/custom-email-sendgrid.md

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -392,14 +392,6 @@ For more information, see [Self-asserted technical profile](restful-technical-pr
392392
<DisplayName>Local Account</DisplayName>
393393
<TechnicalProfiles>
394394
<TechnicalProfile Id="LocalAccountSignUpWithLogonEmail">
395-
<Metadata>
396-
<!--OTP validation error messages-->
397-
<Item Key="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</Item>
398-
<Item Key="UserMessageIfMaxRetryAttempted">You have exceeded the number of retries allowed.</Item>
399-
<Item Key="UserMessageIfMaxNumberOfCodeGenerated">You have exceeded the number of code generation attempts allowed.</Item>
400-
<Item Key="UserMessageIfInvalidCode">You have entered the wrong code.</Item>
401-
<Item Key="UserMessageIfSessionConflict">Cannot verify the code, please try again later.</Item>
402-
</Metadata>
403395
<DisplayClaims>
404396
<DisplayClaim DisplayControlReferenceId="emailVerificationControl" />
405397
<DisplayClaim ClaimTypeReferenceId="displayName" Required="true" />
@@ -410,14 +402,6 @@ For more information, see [Self-asserted technical profile](restful-technical-pr
410402
</DisplayClaims>
411403
</TechnicalProfile>
412404
<TechnicalProfile Id="LocalAccountDiscoveryUsingEmailAddress">
413-
<Metadata>
414-
<!--OTP validation error messages-->
415-
<Item Key="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</Item>
416-
<Item Key="UserMessageIfMaxRetryAttempted">You have exceeded the number of retries allowed.</Item>
417-
<Item Key="UserMessageIfMaxNumberOfCodeGenerated">You have exceeded the number of code generation attempts allowed.</Item>
418-
<Item Key="UserMessageIfInvalidCode">You have entered the wrong code.</Item>
419-
<Item Key="UserMessageIfSessionConflict">Cannot verify the code, please try again later.</Item>
420-
</Metadata>
421405
<DisplayClaims>
422406
<DisplayClaim DisplayControlReferenceId="emailVerificationControl" />
423407
</DisplayClaims>
@@ -552,18 +536,18 @@ The Localization element allows you to support multiple locales or languages in
552536
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
553537
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
554538
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
555-
<LocalizedString ElementType="ClaimType" ElementId="email" StringId="DisplayName">Eamil</LocalizedString>
539+
<LocalizedString ElementType="ClaimType" ElementId="email" StringId="DisplayName">Email</LocalizedString>
556540
<!-- Email validation error messages-->
557541
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</LocalizedString>
558542
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfMaxRetryAttempted">You have exceeded the number of retries allowed.</LocalizedString>
543+
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfMaxNumberOfCodeGenerated">You have exceeded the number of code generation attempts allowed.</LocalizedString>
559544
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfInvalidCode">You have entered the wrong code.</LocalizedString>
560545
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionConflict">Cannot verify the code, please try again later.</LocalizedString>
561546
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfVerificationFailedRetryAllowed">The verification has failed, please try again.</LocalizedString>
562547
</LocalizedStrings>
563548
</LocalizedResources>
564549
```
565550

566-
After you add the localized strings, remove the OTP validation error messages metadata from the LocalAccountSignUpWithLogonEmail and LocalAccountDiscoveryUsingEmailAddress technical profiles.
567551

568552
## Next steps
569553

0 commit comments

Comments
 (0)