From e304b1dd26b4d489522a1a0a088e87e057c979d6 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 17 Apr 2024 01:44:25 +0200
Subject: [PATCH] Nextcloud merge oidcLogin into beforeLogin

---
 plugins/nextcloud/index.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php
index 163f27a4b..4b0540e23 100644
--- a/plugins/nextcloud/index.php
+++ b/plugins/nextcloud/index.php
@@ -87,13 +87,9 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 	public function beforeLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
 	{
 		$oSettings->username = \OC::$server->getUserSession()->getUser()->getUID();
-		$this->oidcLogin($oAccount, $oClient, $oSettings);
-	}
-
-	// https://apps.nextcloud.com/apps/oidc_login
-	// DISABLED https://github.com/the-djmaze/snappymail/issues/1420#issuecomment-1933045917
-	public function oidcLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
-	{
+/*
+		// https://apps.nextcloud.com/apps/oidc_login
+		// DISABLED https://github.com/the-djmaze/snappymail/issues/1420#issuecomment-1933045917
 		if (\OC::$server->getConfig()->getAppValue('snappymail', 'snappymail-autologin-oidc', false)
 		 && \OC::$server->getSession()->get('is_oidc')
 //		 && $oClient->supportsAuthType('OAUTHBEARER') // v2.28
@@ -104,6 +100,7 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
 				\array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER');
 			}
 		}
+*/
 	}
 
 	/*