Merge pull request #151 from liayn/optional-tsfe

[BUGFIX] Cope with missing TSFE
xperseguers · May 31, 2024 · 7c55057 · 7c55057
2 parents 0ff0574 + 235b013
commit 7c55057
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Classes/Service/OAuthService.php b/Classes/Service/OAuthService.php
@@ -68,7 +68,7 @@ public function getAuthorizationUrl(array $options = []): string
         if (!empty($this->settings['oidcAuthorizeLanguageParameter'])) {
             $languageOption = $this->settings['oidcAuthorizeLanguageParameter'];
             if (!empty($languageOption)) {
-                $language = $this->getTSFE()->getLanguage()->getTwoLetterIsoCode();
+                $language = $this->getTSFE() ? $this->getTSFE()->getLanguage()->getTwoLetterIsoCode() : 'en';
                 $options[$languageOption] = $language;
             }
         }
@@ -271,8 +271,8 @@ protected function getRedirectUrl(): string
         return $this->settings['oidcRedirectUri'] ?: GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
     }
 
-    protected function getTSFE(): TypoScriptFrontendController
+    protected function getTSFE(): ? TypoScriptFrontendController
     {
-        return $GLOBALS['TSFE'];
+        return $GLOBALS['TSFE'] ?? null;
     }
 }