From d13b2f870ac1b68a53524d8af7f2e41ba078e543 Mon Sep 17 00:00:00 2001
From: Kekskurse <git@kekskurse.de>
Date: Wed, 17 Jul 2019 14:52:22 +0200
Subject: [PATCH] OPATUT, WE WENT OVER THIS. EXPANDTAB.

---
 app/Http/Controllers/oAuthController.php |  4 ++++
 app/Providers/AuthServiceProvider.php    | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/oAuthController.php b/app/Http/Controllers/oAuthController.php
index 2a98786..45e59fd 100644
--- a/app/Http/Controllers/oAuthController.php
+++ b/app/Http/Controllers/oAuthController.php
@@ -27,6 +27,10 @@ class oAuthController extends Controller
     }
 
     public function authorizeView(Request $request) {
+        if(getenv("NEW_GUI")){
+            $guiURL = getenv("GUI_URL")."/#/oauth?".$_SERVER['QUERY_STRING'];
+            return redirect($guiURL);
+        }
         $app = App::query()->where("apiKey", "=", $request->input("client_id"))->first();
         $user = Auth::user();
         $redirect = false;
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index eeddcfb..1ec4097 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -6,6 +6,7 @@ use App\Models\AccessToken;
 use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\ServiceProvider;
 
 class AuthServiceProvider extends ServiceProvider
@@ -65,7 +66,7 @@ class AuthServiceProvider extends ServiceProvider
         if(isset($_GET["token"])) {
             $token = $_GET["token"];
         }
-
+        Log::debug("Request Header", getallheaders());
         if(!is_null($request)) {
             if($request->header("Authorization", false)) {
                 $token = trim($request->header("Authorization"));
@@ -74,9 +75,16 @@ class AuthServiceProvider extends ServiceProvider
             }
         } else {
             $headers = getallheaders();
-            $token = trim($headers["Authorization"]);
-            $t = explode(" ", $token);
-            $token = last($t);
+            if(isset($headers["Authorization"])) {
+                $token = trim($headers["Authorization"]);
+                $t = explode(" ", $token);
+                $token = last($t);
+            }
+            if(isset($headers["authorization"])) {
+                $token = trim($headers["authorization"]);
+                $t = explode(" ", $token);
+                $token = last($t);
+            }
         }