From f308a21c56bf931746a7fea563100f0bf70b064f Mon Sep 17 00:00:00 2001 From: Arthur Monney Date: Tue, 27 Dec 2022 05:03:13 +0100 Subject: [PATCH 1/2] :construction: wip --- app/Http/Controllers/Api/Auth/RegisterController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/Auth/RegisterController.php b/app/Http/Controllers/Api/Auth/RegisterController.php index bf3b3829..fc7a99e2 100644 --- a/app/Http/Controllers/Api/Auth/RegisterController.php +++ b/app/Http/Controllers/Api/Auth/RegisterController.php @@ -63,7 +63,7 @@ public function googleAuthenticator(Request $request): JsonResponse if (! $user->hasProvider($socialUser['provider'])) { $user->providers()->save(new SocialAccount([ - 'provider' => $socialUser['provider'], + 'provider' => strtolower($socialUser['provider']), 'provider_id' => $socialUser['id'], 'token' => $socialUser['idToken'], 'avatar' => $socialUser['photoUrl'], @@ -83,7 +83,10 @@ public function googleAuthenticator(Request $request): JsonResponse $user->last_login_ip = $request->ip(); $user->save(); - return response()->json($this->userMetaData($user)); + return response()->json([ + 'message' => 'Votre compte a été cree avec succes via Google.', + 'response' => $this->userMetaData($user), + ]); } private function userMetaData(User $user): array From 4a429a7d77aebe9879b2a43585c4e781ccf1fde2 Mon Sep 17 00:00:00 2001 From: Arthur Monney Date: Wed, 28 Dec 2022 08:53:26 +0100 Subject: [PATCH 2/2] :recycle: wip refactor --- app/Http/Controllers/Api/Auth/RegisterController.php | 2 +- .../Controllers/Api/Enterprise/RegisterController.php | 2 +- app/Http/Resources/AuthenticateUserResource.php | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Api/Auth/RegisterController.php b/app/Http/Controllers/Api/Auth/RegisterController.php index fc7a99e2..71482b5f 100644 --- a/app/Http/Controllers/Api/Auth/RegisterController.php +++ b/app/Http/Controllers/Api/Auth/RegisterController.php @@ -84,7 +84,7 @@ public function googleAuthenticator(Request $request): JsonResponse $user->save(); return response()->json([ - 'message' => 'Votre compte a été cree avec succes via Google.', + 'message' => 'Votre compte a été cree avec succès via Google.', 'response' => $this->userMetaData($user), ]); } diff --git a/app/Http/Controllers/Api/Enterprise/RegisterController.php b/app/Http/Controllers/Api/Enterprise/RegisterController.php index c64a3df1..1aa6f4df 100644 --- a/app/Http/Controllers/Api/Enterprise/RegisterController.php +++ b/app/Http/Controllers/Api/Enterprise/RegisterController.php @@ -32,7 +32,7 @@ public function __invoke(RegisterRequest $request): JsonResponse ]); return response()->json([ - 'user' => new AuthenticateUserResource($owner), + 'message' => 'Votre entreprise a été cree avec succès', 'enterprise' => new EnterpriseResource($enterprise), ]); } diff --git a/app/Http/Resources/AuthenticateUserResource.php b/app/Http/Resources/AuthenticateUserResource.php index e854fc78..563f1864 100644 --- a/app/Http/Resources/AuthenticateUserResource.php +++ b/app/Http/Resources/AuthenticateUserResource.php @@ -29,11 +29,12 @@ public function toArray($request): array 'optIn' => $this->opt_in, 'settings' => $this->settings, 'reputation' => $this->reputation, + 'timezone' => 'Africa/Douala', - 'lastLoginAt' => $this->last_login_at, - 'emailVerifiedAt' => $this->email_verified_at, - 'createdAt' => $this->created_at, - 'updatedAt' => $this->updated_at, + 'lastLoginAt' => new DateTimeResource($this->last_login_at), + 'emailVerifiedAt' => new DateTimeResource($this->email_verified_at), + 'createdAt' => new DateTimeResource($this->created_at), + 'updatedAt' => new DateTimeResource($this->updated_at), ]; } }