cleanup invite logic

Author: kedarv

app/Http/Controllers/PageController.php

@@ -275,24 +275,20 @@ public function showCommunity()
 
     public function showInviteForm(Request $request)
     {
-        if ($request->hashid == null) {
-            return 'invalid - 1';
-        } else {
-            $id = Hashids::decode($request->hashid);
-            if (empty($id)) {
-                return 'invalid - 2';
-            }
-            $applicant = Applicant::find($id[0]);
-            if ($applicant->decision == 2) {
-                return 'link expired - account already created';
-            }
-
-            if ($applicant->decision != 1) {
-                return 'invalid - 3';
-            }
+        $id = Hashids::decode($request->hashid);
+        if (empty($id)) {
+            return redirect()->action('PageController@index')->with('message', 'Invalid link');
+        }
+        $applicant = Applicant::find($id[0]);
+        if ($applicant->decision == 2) {
+            return redirect()->action('PageController@index')->with('message', 'Expired link');
+        }
 
-            return view('invite', ['applicant' => $applicant]);
+        if ($applicant->decision != 1) {
+            return redirect()->action('PageController@index')->with('message', 'Invalid link');
         }
+
+        return view('invite', ['applicant' => $applicant]);
     }
 
     public function submitInviteForm(Request $request)

resources/views/index.blade.php

@@ -74,6 +74,9 @@
           <div class="container">
               <div class="row">
                   <div class="col-md-8 offset-md-2">
+                      @if(session('message'))
+                        <div class="alert alert-danger">{{ session('message') }}</div>
+                      @endif
                       <img src="img/logo.png" class="img-fluid logo">
                       <h1 class="brand-heading">{{ env('APP_NAME') }}</h1>
                       @if (env('APPLICATIONS_OPEN') == false)

routes/web.php

@@ -19,7 +19,7 @@
     return redirect('https://www.gitbook.com/@launchpadcs');
 });
 
-Route::get('invite/{hashid?}', 'PageController@showInviteForm');
+Route::get('invite/{hashid}', 'PageController@showInviteForm');
 Route::post('invite', 'PageController@submitInviteForm');
 
 Route::group(['middleware' => ['phase:1']], function () {