Skip to content

feat: captcha in authentication config #210

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

Merged
ssellas merged 1 commit into from
Jan 4, 2023
Merged

feat: captcha in authentication config #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
160 changes: 156 additions & 4 deletions apps/Conduit-UI/src/features/authentication/components/AuthenticationConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import React, { useEffect, useMemo, useState } from 'react';
import { useForm, FormProvider, useWatch } from 'react-hook-form';
import { FormProvider, useForm, useWatch } from 'react-hook-form';
import Grid from '@mui/material/Grid';
import Typography from '@mui/material/Typography';
import Box from '@mui/material/Box';
import Divider from '@mui/material/Divider';
import { IAuthenticationConfig } from '../models/AuthModels';
import { CaptchaProvider, IAuthenticationConfig } from '../models/AuthModels';
import { FormInputSwitch } from '../../../components/common/FormComponents/FormInputSwitch';
import { FormInputText } from '../../../components/common/FormComponents/FormInputText';
import { useAppDispatch, useAppSelector } from '../../../redux/store';
import { asyncUpdateAuthenticationConfig } from '../store/authenticationSlice';
import { ConduitTooltip, ConfigContainer, ConfigSaveSection } from '@conduitplatform/ui-components';
import { InfoOutlined } from '@mui/icons-material';
import { Icon, useTheme } from '@mui/material';
import { FormInputSelect } from '../../../components/common/FormComponents/FormInputSelect';

const captchaProviders = [CaptchaProvider.recaptcha, CaptchaProvider.hcaptcha];
const AuthenticationConfig: React.FC = () => {
const theme = useTheme();
const dispatch = useAppDispatch();
Expand Down Expand Up @@ -53,6 +55,11 @@ const AuthenticationConfig: React.FC = () => {
name: 'refreshTokens.setCookie',
});

const captchaEnabled = useWatch({
control,
name: 'captcha.enabled',
});

const handleCancel = () => {
setEdit(!edit);
methods.reset();
Expand Down Expand Up @@ -341,7 +348,7 @@ const AuthenticationConfig: React.FC = () => {
)}
</Grid>
<Divider sx={{ marginTop: 2, marginBottom: 2, width: '100%' }} />
<Grid pb={2} item xs={12}>
<Grid item xs={12}>
<Box
width={'100%'}
display={'inline-flex'}
Expand All @@ -353,8 +360,153 @@ const AuthenticationConfig: React.FC = () => {
<FormInputSwitch {...register('service.enabled', { disabled: !edit })} />
</Box>
</Grid>
</Grid>
</>
)}
{isActive && (
<>
<Divider sx={{ marginTop: 2, marginBottom: 2, width: '100%' }} />
<Grid container>
<Box
width={'100%'}
display={'inline-flex'}
justifyContent={'space-between'}
alignItems={'center'}>
<Typography px={3} variant={'h6'}>
Captcha
</Typography>
<FormInputSwitch {...register('captcha.enabled', { disabled: !edit })} />
</Box>
<Grid container spacing={2} sx={{ padding: 3 }}>
{captchaEnabled && (
<>
<Grid item container alignItems={'center'}>
<Grid item md={4} xs={12}>
<Typography variant={'subtitle1'} fontWeight={'bold'}>
Provider:
</Typography>
</Grid>
<Grid item md={8} xs={12}>
<FormInputSelect
label={''}
{...register('captcha.provider', { disabled: !edit })}
options={captchaProviders?.map((template) => ({
label: template,
value: template,
}))}
/>
</Grid>
</Grid>

<Grid />
<Grid item xs={12} mt={1}>
<Typography variant="body1" fontWeight={'bold'}>
Platforms
</Typography>
</Grid>

<Grid item md={6} xs={12}>
<Box
width={'100%'}
display={'inline-flex'}
justifyContent={'space-between'}
alignItems={'center'}>
<Typography variant={'subtitle1'} mr={1}>
Android
</Typography>
<FormInputSwitch
{...register('captcha.acceptablePlatform.android', {
disabled: !edit,
})}
switchProps={{ sx: { ml: 1 } }}
/>
</Box>
</Grid>
<Grid item md={6} xs={12}>
<Box
width={'100%'}
display={'inline-flex'}
justifyContent={'space-between'}
alignItems={'center'}>
<Typography variant={'subtitle1'} mr={1}>
Web
</Typography>
<FormInputSwitch
{...register('captcha.acceptablePlatform.web', {
disabled: !edit,
})}
switchProps={{ sx: { ml: 1 } }}
/>
</Box>
</Grid>
<Grid item xs={12} mt={1}>
<Typography variant="body1" fontWeight={'bold'}>
Routes
</Typography>
</Grid>
<Grid item md={6} xs={12}>
<Box
width={'100%'}
display={'inline-flex'}
justifyContent={'space-between'}
alignItems={'center'}>
<Typography variant={'subtitle1'} mr={1}>
Login
</Typography>
<FormInputSwitch
{...register('captcha.routes.login', {
disabled: !edit,
})}
switchProps={{ sx: { ml: 1 } }}
/>
</Box>
</Grid>
<Grid item md={6} xs={12}>
<Box
width={'100%'}
display={'inline-flex'}
justifyContent={'space-between'}
alignItems={'center'}>
<Typography variant={'subtitle1'} mr={1}>
Register
</Typography>
<FormInputSwitch
{...register('captcha.routes.register', {
disabled: !edit,
})}
switchProps={{ sx: { ml: 1 } }}
/>
</Box>
</Grid>
<Grid item md={6} xs={12}>
<Box
width={'100%'}
display={'inline-flex'}
justifyContent={'space-between'}
alignItems={'center'}>
<Typography variant={'subtitle1'} mr={1}>
oAuth2
</Typography>
<FormInputSwitch
{...register('captcha.routes.oAuth2', {
disabled: !edit,
})}
/>
</Box>
</Grid>
<Grid item container alignItems={'center'} mt={1}>
<Grid item md={4} xs={12}>
<Typography variant={'subtitle1'}>Secret key:</Typography>
</Grid>
<Grid item md={8} xs={12}>
<FormInputText
{...register('captcha.secretKey', { disabled: !edit })}
label="Secret key"
/>
</Grid>
</Grid>
</>
)}
</Grid>
</Grid>
</>
)}
Expand Down
19 changes: 19 additions & 0 deletions apps/Conduit-UI/src/features/authentication/models/AuthModels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ export interface CookieOptions {
sameSite: string;
}

export enum CaptchaProvider {
recaptcha = 'recaptcha',
hcaptcha = 'hcaptcha',
}

export interface IAuthenticationConfig {
facebook: SignInTypes;
google: SignInTypes;
Expand Down Expand Up @@ -119,4 +124,18 @@ export interface IAuthenticationConfig {
phoneAuthentication: { enabled: boolean };
clients: { multipleUserSessions: boolean; multipleClientLogins: boolean };
active: boolean;
captcha: {
enabled: boolean;
acceptablePlatform: {
android: boolean;
web: boolean;
};
provider: CaptchaProvider;
routes: {
login: boolean;
register: boolean;
oAuth2: boolean;
};
secretKey?: string;
};
}
17 changes: 15 additions & 2 deletions apps/Conduit-UI/src/features/authentication/store/authenticationSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
import { AuthUser, IAuthenticationConfig } from '../models/AuthModels';
import { AuthUser, CaptchaProvider, IAuthenticationConfig } from '../models/AuthModels';
import {
blockUnblockUsers,
blockUser,
Expand Down Expand Up @@ -98,7 +98,20 @@ const initialState: IAuthenticationSlice = {
verification_redirect_uri: '',
},
service: { enabled: false },

captcha: {
enabled: false,
acceptablePlatform: {
android: false,
web: false,
},
provider: CaptchaProvider.recaptcha,
routes: {
login: false,
register: false,
oAuth2: false,
},
secretKey: '',
},
twitch: {
accountLinking: false,
enabled: false,
Expand Down