Sfoglia il codice sorgente

added back to login on confirm sms token page

Josh 4 anni fa
parent
commit
ca342e76f3

+ 3 - 3
app/Http/Controllers/AppSessionController.php

@@ -257,13 +257,13 @@ class AppSessionController extends Controller
     }
 
     public function processProLogOut(Request $request){
-        $logOutUrl = env('BACKEND_URL', 'http://localhost:8080') . '/api/session/logOut';
-        $response = Http::asForm()->withHeaders(['sessionKey'=>$request->cookie('sessionKey')])->post($logOutUrl)->json();
+        $logOutUrl = env('BACKEND_URL', 'http://localhost:8080/api') . '/session/logOut';
+        $response = Http::asForm()->withHeaders(['sessionKey'=>$request->cookie('sessionKey')])->get($logOutUrl)->json();
         if(!$response['success']){
             return back()->with("message", $response['message']);
         }
         Cookie::queue(Cookie::forget('sessionKey'));
-        return redirect(route('pro-request-sms-login-token'));
+        return redirect(route('login'));
     }
 
     public function login(Request $request)

+ 10 - 5
resources/views/confirm_sms_auth_token.blade.php

@@ -28,11 +28,16 @@
             </div>
         </form>
 
-        <div class="text-center mt-2">
-            <form action="/resend_sms_auth_token" method="post">
-                @csrf 
-                <button class="btn btn-outline-secondary">Resend SMS Auth Token</button>
-            </form>
+        <div class="d-flex mt-2">
+            <div class="mr-auto">
+                <a class="btn btn-outline-secondary" href="{{route('pro-logout')}}">Back to login</a>
+            </div>
+            <div>
+                <form action="/resend_sms_auth_token" method="post">
+                    @csrf 
+                    <button class="btn btn-outline-secondary">Resend SMS Auth Token</button>
+                </form>
+            </div>
         </div>
     </div>
 </div>

+ 1 - 1
routes/web.php

@@ -60,6 +60,7 @@ Route::post('self_reset_password', 'AppSessionController@processSelfResetPasswor
 
 
 Route::post('/resend_sms_auth_token', 'AppSessionController@resendSmsAuthToken')->name('post-resend_sms_auth_token');
+Route::get('/pro/logout', 'AppSessionController@processProLogOut')->name('pro-logout');
 
 Route::middleware('pro.auth')->group(function() {
     Route::get('/confirm_sms_auth_token', 'AppSessionController@confirmSmsAuthToken')->name('confirm_sms_auth_token');
@@ -72,7 +73,6 @@ Route::middleware('pro.auth')->group(function() {
     Route::get('/dashboard', 'ProController@dashboard')->name('pro-dashboard');
     Route::get('/pro/meet/{uid?}', 'ProController@meet');
     Route::get('/pro/get-opentok-session-key/{uid}', 'ProController@getOpentokSessionKey');
-    Route::get('/pro/logout', 'AppSessionController@processProLogOut')->name('pro-logout');
     Route::get('/note/{note_uid}', 'NoteController@renderNote')->name('render-note');
     Route::get('/select_section_template_form/{note_uid}', 'NoteController@selectSectionTemplateForm')->name('select_section_template_form');
     Route::get('/section_create_form/{note_uid}/{section_template_uid}', 'NoteController@sectionCreateForm')->name('section_create_form');