Skip to content

Commit 7b3c512

Browse files
mchevmchev
committed
Fixing Google connexion
1 parent f4850ef commit 7b3c512

File tree

111 files changed

+931
-909
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+931
-909
lines changed

‎app/Http/Controllers/Auth/GoogleController.php‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@
44

55
use App\Http\Controllers\Controller;
66
use App\Models\User;
7-
use Illuminate\Auth\Events\Registered;
87
use Illuminate\Support\Facades\Auth;
98
use Laravel\Socialite\Facades\Socialite;
109

1110
class GoogleController extends Controller
1211
{
13-
public function __construct(
14-
protected RegisteredUserController $registeredUserController
15-
) {}
16-
1712
public function redirect()
1813
{
1914
return Socialite::driver('google')->redirect();
@@ -22,27 +17,24 @@ public function redirect()
2217
public function callback()
2318
{
2419
try {
25-
$googleUser = Socialite::driver('google')->user();
26-
27-
$user = User::where('email', $googleUser->email)->first();
2820

29-
if (! $user) {
30-
$user = $this->registeredUserController->createUser([
31-
'name' => $googleUser->name,
32-
'email' => $googleUser->email,
33-
], $googleUser->id, $googleUser->avatar);
21+
$googleUser = Socialite::driver('google')->user();
3422

35-
event(new Registered($user));
36-
} elseif (! $user->google_id) {
37-
$user->update([
38-
'google_id' => $googleUser->id,
39-
'avatar' => $googleUser->avatar,
40-
]);
41-
}
23+
$user = User::updateOrCreate([
24+
'email' => $googleUser->email,
25+
], [
26+
'name' => $googleUser->name,
27+
'google_id' => $googleUser->id,
28+
'google_token' => $googleUser->token,
29+
'google_refresh_token' => $googleUser->refreshToken,
30+
'google_avatar' => $googleUser->avatar,
31+
'google_avatar_url' => $googleUser->avatar_url,
32+
]);
4233

4334
Auth::login($user);
4435

45-
return redirect()->intended(route('dashboard'));
36+
return redirect()->intended(route('home'));
37+
4638
} catch (\Exception $e) {
4739
return redirect()->route('login')->with('error', 'Une erreur est survenue lors de la connexion avec Google.');
4840
}

‎app/Providers/AppServiceProvider.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace App\Providers;
44

5-
use Illuminate\Support\ServiceProvider;
65
use Illuminate\Support\Facades\Event;
6+
use Illuminate\Support\ServiceProvider;
77

88
class AppServiceProvider extends ServiceProvider
99
{
@@ -22,6 +22,6 @@ public function boot(): void
2222
{
2323
Event::listen(function (\SocialiteProviders\Manager\SocialiteWasCalled $event) {
2424
$event->extendSocialite('google', \SocialiteProviders\Google\Provider::class);
25-
});
25+
});
2626
}
2727
}

‎config/services.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@
3535
],
3636
],
3737

38-
'google' => [
39-
'client_id' => env('GOOGLE_CLIENT_ID'),
40-
'client_secret' => env('GOOGLE_CLIENT_SECRET'),
41-
'redirect' => env('GOOGLE_REDIRECT_URI')
38+
'google' => [
39+
'client_id' => env('GOOGLE_CLIENT_ID'),
40+
'client_secret' => env('GOOGLE_CLIENT_SECRET'),
41+
'redirect' => env('GOOGLE_REDIRECT_URI'),
4242
],
4343

44-
4544
];

‎database/migrations/2025_06_09_200549_add_google_fields_to_users_table.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Support\Facades\Schema;
6+
7+
return new class extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
*/
12+
public function up(): void
13+
{
14+
Schema::table('users', function (Blueprint $table) {
15+
$table->string('google_id')->nullable();
16+
$table->string('google_token')->nullable();
17+
$table->string('google_refresh_token')->nullable();
18+
$table->string('google_avatar')->nullable();
19+
$table->string('google_avatar_url')->nullable();
20+
});
21+
}
22+
23+
/**
24+
* Reverse the migrations.
25+
*/
26+
public function down(): void
27+
{
28+
Schema::table('users', function (Blueprint $table) {
29+
$table->dropColumn('google_id');
30+
$table->dropColumn('google_token');
31+
$table->dropColumn('google_refresh_token');
32+
$table->dropColumn('google_avatar');
33+
$table->dropColumn('google_avatar_url');
34+
});
35+
}
36+
};

‎database/seeders/AdminSeeder.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace Database\Seeders;
44

5-
use App\Models\User;
65
use App\Models\Depot;
76
use App\Models\Equipment;
87
use App\Models\Organization;
8+
use App\Models\User;
99
use Illuminate\Database\Seeder;
1010
use Illuminate\Support\Facades\Hash;
1111

@@ -53,4 +53,4 @@ public function run(): void
5353
// ]);
5454
// }
5555
}
56-
}
56+
}

‎database/seeders/CategorySeeder.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function run(): void
6464
'description' => 'Autres équipements de sonorisation',
6565
'icon' => 'more-horizontal',
6666
],
67-
]
67+
],
6868
],
6969
// Lumière
7070
[
@@ -117,7 +117,7 @@ public function run(): void
117117
'description' => 'Autres équipements d\'éclairage',
118118
'icon' => 'more-horizontal',
119119
],
120-
]
120+
],
121121
],
122122
// Vidéo
123123
[
@@ -165,7 +165,7 @@ public function run(): void
165165
'description' => 'Autres équipements vidéo',
166166
'icon' => 'more-horizontal',
167167
],
168-
]
168+
],
169169
],
170170
// Structure
171171
[
@@ -208,7 +208,7 @@ public function run(): void
208208
'description' => 'Autres équipements de structure',
209209
'icon' => 'more-horizontal',
210210
],
211-
]
211+
],
212212
],
213213
// Énergie
214214
[
@@ -246,7 +246,7 @@ public function run(): void
246246
'description' => 'Autres équipements électriques',
247247
'icon' => 'more-horizontal',
248248
],
249-
]
249+
],
250250
],
251251
// Transport
252252
[
@@ -284,7 +284,7 @@ public function run(): void
284284
'description' => 'Autres équipements de transport',
285285
'icon' => 'more-horizontal',
286286
],
287-
]
287+
],
288288
],
289289
// Mobilier
290290
[
@@ -327,14 +327,14 @@ public function run(): void
327327
'description' => 'Autres équipements de mobilier',
328328
'icon' => 'more-horizontal',
329329
],
330-
]
330+
],
331331
],
332332
];
333333

334334
foreach ($categories as $categoryData) {
335335
$children = $categoryData['children'] ?? [];
336336
unset($categoryData['children']);
337-
337+
338338
$category = Category::create($categoryData);
339339

340340
foreach ($children as $childData) {

‎database/seeders/OrganizationSeeder.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace Database\Seeders;
44

5-
use App\Models\User;
5+
use App\Models\Category;
66
use App\Models\Depot;
77
use App\Models\Equipment;
8-
use App\Models\Category;
98
use App\Models\Organization;
9+
use App\Models\User;
1010
use Illuminate\Database\Seeder;
1111

1212
class OrganizationSeeder extends Seeder
@@ -47,4 +47,4 @@ public function run(): void
4747
}
4848
}
4949
}
50-
}
50+
}

‎database/seeders/ReservationSeeder.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
namespace Database\Seeders;
44

5+
use App\Enums\ReservationItemStatus;
6+
use App\Enums\ReservationStatus;
57
use App\Models\Equipment;
68
use App\Models\Organization;
79
use App\Models\Reservation;
810
use App\Models\ReservationItem;
9-
use App\Enums\ReservationStatus;
10-
use App\Enums\ReservationItemStatus;
1111
use Illuminate\Database\Seeder;
1212

1313
class ReservationSeeder extends Seeder
@@ -106,4 +106,4 @@ public function run(): void
106106
});
107107
});
108108
}
109-
}
109+
}

public/build/assets/AddressInput-DIbZ8Hey.js renamed to public/build/assets/AddressInput-BhWJZr5Z.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/AppLayout-rld-7pvf.js renamed to public/build/assets/AppLayout-Ca4Lym52.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)