Skip to content

Commit 7c7eedb

Browse files
pitchumpitchum
committed
Refactoring Auth::user ('s/Auth::user/User::getCurrentUser/')
1 parent 00a6899 commit 7c7eedb

9 files changed

+16
-16
lines changed

‎app/Http/Controllers/PasteController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public function raw($link){
247247
}
248248
// On regarde si le créateur est connecté, si oui il peut voir sa paste expirée, sinon 404
249249
if(cas()->isAuthenticated()) {
250-
if ($paste->userId != Auth::user()->id) {
250+
if ($paste->userId != User::getCurrentUser()->id) {
251251
return view('errors/404');
252252
}
253253
}
@@ -256,7 +256,7 @@ public function raw($link){
256256
if ($paste->privacy == "private") {
257257
// On regarde si le créateur est connecté, si oui il peut voir sa paste expirée, sinon 404
258258
if(cas()->isAuthenticated()) {
259-
if ($paste->userId != Auth::user()->id) {
259+
if ($paste->userId != User::getCurrentUser()->id) {
260260
return view('errors/404');
261261
}
262262
else $privacy = "Private";
@@ -268,7 +268,7 @@ public function raw($link){
268268
if ($diffTimestamp > 3) {
269269
// Ici on bypass le pass si l'user est le même
270270
if(cas()->isAuthenticated()) {
271-
if ($paste->userId != Auth::user()->id) {
271+
if ($paste->userId != User::getCurrentUser()->id) {
272272
// Si le cookie de password existe on le recheck un coup quand même
273273
if (Cookie::get($paste->link) !== null) {
274274
// On recheck le cookie et on envoie la view de password si le pass a été manipulé

‎app/Http/Controllers/UserController.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ class UserController extends Controller
1818
// Every function in this controller requires auth
1919
public function __construct()
2020
{
21-
$this->middleware('auth');
21+
//$this->middleware('auth');
2222
}
2323

2424
public function dashboard(){
25-
return view('paste/dashboard', ['userPastes' => Auth::user()->pastes()->get()]);
25+
return view('paste/dashboard', ['userPastes' => User::getCurrentUser()->pastes()->get()]);
2626
}
2727
public function delete($link){
2828
if (!cas()->isAuthenticated()) return redirect('/');
2929
$userPaste = Paste::where('link', $link)->firstOrFail();
30-
if ($userPaste->userId != Auth::user()->id) return redirect('/login');
30+
if ($userPaste->userId != User::getCurrentUser()->id) return redirect('/login');
3131
$userPaste->forceDelete();
3232
return redirect('/users/dashboard');
3333
}
3434
public function account(){
3535
if (!cas()->isAuthenticated()) return redirect('/login');
36-
$user = User::where('id', Auth::user()->id)->first();
36+
$user = User::where('id', User::getCurrentUser()->id)->first();
3737
return view('paste.account', ['user' => $user]);
3838
}
3939
public function editAccount(Request $request){
@@ -53,9 +53,9 @@ public function editAccount(Request $request){
5353
'email' => 'required|email',
5454
]);
5555
}
56-
$user = User::where('id', Auth::user()->id)->first();
56+
$user = User::where('id', User::getCurrentUser()->id)->first();
5757
$checkEmail = User::where('email', Input::get('email'))->first();
58-
if (!is_null($checkEmail) && $checkEmail->id != Auth::user()->id) return Redirect::back()->withErrors(['Specified e-mail address already exists']);
58+
if (!is_null($checkEmail) && $checkEmail->id != User::getCurrentUser()->id) return Redirect::back()->withErrors(['Specified e-mail address already exists']);
5959
$user->name = Input::get('name');
6060
$user->email = Input::get('email');
6161
if (Input::get('password') != "") {

‎resources/views/layouts/app.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
@else
5656
<li class="dropdown">
5757
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
58-
{{ Auth::user()->name }} <span class="caret"></span>
58+
{{ User::getCurrentUser()->name }} <span class="caret"></span>
5959
</a>
6060
6161
<ul class="dropdown-menu" role="menu">

‎resources/views/paste/account.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@if (cas()->isAuthenticated())
99
<li class="nav-item"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
1010
<li class="nav-item active"><a href="/users/account" class="nav-link">My Account</a></li>
11-
<li class="nav-item"><a href="/logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>
11+
<li class="nav-item"><a href="/logout" class="nav-link">Logout <i>({{ User::getCurrentUser()->name }})</i></a></li>
1212
@else
1313
<li class="nav-item"><a href="/login" class="nav-link">Login</a></li>
1414
<li class="nav-item"><a href="/register" class="nav-link">Register</a></li>

‎resources/views/paste/dashboard.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@if (cas()->isAuthenticated())
99
<li class="nav-item active"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
1010
<li class="nav-item"><a href="/users/account" class="nav-link">My Account</a></li>
11-
<li class="nav-item"><a href="/logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>
11+
<li class="nav-item"><a href="/logout" class="nav-link">Logout <i>({{ User::getCurrentUser()->name }})</i></a></li>
1212
@else
1313
<li class="nav-item"><a href="/login" class="nav-link">Login</a></li>
1414
<li class="nav-item"><a href="/register" class="nav-link">Register</a></li>

‎resources/views/paste/edit.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@if (cas()->isAuthenticated())
99
<li class="nav-item"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
1010
<li class="nav-item"><a href="/users/account" class="nav-link">My Account</a></li>
11-
<li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>
11+
<li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ User::getCurrentUser()->name }})</i></a></li>
1212
@else
1313
<li class="nav-item"><a href="/login" class="nav-link">Login</a></li>
1414
<li class="nav-item"><a href="/register" class="nav-link">Register</a></li>

‎resources/views/paste/index.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@if (cas()->isAuthenticated())
99
<li class="nav-item"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
1010
<li class="nav-item"><a href="/users/account" class="nav-link">My Account</a></li>
11-
<li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>
11+
<li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ User::getCurrentUser()->name }})</i></a></li>
1212
@else
1313
<li class="nav-item"><a href="/login" class="nav-link">Login</a></li>
1414
<li class="nav-item"><a href="/register" class="nav-link">Register</a></li>

‎resources/views/paste/password.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@if (cas()->isAuthenticated())
99
<li class="nav-item"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
1010
<li class="nav-item"><a href="/users/account" class="nav-link">My Account</a></li>
11-
<li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>
11+
<li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ User::getCurrentUser()->name }})</i></a></li>
1212
@else
1313
<li class="nav-item"><a href="/login" class="nav-link">Login</a></li>
1414
<li class="nav-item"><a href="/register" class="nav-link">Register</a></li>

‎resources/views/paste/view.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@if (cas()->isAuthenticated())
1010
<li class="nav-item"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
1111
<li class="nav-item"><a href="/users/account" class="nav-link">My Account</a></li>
12-
<li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>
12+
<li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ User::getCurrentUser()->name }})</i></a></li>
1313
@else
1414
<li class="nav-item"><a href="/login" class="nav-link">Login</a></li>
1515
<li class="nav-item"><a href="/register" class="nav-link">Register</a></li>

0 commit comments

Comments
 (0)