Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions app/Mail/WelcomeUserMail.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

namespace App\Mail;

use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope;
use Illuminate\Queue\SerializesModels;

class WelcomeUserMail extends Mailable implements ShouldQueue
{
use Queueable, SerializesModels;

public function __construct(
public User $user
) {
$this->afterCommit();
}

public function envelope(): Envelope
{
return new Envelope(
subject: 'Bienvenue sur CDTM',
);
}

public function content(): Content
{
return new Content(
markdown: 'emails.welcome',
with: [
'name' => $this->user->name,
],
);
}

/**
* @return array<int, \Illuminate\Mail\Mailables\Attachment>
*/
public function attachments(): array
{
return [];
}
}
6 changes: 6 additions & 0 deletions app/Services/AuthService.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Cache;
use App\Models\User;
use App\Services\MailService;
use App\Exceptions\InvalidOAuthCodeException;
use Illuminate\Database\Eloquent\ModelNotFoundException;

class AuthService
{
public function __construct(
protected MailService $mailService
) {}
/**
* Redirect to LinkedIn and authenticate the user with LinkedIn using OAuth.
*
Expand Down Expand Up @@ -99,6 +103,8 @@ private function createUser(SocialiteUser $linkedInUser): User
'account_status' => 'PENDING_VALIDATION',
]);

$this->mailService->sendWelcomeEmail($user);

return $user;
});
}
Expand Down
21 changes: 21 additions & 0 deletions app/Services/MailService.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

namespace App\Services;

use App\Mail\WelcomeUserMail;
use App\Models\User;
use Illuminate\Support\Facades\Mail;

class MailService
{
/**
* Send welcome email to newly registered user.
*
* @param User $user
* @return void
*/
public function sendWelcomeEmail(User $user): void
{
Mail::to($user->email)->send(new WelcomeUserMail($user));
}
}
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions resources/views/emails/welcome.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<x-mail::message>
# Bienvenue, {{ $name }} !

Merci de vous être inscrit sur la plateforme CDTM. Nous sommes ravis de vous compter parmi nous.

<x-mail::button :url="config('app.url')">
Accéder à mon espace
</x-mail::button>

Cordialement,<br>
L'équipe {{ config('app.name') }}
</x-mail::message>
28 changes: 28 additions & 0 deletions tests/Feature/Api/V1/ProfileControllerTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace Tests\Feature\Api\V1;

use App\Enums\UserRole;
use App\Models\Profile;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

class ProfileControllerTest extends TestCase
{
use RefreshDatabase;

public function test_update_profile_updates_allowed_fields(): void
{
$user = User::factory()->has(Profile::factory())->create(['role' => UserRole::Admin]);
$profile = $user->profile;

$response = $this->actingAs($user)->patchJson("/api/v1/profiles/{$profile->id}", [
'name' => 'New Name',
]);

$response->assertStatus(200);
}


}
10 changes: 9 additions & 1 deletion tests/Unit/Services/AuthServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
namespace Tests\Unit\Services;

use App\Exceptions\InvalidOAuthCodeException;
use App\Mail\WelcomeUserMail;
use App\Models\Profile;
use App\Models\User;
use App\Services\AuthService;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Mail;
use Laravel\Socialite\Facades\Socialite;
use Laravel\Socialite\Two\User as SocialiteUser;
use Mockery;
Expand All @@ -23,7 +25,7 @@ class AuthServiceTest extends TestCase
protected function setUp(): void
{
parent::setUp();
$this->service = new AuthService();
$this->service = $this->app->make(AuthService::class);
}

private function fakeSocialiteUser(
Expand Down Expand Up @@ -60,6 +62,8 @@ public function test_linked_id_authenticate_returns_the_socialite_user(): void

public function test_creates_a_new_user_and_profile_when_no_match_exists(): void
{
Mail::fake();

$linkedInUser = $this->fakeSocialiteUser('li-999', 'newperson@example.com');

$result = $this->service->signUpOrLogin($linkedInUser);
Expand All @@ -83,6 +87,10 @@ public function test_creates_a_new_user_and_profile_when_no_match_exists(): void
$this->assertNotNull($cached);
$this->assertEquals($user->id, $cached['user_id']);
$this->assertNotEmpty($cached['token']);

Mail::assertQueued(WelcomeUserMail::class, function (WelcomeUserMail $mail) use ($user) {
return $mail->user->id === $user->id && $mail->hasTo($user->email);
});
}

public function test_links_linkedin_id_to_an_existing_user_matched_by_email(): void
Expand Down
46 changes: 46 additions & 0 deletions tests/Unit/Services/MailServiceTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

namespace Tests\Unit\Services;

use App\Mail\WelcomeUserMail;
use App\Models\User;
use App\Services\MailService;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Mail;
use Tests\TestCase;

class MailServiceTest extends TestCase
{
use RefreshDatabase;

public function test_send_welcome_email_queues_welcome_user_mail(): void
{
Mail::fake();

$user = User::factory()->create([
'email' => 'testwelcome@example.com',
]);

$mailService = new MailService();
$mailService->sendWelcomeEmail($user);

Mail::assertQueued(WelcomeUserMail::class, function (WelcomeUserMail $mail) use ($user) {
return $mail->user->id === $user->id && $mail->hasTo('testwelcome@example.com');
});
}

public function test_welcome_user_mail_properties(): void
{
$user = User::factory()->create([
'name' => 'Alice',
'email' => 'alice@example.com',
]);

$mailable = new WelcomeUserMail($user);

$this->assertEquals('Bienvenue sur CDTM', $mailable->envelope()->subject);
$this->assertEquals('emails.welcome', $mailable->content()->markdown);
$this->assertEquals(['name' => 'Alice'], $mailable->content()->with);
$this->assertEmpty($mailable->attachments());
}
}
Loading