Merge pull request #2739 from aamsur/fix-oidc-bugs

Fix OIDC bugs
Leantime · Oct 14, 2024 · bd5140c · bd5140c
2 parents f2cc335 + 01ddf79
commit bd5140c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/Domain/Oidc/Controllers/Callback.php b/app/Domain/Oidc/Controllers/Callback.php
@@ -31,7 +31,7 @@ public function get($params): Response
  } catch (\Exception $e) {
  $this->tpl->setNotification($e->getMessage(), 'danger', 'oidc_error');
 
- return Frontcontroller::redirect(BASE_URL.'/oidc/login');
+ return Frontcontroller::redirect(BASE_URL.'/auth/login');
  }
  }
 }
diff --git a/app/Domain/Oidc/Services/Oidc.php b/app/Domain/Oidc/Services/Oidc.php
@@ -153,10 +153,14 @@ public function callback(string $code, string $state): Response
  //echo '<pre>' . print_r($tokens, true) . '</pre>';
  if (isset($tokens['id_token'])) {
  $userInfo = $this->decodeJWT($tokens['id_token']);
- } elseif (isset($tokens['access_token'])) {
+ }
+
+ if ($userInfo == null && isset($tokens['access_token'])) {
  //falback to OAuth userinfo endpoint
  $userInfo = $this->pollUserInfo($tokens['access_token']);
- } else {
+ }
+
+ if ((!isset($tokens['access_token'])) && (!isset($tokens['access_token']))) {
  $this->displayError('oidc.error.unsupportedToken');
  }