Skip to content

Commit f675857

Browse files
Merge pull request #26 from qwertyllo/patch-1
Fix unmanaged exception when Azure response contents are missing
2 parents bb26d8b + 4366adc commit f675857

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/Azure.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ public function handle($request, Closure $next)
6161
$this->fail($request, $e);
6262
}
6363

64+
if (empty($contents->access_token) || empty($contents->refresh_token)) {
65+
$this->fail($request, \Exception('Missing tokens in response contents'));
66+
}
67+
6468
$request->session()->put('_rootinc_azure_access_token', $contents->access_token);
6569
$request->session()->put('_rootinc_azure_refresh_token', $contents->refresh_token);
6670

@@ -177,10 +181,10 @@ protected function success(Request $request, $access_token, $refresh_token, $pro
177181
* Handler that is called when a failed handshake has taken place
178182
*
179183
* @param \Illuminate\Http\Request $request
180-
* @param \GuzzleHttp\Exception\RequestException $e
184+
* @param \Exception $e
181185
* @return string
182186
*/
183-
protected function fail(Request $request, RequestException $e)
187+
protected function fail(Request $request, \Exception $e)
184188
{
185189
// Added by smitthhyy 18Dec2019 - Return 403 if user authenticates in AD but is not assigned to this application
186190
if ($request->isMethod('get')) {

0 commit comments

Comments
 (0)