This commit is contained in:
the-djmaze 2024-02-06 14:24:56 +01:00
parent 19946fc551
commit d2c59d2e1c

View file

@ -4,8 +4,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
{ {
const const
NAME = 'Nextcloud', NAME = 'Nextcloud',
VERSION = '2.29', VERSION = '2.30',
RELEASE = '2024-01-12', RELEASE = '2024-02-05',
CATEGORY = 'Integrations', CATEGORY = 'Integrations',
DESCRIPTION = 'Integrate with Nextcloud v20+', DESCRIPTION = 'Integrate with Nextcloud v20+',
REQUIRED = '2.27.0'; REQUIRED = '2.27.0';
@ -217,8 +217,7 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
if ($sCustomEmail) { if ($sCustomEmail) {
$sEmail = $sCustomEmail; $sEmail = $sCustomEmail;
} }
if ($this->Config()->Get('plugin', 'oidc', false)) {
if (!$sEmail && $this->Config()->Get('plugin', 'oidc', false)) {
if (\OC::$server->getSession()->get('is_oidc')) { if (\OC::$server->getSession()->get('is_oidc')) {
$sEmail = "{$sUID}@nextcloud"; $sEmail = "{$sUID}@nextcloud";
$aResult['DevPassword'] = \OC::$server->getSession()->get('oidc_access_token'); $aResult['DevPassword'] = \OC::$server->getSession()->get('oidc_access_token');