Merge branch '2024.11'

tine-groupware · Jan 23, 2025 · dc8b310 · dc8b310
2 parents b14655e + edce207
commit dc8b310
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/tine20/Tinebase/Core.php b/tine20/Tinebase/Core.php
@@ -1797,16 +1797,18 @@ public static function getCoreRegistryData(): array
             $assetHash = Tinebase_Record_Abstract::generateUID(8);
         }
 
-        try {
-            $externalIdps = SSO_Controller_ExternalIdp::getInstance()->search(
-                Tinebase_Model_Filter_FilterGroup::getFilterForModel(SSO_Model_ExternalIdp::class, [
-                    [TMFA::FIELD => SSO_Model_ExternalIdp::FLD_SHOW_AS_LOGIN_OPTION,
-                        TMFA::OPERATOR => TMFA::OP_EQUALS, TMFA::VALUE => true],
-                ])
-            )->toArray();
-        } catch (Exception $e) {
-            Tinebase_Exception::log($e);
-            $externalIdps = [];
+        $externalIdps = [];
+        if (Tinebase_Application::getInstance()->isInstalled('SSO')) {
+            try {
+                $externalIdps = SSO_Controller_ExternalIdp::getInstance()->search(
+                    Tinebase_Model_Filter_FilterGroup::getFilterForModel(SSO_Model_ExternalIdp::class, [
+                        [TMFA::FIELD => SSO_Model_ExternalIdp::FLD_SHOW_AS_LOGIN_OPTION,
+                            TMFA::OPERATOR => TMFA::OP_EQUALS, TMFA::VALUE => true],
+                    ])
+                )->toArray();
+            } catch (Exception $e) {
+                Tinebase_Exception::log($e);
+            }
         }
 
         $registryData =  [

diff --git a/tine20/Tinebase/Frontend/Json.php b/tine20/Tinebase/Frontend/Json.php
@@ -600,12 +600,14 @@ public function login(?string $username = null, ?string $password = null, ?strin
 
         if (empty($username)) {
             try {
-                if (($idpId = ($this->_getRequestContextHeaders()['idpid'] ?? null)) &&
-                        ($idp = SSO_Controller_ExternalIdp::getInstance()->get($idpId)) &&
-                        $idp->{SSO_Model_ExternalIdp::FLD_SHOW_AS_LOGIN_OPTION}) {
+                if (Tinebase_Application::getInstance()->isInstalled('SSO') &&
+                    ($idpId = ($this->_getRequestContextHeaders()['idpid'] ?? null)) &&
+                    ($idp = SSO_Controller_ExternalIdp::getInstance()->get($idpId)) &&
+                    $idp->{SSO_Model_ExternalIdp::FLD_SHOW_AS_LOGIN_OPTION}) {
                     SSO_Controller::startExternalIdpAuthProcess($idp);
                 }
-            }  catch (Tinebase_Exception_NotFound) {}
+            } catch (Tinebase_Exception_NotFound) {
+            }
             if ($MFAPassword) {
                 if (null !== $MFAUserConfigId ||
                         null !== ($MFAUserConfigId = Tinebase_Config::getInstance()->{Tinebase_Config::MFA}->records?->find(Tinebase_Model_MFA_Config::FLD_PROVIDER_CLASS, Tinebase_Auth_MFA_WebAuthnAdapter::class)?->getId())) {
@@ -631,7 +633,8 @@ public function login(?string $username = null, ?string $password = null, ?strin
         }
 
         if (empty($password)) {
-            if (SSO_Controller::passwordLessLogin($username)) {
+            if (Tinebase_Application::getInstance()->isInstalled('SSO')
+                && SSO_Controller::passwordLessLogin($username)) {
                 return $this->_getLoginSuccessResponse($username);
             }
             $user = null;
@@ -785,7 +788,8 @@ public function logout()
             'success'=> true,
         );
 
-        if (Tinebase_Application::getInstance()->isInstalled('SSO') && $data = SSO_Controller::logoutHandler()) {
+        if (Tinebase_Application::getInstance()->isInstalled('SSO')
+            && $data = SSO_Controller::logoutHandler()) {
             $result = array_merge($result, $data);
         }