Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable Backup Codes UI until primary provider enabled #157

Merged
merged 2 commits into from
May 16, 2023
Merged

Disable Backup Codes UI until primary provider enabled #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ada5579
ESLint: Set `root: true` to bypass fallback configs.
iandunn May 11, 2023
aac2fab
Disable Backup Codes UI until primary provider enabled
iandunn May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions settings/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
root: true,
extends: 'plugin:@wordpress/eslint-plugin/recommended',

rules: {
Expand Down
77 changes: 44 additions & 33 deletions settings/src/components/account-status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,20 @@ export default function AccountStatus() {
const { userRecord } = useContext( GlobalContext );
const { record } = userRecord;
const emailStatus = record.pending_email ? 'pending' : 'ok';
const totpStatus = record[ '2fa_available_providers' ].includes( 'Two_Factor_Totp' )
? 'enabled'
: 'disabled';
const backupCodesStatus = record[ '2fa_available_providers' ].includes(
'Two_Factor_Backup_Codes'
)
? 'enabled'
: 'disabled';
const totpEnabled = record[ '2fa_available_providers' ].includes( 'Two_Factor_Totp' );
const webAuthnEnabled = record[ '2fa_available_providers' ].includes(
'TwoFactor_Provider_WebAuthn'
);
const primaryProviderEnabled = totpEnabled || webAuthnEnabled;
const backupCodesEnabled =
record[ '2fa_available_providers' ].includes( 'Two_Factor_Backup_Codes' );

const backupBodyText =
! backupCodesEnabled && ! primaryProviderEnabled
? 'Please enable Two-Factor Authentication before enabling backup codes.'
: `You have
${ backupCodesEnabled ? '' : 'not' }
verified your backup codes for two-factor authentication.`;

return (
<>
Expand All @@ -49,10 +55,10 @@ export default function AccountStatus() {

<SettingStatusCard
screen="totp"
status={ totpStatus }
status={ totpEnabled }
headerText="Two-Factor Authentication"
bodyText={
'enabled' === totpStatus
totpEnabled
? /* @todo update this when hardware tokens become an additional option. */
'You have two-factor authentication enabled using an app.'
: 'You do not have two-factor authentication enabled.'
Expand All @@ -61,11 +67,10 @@ export default function AccountStatus() {

<SettingStatusCard
screen="backup-codes"
status={ backupCodesStatus }
status={ backupCodesEnabled }
headerText="Two-Factor Backup Codes"
bodyText={ `You have ${
'enabled' === backupCodesStatus ? '' : 'not'
} verified your backup codes for two-factor authentication.` }
bodyText={ backupBodyText }
disabled={ ! backupCodesEnabled }
/>
</>
);
Expand All @@ -79,27 +84,29 @@ export default function AccountStatus() {
* @param props.status
* @param props.headerText
* @param props.bodyText
* @param props.disabled
*/
function SettingStatusCard( { screen, status, headerText, bodyText } ) {
function SettingStatusCard( { screen, status, headerText, bodyText, disabled = false } ) {
const cardContent = (
<CardBody>
<StatusIcon status={ status } />
<h3 aria-label={ 'Click to enter the ' + headerText + ' setting page.' }>
{ headerText }
</h3>
<p>{ bodyText }</p>
<Icon icon={ chevronRight } size={ 26 } className="wporg-2fa__status-card-open" />
</CardBody>
);

let classes = 'wporg-2fa__status-card wporg-2fa__status-card-' + screen;

if ( disabled ) {
classes += ' is-disabled';
}

return (
<Card className={ 'wporg-2fa__status-card wporg-2fa__status-card-' + screen }>
<ScreenLink
screen={ screen }
anchorText={
<CardBody>
<StatusIcon status={ status } />
<h3 aria-label={ 'Click to enter the ' + headerText + ' setting page.' }>
{ headerText }
</h3>
<p>{ bodyText }</p>
<Icon
icon={ chevronRight }
size={ 26 }
className="wporg-2fa__status-card-open"
/>
</CardBody>
}
/>
<Card className={ classes }>
{ disabled ? cardContent : <ScreenLink screen={ screen } anchorText={ cardContent } /> }
</Card>
);
}
Expand All @@ -113,6 +120,10 @@ function SettingStatusCard( { screen, status, headerText, bodyText } ) {
function StatusIcon( { status } ) {
let icon;

if ( 'boolean' === typeof status ) {
status = status ? 'enabled' : 'disabled';
}

switch ( status ) {
case 'ok':
case 'enabled':
Expand Down
6 changes: 6 additions & 0 deletions settings/src/components/account-status.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
z-index: 1;
}

&.is-disabled,
&.is-disabled .wporg-2fa__status-card-open {
opacity: .6;
cursor: not-allowed;
}

a {
display: block;
text-decoration: none;
Expand Down
9 changes: 3 additions & 6 deletions settings/src/components/backup-codes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,10 @@ export default function BackupCodes() {
const { userRecord } = useContext( GlobalContext );
const [ regenerating, setRegenerating ] = useState( false );

const backupCodesStatus = userRecord.record[ '2fa_available_providers' ].includes(
'Two_Factor_Backup_Codes'
)
? 'enabled'
: 'disabled';
const backupCodesEnabled =
userRecord.record[ '2fa_available_providers' ].includes( 'Two_Factor_Backup_Codes' );

if ( 'enabled' === backupCodesStatus && ! regenerating ) {
if ( backupCodesEnabled && ! regenerating ) {
return <Manage setRegenerating={ setRegenerating } />;
}
return <Setup setRegenerating={ setRegenerating } />;
Expand Down
4 changes: 2 additions & 2 deletions settings/src/components/totp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import { GlobalContext } from '../script';
export default function TOTP() {
const { userRecord } = useContext( GlobalContext );
const availableProviders = userRecord.record[ '2fa_available_providers' ];
const totpStatus = availableProviders.includes( 'Two_Factor_Totp' ) ? 'enabled' : 'disabled';
const totpEnabled = availableProviders.includes( 'Two_Factor_Totp' );

if ( 'enabled' === totpStatus ) {
if ( totpEnabled ) {
return <Manage />;
}

Expand Down