From 8948d22095d503d8e9324948c0921248879e27eb Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 5 Feb 2024 20:16:25 +0100
Subject: [PATCH] This might solve #1420 ?

---
 .../nextcloud/snappymail/lib/Util/SnappyMailHelper.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index 409de91b3..77f03ee15 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -126,10 +126,18 @@ class SnappyMailHelper
 
 	public static function getLoginCredentials() : array
 	{
+		$sUID = \OC::$server->getUserSession()->getUser()->getUID();
+
+		if (\OC::$server->getSession()->get('is_oidc')) {
+			$sAccessToken = \OC::$server->getSession()->get('oidc_access_token');
+			if ($sAccessToken) {
+				return [$sUID, "oidc@nextcloud", $sAccessToken];
+			}
+		}
+
 		$sEmail = '';
 		$sPassword = '';
 		$config = \OC::$server->getConfig();
-		$sUID = \OC::$server->getUserSession()->getUser()->getUID();
 		$ocSession = \OC::$server->getSession();
 		// Only use the user's password in the current session if they have
 		// enabled auto-login using Nextcloud username or email address.