Refactoring auth checks (s/Auth::check/cas()->isAuthenticated/)

Author: pitchum

app/Http/Controllers/PasteController.php

@@ -255,7 +255,7 @@ public function raw($link){
         }
     if ($paste->privacy == "private") {
       // On regarde si le créateur est connecté, si oui il peut voir sa paste expirée, sinon 404
-      if(Auth::check()) {
+      if(cas()->isAuthenticated()) {
         if ($paste->userId != Auth::user()->id) {
           return view('errors/404');
         }
@@ -267,7 +267,7 @@ public function raw($link){
       // Si la paste a été crée y'a moins de 3 sec alors on demande pas le pass, c'est que l'user la regarde
       if ($diffTimestamp > 3) {
         // Ici on bypass le pass si l'user est le même
-        if(Auth::check()) {
+        if(cas()->isAuthenticated()) {
           if ($paste->userId != Auth::user()->id) {
             // Si le cookie de password existe on le recheck un coup quand même
             if (Cookie::get($paste->link) !== null) {
@@ -317,7 +317,7 @@ public function raw($link){
 
     // On crée la var envoyée à la view disant si l'user créateur est le viewer
     $sameUser = false;
-    if(Auth::check()) {
+    if(cas()->isAuthenticated()) {
       if ($paste->userId == Auth::user()->id) {
       }
     }

app/Http/Controllers/UserController.php

@@ -25,19 +25,19 @@ public function dashboard(){
 		return view('paste/dashboard', ['userPastes' => Auth::user()->pastes()->get()]);
 	}
 	public function delete($link){
-		if (!Auth::check()) return redirect('/');
+		if (!cas()->isAuthenticated()) return redirect('/');
 		$userPaste = Paste::where('link', $link)->firstOrFail();
 		if ($userPaste->userId != Auth::user()->id) return redirect('/login');
 		$userPaste->forceDelete();
 		return redirect('/users/dashboard');
 	}
 	public function account(){
-		if (!Auth::check()) return redirect('/login');
+		if (!cas()->isAuthenticated()) return redirect('/login');
 		$user = User::where('id', Auth::user()->id)->first();
 		return view('paste.account', ['user' => $user]);
 	}
 	public function editAccount(Request $request){
-		if (!Auth::check()) return redirect('/login');
+		if (!cas()->isAuthenticated()) return redirect('/login');
 		if (Input::get('password') != ""){
 			$this->validate($request, [
 				'name' => 'max:30|required',

resources/views/paste/account.blade.php

@@ -5,7 +5,7 @@
 @section('navbar')
 <li class="nav-item"><a href="/" class="nav-link">Home</a></li>
 {{--
-@if (Auth::check())
+@if (cas()->isAuthenticated())
 <li class="nav-item"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
 <li class="nav-item active"><a href="/users/account" class="nav-link">My Account</a></li>
 <li class="nav-item"><a href="/logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>

resources/views/paste/dashboard.blade.php

@@ -5,7 +5,7 @@
 @section('navbar')
 <li class="nav-item"><a href="/" class="nav-link">Home</a></li>
 {{--
-@if (Auth::check())
+@if (cas()->isAuthenticated())
 <li class="nav-item active"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
 <li class="nav-item"><a href="/users/account" class="nav-link">My Account</a></li>
 <li class="nav-item"><a href="/logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>

resources/views/paste/edit.blade.php

@@ -5,7 +5,7 @@
 @section('navbar')
 <li class="nav-item"><a href="/" class="nav-link">Home</a></li>
 {{--
-@if (Auth::check())
+@if (cas()->isAuthenticated())
 <li class="nav-item"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
 <li class="nav-item"><a href="/users/account" class="nav-link">My Account</a></li>
 <li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>
@@ -112,7 +112,7 @@ function checkvalue(value)
 				<div class="checkbox">
 					<label><input type="checkbox" name="noSyntax" @if ($noSyntax) checked @endif>Disable syntax highlighting</label>
 				</div>
-				<button type="submit" id="submit" class="btn @if (count($errors) > 0) btn-danger @else btn-outline-success @endif  btn-lg" @if (!Auth::check()) data-toggle="tooltip" data-placement="top" title="Registered users have access to other privacy tools" @endif>Submit</button>
+				<button type="submit" id="submit" class="btn @if (count($errors) > 0) btn-danger @else btn-outline-success @endif  btn-lg" @if (!cas()->isAuthenticated()) data-toggle="tooltip" data-placement="top" title="Registered users have access to other privacy tools" @endif>Submit</button>
 			</div>
 		</div>
 

resources/views/paste/index.blade.php

@@ -5,7 +5,7 @@
 @section('navbar')
 <li class="nav-item active"><a href="#" class="nav-link">Home</a></li>
 {{--
-@if (Auth::check())
+@if (cas()->isAuthenticated())
 <li class="nav-item"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
 <li class="nav-item"><a href="/users/account" class="nav-link">My Account</a></li>
 <li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>
@@ -80,7 +80,7 @@ function checkvalue(value)
 				<select class="form-control" name="privacy" id="privacy" onchange='checkvalue(this.value)'>
 					<option value="link">Unlisted, access with link</option>
 					<option value="password" @if ($errors->has('pastePassword')) selected="selected" @endif>Password-protected</option>
-					@if (Auth::check())
+					@if (cas()->isAuthenticated())
 					<option value="private">Private, only me</option>
 					@endif
 				</select>
@@ -107,7 +107,7 @@ function checkvalue(value)
 				<div class="checkbox">
 					<label><input type="checkbox" name="noSyntax">Disable syntax highlighting</label>
 				</div>
-				<button type="submit" id="submit" class="btn @if (count($errors) > 0) btn-danger @else btn-outline-success @endif  btn-lg" @if (!Auth::check()) data-toggle="tooltip" data-placement="top" title="Registered users have access to other privacy tools" @endif>Submit</button>
+				<button type="submit" id="submit" class="btn @if (count($errors) > 0) btn-danger @else btn-outline-success @endif  btn-lg" @if (!cas()->isAuthenticated()) data-toggle="tooltip" data-placement="top" title="Registered users have access to other privacy tools" @endif>Submit</button>
 			</div>
 		</div>
 

resources/views/paste/password.blade.php

@@ -5,7 +5,7 @@
 @section('navbar')
 <li class="nav-item"><a href="/" class="nav-link">Home</a></li>
 {{--
-@if (Auth::check())
+@if (cas()->isAuthenticated())
 <li class="nav-item"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
 <li class="nav-item"><a href="/users/account" class="nav-link">My Account</a></li>
 <li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>

resources/views/paste/view.blade.php

@@ -6,7 +6,7 @@
 @section('navbar')
 <li class="nav-item"><a href="/" class="nav-link">Home</a></li>
 {{--
-@if (Auth::check())
+@if (cas()->isAuthenticated())
 <li class="nav-item"><a href="/users/dashboard" class="nav-link">Dashboard</a></li>
 <li class="nav-item"><a href="/users/account" class="nav-link">My Account</a></li>
 <li class="nav-item"><a href=" /logout" class="nav-link">Logout <i>({{ Auth::user()->name }})</i></a></li>