Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates for #1572

Browse source
This commit is contained in:
the-djmaze 2024-05-26 13:49:45 +02:00
parent b5dbd0cc7a
commit 4dc7ad02d5
4 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
integrations/nextcloud/snappymail/lib/Controller/FetchController.php
View file

@ -53,8 +53,7 @@ class FetchController extends Controller {
$this->config->setAppValue('snappymail', 'snappymail-autologin-with-email', $this->config->setAppValue('snappymail', 'snappymail-autologin-with-email',
isset($_POST['snappymail-autologin']) ? '2' === $_POST['snappymail-autologin'] : false); isset($_POST['snappymail-autologin']) ? '2' === $_POST['snappymail-autologin'] : false);
$this->config->setAppValue('snappymail', 'snappymail-no-embed', isset($_POST['snappymail-no-embed'])); $this->config->setAppValue('snappymail', 'snappymail-no-embed', isset($_POST['snappymail-no-embed']));
// DISABLED https://github.com/the-djmaze/snappymail/issues/1420#issuecomment-1933045917 $this->config->setAppValue('snappymail', 'snappymail-autologin-oidc', isset($_POST['snappymail-autologin-oidc']));
// $this->config->setAppValue('snappymail', 'snappymail-autologin-oidc', isset($_POST['snappymail-autologin-oidc']));
} else { } else {
return new JSONResponse([ return new JSONResponse([
'status' => 'error', 'status' => 'error',

5
integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
View file

@ -22,9 +22,8 @@ class AdminSettings implements ISettings
$keys = [ $keys = [
'snappymail-autologin', 'snappymail-autologin',
'snappymail-autologin-with-email', 'snappymail-autologin-with-email',
'snappymail-no-embed' 'snappymail-no-embed',
// DISABLED https://github.com/the-djmaze/snappymail/issues/1420#issuecomment-1933045917 'snappymail-autologin-oidc'
// 'snappymail-autologin-oidc'
]; ];
$parameters = []; $parameters = [];
foreach ($keys as $k) { foreach ($keys as $k) {

8
integrations/nextcloud/snappymail/templates/admin-local.php
View file

@ -38,15 +38,15 @@
</div> </div>
</p> </p>
<br /> <br />
<!-- DISABLED https://github.com/the-djmaze/snappymail/issues/1420#issuecomment-1933045917
<p> <p>
<input id="snappymail-autologin-oidc" name="snappymail-autologin-oidc" type="checkbox" class="checkbox" <php if ($_['snappymail-autologin-oidc']) echo 'checked="checked"'; ?>> <input id="snappymail-autologin-oidc" name="snappymail-autologin-oidc" type="checkbox" class="checkbox" <?php if ($_['snappymail-autologin-oidc']) echo 'checked="checked"'; ?>>
<label for="snappymail-autologin-oidc"> <label for="snappymail-autologin-oidc">
<php echo($l->t('Attempt to automatically login with OIDC when active')); ?> <?php echo($l->t('Attempt to automatically login with OIDC when active')); ?>
</label> </label>
</p> </p>
<br /> <br />
-->
<p> <p>
<input id="snappymail-no-embed" name="snappymail-no-embed" type="checkbox" class="checkbox" <?php if ($_['snappymail-no-embed']) echo 'checked="checked"'; ?>> <input id="snappymail-no-embed" name="snappymail-no-embed" type="checkbox" class="checkbox" <?php if ($_['snappymail-no-embed']) echo 'checked="checked"'; ?>>
<label for="snappymail-no-embed"> <label for="snappymail-no-embed">

7
plugins/nextcloud/index.php
View file

@ -4,11 +4,11 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
{ {
const const
NAME = 'Nextcloud', NAME = 'Nextcloud',
VERSION = '2.35', VERSION = '2.36',
RELEASE = '2024-03-29', RELEASE = '2024-05-26',
CATEGORY = 'Integrations', CATEGORY = 'Integrations',
DESCRIPTION = 'Integrate with Nextcloud v20+', DESCRIPTION = 'Integrate with Nextcloud v20+',
REQUIRED = '2.36.0'; REQUIRED = '2.36.2';
public function Init() : void public function Init() : void
{ {
@ -89,7 +89,6 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
$oSettings->username = \OC::$server->getUserSession()->getUser()->getUID(); $oSettings->username = \OC::$server->getUserSession()->getUser()->getUID();
// https://apps.nextcloud.com/apps/oidc_login // 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) if (\OC::$server->getConfig()->getAppValue('snappymail', 'snappymail-autologin-oidc', false)
&& \OC::$server->getSession()->get('is_oidc') && \OC::$server->getSession()->get('is_oidc')
// && $oClient->supportsAuthType('OAUTHBEARER') // v2.28 // && $oClient->supportsAuthType('OAUTHBEARER') // v2.28