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

feat: add MFA webauthn ui #28

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: add MFA webauthn ui #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e33fee7
feat: add webauthn ui
J0 Sep 13, 2024
efac8c8
fix: run prettier
J0 Sep 18, 2024
63a4a04
web authn
kevcodez Sep 24, 2024
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
27 changes: 27 additions & 0 deletions apps/studio/components/interfaces/Auth/AdvancedAuthSettingsForm/AdvancedAuthSettingsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const schema = object({
.max(30, 'Must be a value no greater than 30'),
MFA_TOTP: string().required(),
MFA_PHONE: string().required(),
MFA_WEB_AUTHN: string().required(),
})

function determineMFAStatus(verifyEnabled: boolean, enrollEnabled: boolean) {
Expand Down Expand Up @@ -135,6 +136,11 @@ const AdvancedAuthSettingsForm = () => {
authConfig?.MFA_PHONE_VERIFY_ENABLED || false,
authConfig?.MFA_PHONE_ENROLL_ENABLED || false
) || 'Disabled',
MFA_WEB_AUTHN:
determineMFAStatus(
authConfig?.MFA_WEB_AUTHN_VERIFY_ENABLED || false,
authConfig?.MFA_WEB_AUTHN_ENROLL_ENABLED || false
) || 'Disabled',
}

// For now, we support Twilio and Vonage. Twilio Verify is not supported and the remaining providers are community maintained.
Expand All @@ -156,10 +162,18 @@ const AdvancedAuthSettingsForm = () => {
if (isProPlanAndUp) {
const { verifyEnabled: MFA_PHONE_VERIFY_ENABLED, enrollEnabled: MFA_PHONE_ENROLL_ENABLED } =
MfaStatusToState(values.MFA_PHONE)

const {
verifyEnabled: MFA_WEB_AUTHN_VERIFY_ENABLED,
enrollEnabled: MFA_WEB_AUTHN_ENROLL_ENABLED,
} = MfaStatusToState(values.MFA_WEB_AUTHN)

payload = {
...payload,
MFA_PHONE_ENROLL_ENABLED,
MFA_PHONE_VERIFY_ENABLED,
MFA_WEB_AUTHN_ENROLL_ENABLED,
MFA_WEB_AUTHN_VERIFY_ENABLED,
}
}
payload = {
Expand All @@ -169,6 +183,7 @@ const AdvancedAuthSettingsForm = () => {
}
delete payload.MFA_TOTP
delete payload.MFA_PHONE
delete payload.MFA_WEB_AUTHN

if (!isTeamsEnterprisePlan) {
delete payload.DB_MAX_POOL_SIZE
Expand Down Expand Up @@ -312,6 +327,17 @@ const AdvancedAuthSettingsForm = () => {
secondaryText="Advanced MFA requires the Pro Plan"
/>
)}
<FormField
name="MFA_WEB_AUTHN"
properties={{
type: 'select',
title: 'WebAuthn',
description: 'Control use of WebAuthn factors',
enum: MFAFactorSelectionOptions,
}}
formValues={values}
disabled={!canUpdateConfig || !isProPlanAndUp}
/>
<FormField
name="MFA_PHONE"
properties={{
Expand All @@ -323,6 +349,7 @@ const AdvancedAuthSettingsForm = () => {
formValues={values}
disabled={!canUpdateConfig || !isProPlanAndUp}
/>

{!hasValidMFAProvider && phoneMFAIsEnabled && (
<Alert_Shadcn_ variant="warning">
<WarningIcon />
Expand Down
4 changes: 4 additions & 0 deletions packages/api-types/types/api.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3622,6 +3622,8 @@ export interface components {
MFA_PHONE_OTP_LENGTH: number
MFA_PHONE_TEMPLATE: string
MFA_PHONE_VERIFY_ENABLED: boolean
MFA_WEB_AUTHN_ENROLL_ENABLED: boolean
MFA_WEB_AUTHN_VERIFY_ENABLED: boolean
MFA_TOTP_ENROLL_ENABLED: boolean
MFA_TOTP_VERIFY_ENABLED: boolean
PASSWORD_HIBP_ENABLED: boolean
Expand Down Expand Up @@ -5864,6 +5866,8 @@ export interface components {
MFA_PHONE_OTP_LENGTH?: number
MFA_PHONE_TEMPLATE?: string
MFA_PHONE_VERIFY_ENABLED?: boolean
MFA_WEB_AUTHN_ENROLL_ENABLED?: boolean
MFA_WEB_AUTHN_VERIFY_ENABLED?: boolean
MFA_TOTP_ENROLL_ENABLED?: boolean
MFA_TOTP_VERIFY_ENABLED?: boolean
PASSWORD_HIBP_ENABLED?: boolean
Expand Down