diff --git a/apps/api/src/auth/auth.service.ts b/apps/api/src/auth/auth.service.ts
index a84d4ee..ba7245a 100644
--- a/apps/api/src/auth/auth.service.ts
+++ b/apps/api/src/auth/auth.service.ts
@@ -358,11 +358,13 @@ export class AuthService {
if (code.code) {
await this.mailerService.sendEmail(
user,
- 'Email verification',
- HandlebarsTemplate.EMAIL_CONFIRMATION,
+ 'Two Factor Authentication Recovery',
+ HandlebarsTemplate.CONFIRM_RECOVERY,
{
name: user.firstName,
- code: code.code
+ code: code.code,
+ email: user.email,
+ baseUrl: process.env.PLATFORM_URL
}
)
return user
diff --git a/apps/api/src/mailer/templates/confirm-2fa-recovery.hbs b/apps/api/src/mailer/templates/confirm-2fa-recovery.hbs
new file mode 100644
index 0000000..cd6da73
--- /dev/null
+++ b/apps/api/src/mailer/templates/confirm-2fa-recovery.hbs
@@ -0,0 +1,14 @@
+
+
+ 2FA Recovery
+
+
+ Two-Factor Authentication Recovery
+ Hello, {{name}}
+ To recover your account, please click on the link below:
+ Recover Account
+ If you did not request this, please ignore this email.
+
+
diff --git a/apps/api/src/mailer/types/mailer.types.ts b/apps/api/src/mailer/types/mailer.types.ts
index 89e7c69..127efbb 100644
--- a/apps/api/src/mailer/types/mailer.types.ts
+++ b/apps/api/src/mailer/types/mailer.types.ts
@@ -1,5 +1,6 @@
export enum HandlebarsTemplate {
PASSWORD_RESET_CODE = 'password-reset-code',
WELCOME = 'welcome',
- EMAIL_CONFIRMATION = 'email-confirmation'
+ EMAIL_CONFIRMATION = 'email-confirmation',
+ CONFIRM_RECOVERY = 'confirm-2fa-recovery'
}
diff --git a/apps/platform/src/hooks/use2FA.ts b/apps/platform/src/hooks/use2FA.ts
index 9812636..c3956e0 100644
--- a/apps/platform/src/hooks/use2FA.ts
+++ b/apps/platform/src/hooks/use2FA.ts
@@ -4,7 +4,9 @@ import {
Verify2FAData,
turnOn2FAServiceStep1,
turnOn2FAStep2Service,
- auth2FAService
+ auth2FAService,
+ authDisableService,
+ Recover2FAData
} from '@isomera/impl'
import useSession from './useSession'
@@ -32,11 +34,23 @@ const useTwoFactorAuthHook = () => {
return response
})
+ const { mutateAsync: disable2FA, isLoading: isLoadingDisable } = useMutation(
+ async (data: Pure) => {
+ const response = await authDisableService(data)
+ return response
+ }
+ )
+
return {
generate2FA,
verify2FA,
authenticate,
- isLoading: isLoadingGenerate || isLoadingVerify || isLoadingAuthenticate
+ disable2FA,
+ isLoading:
+ isLoadingGenerate ||
+ isLoadingVerify ||
+ isLoadingAuthenticate ||
+ isLoadingDisable
}
}
diff --git a/apps/platform/src/router/router.tsx b/apps/platform/src/router/router.tsx
index 9dac6e5..d4d8af0 100644
--- a/apps/platform/src/router/router.tsx
+++ b/apps/platform/src/router/router.tsx
@@ -16,6 +16,7 @@ import { PrivateLayout } from '../layouts/private.layout'
import { UserSecurityView } from '../views/user /profile-security.view'
import { Verify2FAView } from '../views/auth/auth2FA.view'
import { Recovery2FAView } from '../views/auth/recovery.view'
+import { Disable2FAView } from '../views/auth/disable-2fa.view'
function Router() {
return (
@@ -98,7 +99,7 @@ function Router() {
-
+
I don't have access to my 2fa and need to reset with
recovery code
@@ -108,7 +109,7 @@ function Router() {
/>
@@ -118,6 +119,17 @@ function Router() {
}
/>
+
+
+
+
+
+ }
+ />
+
{
+ const navigate = useNavigate()
+ const [searchParams] = useSearchParams()
+ const [message, setMessage] = useState('')
+
+ const { disable2FA, isLoading } = useTwoFactorAuthHook()
+
+ useEffect(() => {
+ const email = searchParams.get('email')
+ const code = searchParams.get('code')
+
+ if (!email || !code) {
+ navigate('/login')
+ } else {
+ disable2FA({ email, code })
+ .then(() => {
+ const msg =
+ 'Your 2fa was disabled, please log-in and enable 2fa again.'
+ toast.success(msg)
+ setMessage(msg)
+ setTimeout(() => navigate('/login'), 3000)
+ })
+ .catch((error: any) => {
+ console.error('Error disabling 2FA:', error)
+ navigate('/login')
+ })
+ }
+ }, [disable2FA, navigate, searchParams])
+
+ return (
+
+ {isLoading ?
{message}
:
Disabling 2FA, please wait...
}
+