Skip to content

Commit 4ea4efa

Browse files
committed
New user email verification, part deux
1 parent e3f8ad3 commit 4ea4efa

File tree

14 files changed

+229
-170
lines changed

14 files changed

+229
-170
lines changed
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<script setup lang="ts">
2-
import { useRouter } from 'vue-router'
3-
const router = useRouter()
4-
</script>
5-
61
<template>
7-
<UFPageRegister @goto-login="router.push({ name: 'account.login' })" />
2+
<UFPageRegister />
83
</template>

packages/sprinkle-account/app/src/Controller/EmailVerificationRequestAction.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ protected function handle(Request $request): string
139139
// succeeded. This prevents potential account enumeration attacks.
140140
if ($user !== null && $user->flag_verified === false) {
141141
$this->emailVerification->generate($user, 600);
142+
// TODO : Catch PHPMailerException
142143
}
143144
});
144145

packages/sprinkle-account/app/src/Controller/RegisterAction.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
use UserFrosting\I18n\Translator;
2626
use UserFrosting\Session\Session;
2727
use UserFrosting\Sprinkle\Account\Account\Registration;
28+
use UserFrosting\Sprinkle\Account\Authenticate\Interfaces\EmailVerificationProvider;
2829
use UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface;
2930
use UserFrosting\Sprinkle\Account\Event\UserCreatedEvent;
3031
use UserFrosting\Sprinkle\Account\Exceptions\RegistrationException;
3132
use UserFrosting\Sprinkle\Account\Log\UserActivityLoggerInterface;
3233
use UserFrosting\Sprinkle\Account\Log\UserActivityTypes;
33-
use UserFrosting\Sprinkle\Account\Mail\VerificationEmail;
3434
use UserFrosting\Sprinkle\Account\Validators\UserValidation;
3535
use UserFrosting\Sprinkle\Core\Exceptions\ValidationException;
3636
use UserFrosting\Sprinkle\Core\I18n\SiteLocale;
@@ -80,7 +80,7 @@ public function __construct(
8080
protected UserActivityLoggerInterface $logger,
8181
protected UserInterface $userModel,
8282
protected UserValidation $userValidation,
83-
protected VerificationEmail $verificationEmail,
83+
protected EmailVerificationProvider $emailVerification,
8484
protected RequestDataTransformer $transformer,
8585
protected ServerSideValidator $validator
8686
) {
@@ -180,7 +180,7 @@ protected function handle(Request $request): array
180180
// Send activation email
181181
if ($this->requireEmailVerification() === true) {
182182
try {
183-
$this->verificationEmail->send($user, 'mail/verify-account.html.twig');
183+
$this->emailVerification->generate($user, 600);
184184
} catch (PHPMailerException $e) {
185185
// Use abstract message for security reasons - We don't want to show email is not working
186186
$exception = new RegistrationException($e->getMessage());

packages/theme-pink-cupcake/src/components/Pages/Account/FormEmailVerificationRequest.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ async function sendVerification() {
4545
timeout: 4000
4646
})
4747
48-
// Reset the form
49-
reset()
50-
5148
// Redirect to the login page
5249
router.push({ name: 'account.login' })
5350
})

0 commit comments

Comments
 (0)