Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates for access token with microsoft

Browse Source
This commit is contained in:
David Bomba 2023-06-30 14:30:27 +10:00
parent 48c20b35b8
commit d53c36d3ef
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/ConnectedAccountController.php
View File

@ -90,14 +90,15 @@ class ConnectedAccountController extends BaseController
private function handleMicrosoftOauth($request) 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); return response()->json(['message' => 'No access_token parameter found!'], 400);
} }
$graph = new \Microsoft\Graph\Graph(); $graph = new \Microsoft\Graph\Graph();
$graph->setAccessToken($request->input('access_token')); $graph->setAccessToken($access_token);
$user = $graph->createRequest("GET", "/me") $user = $graph->createRequest("GET", "/me")
->setReturnType(Model\User::class) ->setReturnType(Model\User::class)

1
app/Models/Invoice.php
View File

@ -727,7 +727,6 @@ class Invoice extends BaseModel
return Storage::disk(config('filesystems.default'))->{$type}($file_path); return Storage::disk(config('filesystems.default'))->{$type}($file_path);
} }
try { try {
$file_exists = Storage::disk('public')->exists($file_path); $file_exists = Storage::disk('public')->exists($file_path);
} catch (\Exception $e) { } catch (\Exception $e) {

5
resources/views/portal/ninja2020/credits/show-fullscreen.blade.php
View File

@ -1,2 +1,3 @@
<iframe src="{{ $credit->pdf_file_path(null, 'url', true) }}" <iframe src="{{ $credit->fullscreenPdfViewer($invitation) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>
style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>
<!-- <iframe src="{{ $credit->pdf_file_path(null, 'url', true) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe> -->

5
resources/views/portal/ninja2020/quotes/show-fullscreen.blade.php
View File

@ -1,2 +1,3 @@
<iframe src="{{ $quote->pdf_file_path(null,'url',true) }}" <iframe src="{{ $quote->fullscreenPdfViewer($invitation) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>
style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe>
<!-- <iframe src="{{ $quote->pdf_file_path(null,'url',true) }}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"></iframe> -->