Skip to content
Merged
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
11 changes: 5 additions & 6 deletions app/Http/Controllers/Api/Auth/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
use App\Http\Controllers\Controller;
use App\Http\Requests\Api\LoginRequest;
use App\Http\Resources\AuthenticateUserResource;
use App\Http\Resources\EnterpriseResource;
use App\Models\User;
use App\Traits\UserResponse;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
Expand All @@ -14,6 +16,8 @@

class LoginController extends Controller
{
use UserResponse;

public function login(LoginRequest $request): JsonResponse
{
/** @var User $user */
Expand Down Expand Up @@ -41,12 +45,7 @@ public function login(LoginRequest $request): JsonResponse
$user->last_login_ip = $request->ip();
$user->save();

return response()->json([
'user' => new AuthenticateUserResource($user),
'token' => $user->createToken($request->input('email'))->plainTextToken,
'roles' => $user->roles()->pluck('name'),
'permissions' => $user->permissions()->pluck('name'),
]);
return response()->json($this->userMetaData($user));
}

public function logout(Request $request): JsonResponse
Expand Down
16 changes: 5 additions & 11 deletions app/Http/Controllers/Api/Auth/RegisterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,19 @@
use App\Http\Controllers\Controller;
use App\Http\Requests\Api\RegisterRequest;
use App\Http\Resources\AuthenticateUserResource;
use App\Http\Resources\EnterpriseResource;
use App\Models\SocialAccount;
use App\Models\User;
use App\Traits\UserResponse;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;

class RegisterController extends Controller
{
use UserResponse;

public function register(RegisterRequest $request): JsonResponse
{
/** @var User $user */
Expand Down Expand Up @@ -84,18 +88,8 @@ public function googleAuthenticator(Request $request): JsonResponse
$user->save();

return response()->json([
'message' => 'Votre compte a été cree avec succès via Google.',
'message' => 'Votre compte a été crée avec succès via Google.',
'response' => $this->userMetaData($user),
]);
}

private function userMetaData(User $user): array
{
return [
'user' => new AuthenticateUserResource($user),
'token' => $user->createToken($user->email)->plainTextToken,
'roles' => $user->roles()->pluck('name'),
'permissions' => $user->permissions()->pluck('name'),
];
}
}
21 changes: 21 additions & 0 deletions app/Traits/UserResponse.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

namespace App\Traits;

use App\Http\Resources\AuthenticateUserResource;
use App\Http\Resources\EnterpriseResource;
use App\Models\User;

trait UserResponse
{
public function userMetaData(User $user): array
{
return [
'user' => new AuthenticateUserResource($user),
'token' => $user->createToken($user->email)->plainTextToken,
'roles' => $user->roles()->pluck('name'),
'permissions' => $user->permissions()->pluck('name'),
'enterprise' => $user->enterprise ? new EnterpriseResource($user->enterprise) : null,
];
}
}