From 6283a205e6a3031ba42fe53a9c790bb3d6821546 Mon Sep 17 00:00:00 2001
From: Kekskurse <git@kekskurse.de>
Date: Tue, 30 Apr 2019 15:14:54 +0200
Subject: [PATCH] #12 stop auto redirect and add settings to admin gui

---
 app/Http/Controllers/GUI/AdminController.php |  1 +
 app/Http/Controllers/oAuthController.php     | 14 ++++++++------
 resources/views/admin/app_details.php        |  7 +++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/GUI/AdminController.php b/app/Http/Controllers/GUI/AdminController.php
index d697ac4..9b4cdf0 100644
--- a/app/Http/Controllers/GUI/AdminController.php
+++ b/app/Http/Controllers/GUI/AdminController.php
@@ -102,6 +102,7 @@ class AdminController extends Controller
         $app->show_on_webpage = (bool)$request->input("show_on_webpage", false);
         $app->hidden_in_app_list = (bool)$request->input("hidden_in_app_list", false);
         $app->user_cant_remove_app = (bool)$request->input("user_cant_remove_app", false);
+        $app->stop_auto_redirect = (bool)$request->input("stop_auto_redirect", false);
         $app->saveOrFail();
 
         $app = App::query()->where("id", "=", $id)->first("*");
diff --git a/app/Http/Controllers/oAuthController.php b/app/Http/Controllers/oAuthController.php
index f2386e2..48d8171 100644
--- a/app/Http/Controllers/oAuthController.php
+++ b/app/Http/Controllers/oAuthController.php
@@ -31,16 +31,18 @@ class oAuthController extends Controller
         $user = Auth::user();
         $redirect = false;
         if($user != null) {
+            if($app->auto_accept == true) {
+                $access->status = "allowed";
+                $access->saveOrFail();
+            }
             $access = AppAccess::getOrCreate($user->id, $app->id);
             if($access->status == "allowed") {
                 $redirect = true;
             }
-            if($app->auto_accept == true) {
-                $access->status = "allowed";
-                $access->saveOrFail();
-                $redirect = true;
-            }
-            // @ToDo: if access is already granted redirect direct without ask user again
+        }
+
+        if($app->stop_auto_redirect) {
+            $redirect = false;
         }
 
         if($redirect) {
diff --git a/resources/views/admin/app_details.php b/resources/views/admin/app_details.php
index d279386..a656afe 100644
--- a/resources/views/admin/app_details.php
+++ b/resources/views/admin/app_details.php
@@ -55,6 +55,13 @@
                             <input name="user_cant_remove_app" type="checkbox" <?php if($app->user_cant_remove_app) { echo 'checked="checked"'; } ?>>
                         </td>
                     </tr>
+                    <tr>
+                        <td>Disable auto redirect</td>
+                        <td>User always have to click a button to go to the App</td>
+                        <td>
+                            <input name="stop_auto_redirect" type="checkbox" <?php if($app->stop_auto_redirect) { echo 'checked="checked"'; } ?>>
+                        </td>
+                    </tr>
                 </table>
                 <input type="submit" class="btn btn-warning" value="Save">
             </form>