Improve 404 page, redirect to paste after authentication when possible.

Author: pitchum

app/Http/Controllers/PasteController.php

@@ -9,6 +9,7 @@
 use \Input;
 use \Hash;
 use Session;
+use Route;
 use Cookie;
 use DB;
 use \Carbon;
@@ -115,7 +116,10 @@ public function view($link, Request $request){
       if ($paste->burnAfter == 0){
         if (time() > strtotime($paste->expiration)){
           if ($isSameUser) $expiration = "Expired";
-          else abort('404');
+          else {
+            $request->session()->flash("link", $link);
+            abort('404');
+          }
         }
         else $expiration = Carbon\Carbon::parse($paste->expiration)->diffForHumans();
       }
@@ -136,12 +140,16 @@ public function view($link, Request $request){
     // https://stackoverflow.com/questions/30212390/laravel-middleware-return-variable-to-controller
     if ($paste->privacy == "private") {
       if($isSameUser) $privacy = __('edpaste.paste.option.privacy.private');
-      else abort('404');
+      else {
+        $request->session()->flash("link", $link);
+        abort('404');
+      }
     }
     elseif ($paste->privacy == "internal"){
       if (cas()->isAuthenticated()) {
         $privacy = __('edpaste.paste.option.privacy.internal');
       } else {
+        $request->session()->flash("link", $link);
         return abort('404');
       }
     }
@@ -330,4 +338,16 @@ public function raw($link){
     }
     return response($paste->content, 200)->header('Content-Type', 'text/plain');
   }
+
+
+  public function retryAfterAuth(Request $request){
+    if (!cas()->isAuthenticated()) {
+        cas()->authenticate();
+    } else {
+      $link = session("link", "");
+      return redirect('/'.$link);
+    }
+  }
+
 }
+

resources/lang/en/edpaste.php

@@ -49,6 +49,9 @@
     'paste.views'              => '{1} :count view|[2,*] :count views',
     'paste.username'           => 'Username',
     'password.title'           => 'Password',
+    'paste.notfound'           => 'Content may be not found or expired, or access may be denied. Please <a href="/users/dashboard">log-in here</a>',
+    'button.goto.home'         => 'Return to home page',
+    'button.goto.auth'         => 'Try authenticating first',
 
     /* Password prompt page */
     'page.title.password.prompt'  => 'Password prompt - EdPaste',

resources/lang/fr/edpaste.php

@@ -49,6 +49,9 @@
     'paste.views'               => '{1} :count vue|[2,*] :count vues',
     'paste.username'            => 'Auteur',
     'password.title'              => 'Mot de passe',
+    'paste.notfound'           => 'Page non trouvée - Le post-it n\'existe pas, a expiré, ou nécessite une authentification.',
+    'button.goto.home'         => 'Retourner à la page d\'accueil',
+    'button.goto.auth'         => 'Essayez en vous authentifiant d\'abord',
 
     /* Password prompt page */
     'page.title.password.prompt'  => 'Demande de mot de passe - Post-it',

resources/views/errors/404.blade.php

@@ -11,11 +11,17 @@
   <div class="text-center">
     <div class="jumbotron">
       <h1><i>Page not found</i></h1>
-      <p class="lead hidden-xs">Content may be not found or expired, or access may be denied.</p>
+      <p class="lead hidden-xs">{{ __('edpaste.paste.notfound') }}</p>
       <hr class="m-y-2">
+      @if (cas()->isAuthenticated())
       <p class="lead">
-        <a class="btn btn-danger btn-lg" href="/" role="button">Return To Homepage</a>
+        <a class="btn btn-danger btn-lg" href="/" role="button">{{ __('edpaste.button.goto.home') }}</a>
       </p>
+      @else
+      <p class="lead">
+        <a id="authlink" class="btn btn-danger btn-lg" href="/retryAfterAuth" role="button">{{ __('edpaste.button.goto.auth') }}</a>
+      </p>
+      @endif
     </div>
   </div>
 </div>

resources/views/paste/password.blade.php

@@ -1,6 +1,6 @@
 @extends('default')
 
-@section('pagetitle') {{ __('edpaste.page.password.prompt') }} @endsection
+@section('pagetitle') {{ __('edpaste.page.title.password.prompt') }} @endsection
 
 @section('navbar')
 <li class="nav-item"><a href="/" class="nav-link">{{ __('edpaste.menu.home') }}</a></li>
@@ -27,7 +27,7 @@
             <input style="display:none" type="password" name="fakepasswordremembered"/>
 
             <div class="form-group @if (isset($wrongPassword)) has-error @endif" id="passwordInput">
-                <input type="password" class="form-control" name="pastePassword" id="pastePassword" placeholder="{{ __('edpaste.password.prompt') }}" maxlength="40" autofocus="true">
+                <input type="password" class="form-control" name="pastePassword" id="pastePassword" placeholder="{{ __('edpaste.password.field.placeholder') }}" maxlength="40" autofocus="true">
                 <button type="submit" id="submit" class="btn @if (isset($wrongPassword)) btn-danger @else btn-outline-success @endif">{{ __('edpaste.password.submit') }}</button>
             </div>
         </form>

routes/web.php

@@ -17,6 +17,7 @@
 
 Route::get('/', 'PasteController@index');
 Route::post('/', 'PasteController@submit');
+Route::get('/retryAfterAuth', 'PasteController@retryAfterAuth');
 Route::get('/{link}', 'PasteController@view')->where('link', '[a-zA-Z0-9]+');
 Route::post('/{link}', 'PasteController@view')->where('link', '[a-zA-Z0-9]+');
 Route::get('/edit/{link}', 'EditPasteController@index')->where('link', '[a-zA-Z0-9]+');