the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 15:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Nextcloud plugin integrate OIDC from #756

Browse source
This commit is contained in:
the-djmaze 2023-04-11 13:28:29 +02:00
parent 14ee6f1b5b
commit a889fc262a
5 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
plugins/nextcloud/index.php
View file

@ -4,8 +4,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
{
const
NAME = 'Nextcloud',
VERSION = '2.22',
RELEASE = '2023-03-28',
VERSION = '2.23',
RELEASE = '2023-04-11',
CATEGORY = 'Integrations',
DESCRIPTION = 'Integrate with Nextcloud v20+',
REQUIRED = '2.27.0';
@ -34,6 +34,9 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
$this->addTemplate('templates/PopupsNextcloudFiles.html');
$this->addTemplate('templates/PopupsNextcloudCalendars.html');
$this->addHook('imap.before-login', 'oidcLogin');
$this->addHook('smtp.before-login', 'oidcLogin');
$this->addHook('sieve.before-login', 'oidcLogin');
} else {
// \OC::$server->getConfig()->getAppValue('snappymail', 'snappymail-no-embed');
$this->addHook('main.content-security-policy', 'ContentSecurityPolicy');
@ -62,6 +65,20 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
return static::IsIntegrated() && \OC::$server->getUserSession()->isLoggedIn();
}
public function oidcLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
{
if ($this->Config()->Get('plugin', 'oidc', false)
&& \OC::$server->getSession()->get('is_oidc')
// && $oClient->supportsAuthType('OAUTHBEARER') // v2.28
) {
$sAccessToken = \OC::$server->getSession()->get('oidc_access_token');
if ($sAccessToken) {
$oSettings->Password = $sAccessToken;
\array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER');
}
}
}
/*
\OC::$server->getCalendarManager();
\OC::$server->getLDAPProvider();
@ -254,6 +271,9 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
->SetDefaultValue(true),
\RainLoop\Plugins\Property::NewInstance('calendar')->SetLabel('Enable "Put ICS in calendar"')
->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
->SetDefaultValue(false),
\RainLoop\Plugins\Property::NewInstance('oidc')->SetLabel('Login with OIDC')
->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
->SetDefaultValue(false)
);

5
snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
View file

@ -94,6 +94,11 @@ class ImapClient extends \MailSo\Net\NetClient
}
}
public function supportsAuthType(string $sasl_type) : bool
{
return $this->hasCapability("AUTH={$sasl_type}");
}
/**
* @throws \InvalidArgumentException
* @throws \MailSo\RuntimeException

1
snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
View file

@ -195,6 +195,7 @@ abstract class NetClient
}
}
abstract public function supportsAuthType(string $sasl_type) : bool;
// abstract public function Login(ConnectSettings $oSettings) : self;
abstract public function Logout() : void;

5
snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
View file

@ -70,6 +70,11 @@ class SieveClient extends \MailSo\Net\NetClient
}
}
public function supportsAuthType(string $sasl_type) : bool
{
return \in_array(\strtoupper($sasl_type), $this->aAuth);
}
/**
* @throws \InvalidArgumentException
* @throws \MailSo\RuntimeException

5
snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
View file

@ -102,6 +102,11 @@ class SmtpClient extends \MailSo\Net\NetClient
}
}
public function supportsAuthType(string $sasl_type) : bool
{
return \in_array(\strtoupper($sasl_type), $this->aAuthTypes);
}
/**
* @throws \InvalidArgumentException
* @throws \MailSo\RuntimeException