libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

fixed merge error (#1710)

Browse source
This commit is contained in:
Erik Jan de Wit 2021-12-14 16:11:23 +01:00 committed by GitHub
parent e8f335f199
commit 920ac1dfe3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/authentication/policies/OtpPolicy.tsx
View file

@ -89,8 +89,7 @@ export const OtpPolicy = () => {
labelIcon={ labelIcon={
<HelpItem <HelpItem
helpText="authentication-help:otpType" helpText="authentication-help:otpType"
forLabel={t("otpType")} fieldLabelId="authentication:otpType"
forID={t(`common:helpLabel`, { label: t("otpType") })}
/> />
} }
fieldId="otpType" fieldId="otpType"
@ -124,8 +123,7 @@ export const OtpPolicy = () => {
labelIcon={ labelIcon={
<HelpItem <HelpItem
helpText="authentication-help:otpHashAlgorithm" helpText="authentication-help:otpHashAlgorithm"
forLabel={t("otpHashAlgorithm")} fieldLabelId="authentication:otpHashAlgorithm"
forID={t(`common:helpLabel`, { label: t("otpHashAlgorithm") })}
/> />
} }
fieldId="otpHashAlgorithm" fieldId="otpHashAlgorithm"
@ -165,8 +163,7 @@ export const OtpPolicy = () => {
labelIcon={ labelIcon={
<HelpItem <HelpItem
helpText="authentication-help:otpPolicyDigits" helpText="authentication-help:otpPolicyDigits"
forLabel={t("otpPolicyDigits")} fieldLabelId="authentication:otpPolicyDigits"
forID={t(`common:helpLabel`, { label: t("otpPolicyDigits") })}
/> />
} }
fieldId="otpPolicyDigits" fieldId="otpPolicyDigits"
@ -200,8 +197,7 @@ export const OtpPolicy = () => {
labelIcon={ labelIcon={
<HelpItem <HelpItem
helpText="authentication-help:lookAhead" helpText="authentication-help:lookAhead"
forLabel={t("lookAhead")} fieldLabelId="authentication:lookAhead"
forID={t(`common:helpLabel`, { label: t("lookAhead") })}
/> />
} }
fieldId="lookAhead" fieldId="lookAhead"
@ -240,8 +236,7 @@ export const OtpPolicy = () => {
labelIcon={ labelIcon={
<HelpItem <HelpItem
helpText="authentication-help:otpPolicyPeriod" helpText="authentication-help:otpPolicyPeriod"
forLabel={t("otpPolicyPeriod")} fieldLabelId="authentication:otpPolicyPeriod"
forID={t(`common:helpLabel`, { label: t("otpPolicyPeriod") })}
/> />
} }
> >
@ -272,8 +267,7 @@ export const OtpPolicy = () => {
labelIcon={ labelIcon={
<HelpItem <HelpItem
helpText="authentication-help:initialCounter" helpText="authentication-help:initialCounter"
forLabel={t("initialCounter")} fieldLabelId="authentication:initialCounter"
forID={t(`common:helpLabel`, { label: t("initialCounter") })}
/> />
} }
> >
@ -310,8 +304,7 @@ export const OtpPolicy = () => {
labelIcon={ labelIcon={
<HelpItem <HelpItem
helpText="authentication-help:supportedActions" helpText="authentication-help:supportedActions"
forLabel={t("supportedActions")} fieldLabelId="authentication:supportedActions"
forID={t(`common:helpLabel`, { label: t("supportedActions") })}
/> />
} }
> >