diff --git a/app/Http/Controllers/ConnectedAccountController.php b/app/Http/Controllers/ConnectedAccountController.php index c93d05477935..614a4ccb9717 100644 --- a/app/Http/Controllers/ConnectedAccountController.php +++ b/app/Http/Controllers/ConnectedAccountController.php @@ -90,14 +90,15 @@ class ConnectedAccountController extends BaseController private function handleMicrosoftOauth($request) { - nlog($request->all()); + $access_token = false; + $access_token = $request->has('access_token') ? $request->input('access_token') : $request->input('accessToken'); - if (!$request->has('access_token')) { + if (!$access_token) { return response()->json(['message' => 'No access_token parameter found!'], 400); } $graph = new \Microsoft\Graph\Graph(); - $graph->setAccessToken($request->input('access_token')); + $graph->setAccessToken($access_token); $user = $graph->createRequest("GET", "/me") ->setReturnType(Model\User::class) diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index a10fff5f7931..f390f21fc507 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -727,7 +727,6 @@ class Invoice extends BaseModel return Storage::disk(config('filesystems.default'))->{$type}($file_path); } - try { $file_exists = Storage::disk('public')->exists($file_path); } catch (\Exception $e) { diff --git a/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php b/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php index 438899646beb..3655bf8f68e4 100644 --- a/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php +++ b/resources/views/portal/ninja2020/credits/show-fullscreen.blade.php @@ -1,2 +1,3 @@ - + + + diff --git a/resources/views/portal/ninja2020/quotes/show-fullscreen.blade.php b/resources/views/portal/ninja2020/quotes/show-fullscreen.blade.php index 0cfa59fec10b..22043d045fe8 100644 --- a/resources/views/portal/ninja2020/quotes/show-fullscreen.blade.php +++ b/resources/views/portal/ninja2020/quotes/show-fullscreen.blade.php @@ -1,2 +1,3 @@ - + + +