<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
namespace Friendica\Module\Security;
*/
class OpenID extends BaseModule
{
- public static function content(array $parameters = [])
+ protected function content(array $request = []): string
{
if (DI::config()->get('system', 'no_openid')) {
DI::baseUrl()->redirect();
}
// NOTE: we search both for normalised and non-normalised form of $authid
- // because the normalization step was removed from setting
- // mod/settings.php in 8367cad so it might have left mixed
- // records in the user table
+ // because the normalization step was removed from settings
+ // in commit 8367cadeeffec4b6792a502847304b17ceba5882, so it might
+ // have left mixed records in the user table
//
$condition = ['blocked' => false, 'account_expired' => false, 'account_removed' => false, 'verified' => true,
'openid' => [$authId, Strings::normaliseOpenID($authId)]];
// successful OpenID login
$session->remove('openid');
- DI::auth()->setForUser(self::getApp(), $user, true, true);
+ DI::auth()->setForUser(DI::app(), $user, true, true);
- // just in case there was no return url set
- // and we fell through
- DI::baseUrl()->redirect();
+ $this->baseUrl->redirect(DI::session()->pop('return_path', ''));
}
// Successful OpenID login - but we can't match it to an existing account.
$session->set('openid_identity', $authId);
// Detect the server URL
- $open_id_obj = new LightOpenID(DI::baseUrl()->getHostName());
+ $open_id_obj = new LightOpenID(DI::baseUrl()->getHostname());
$open_id_obj->identity = $authId;
$session->set('openid_server', $open_id_obj->discover($open_id_obj->identity));
if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED) {
- notice($l10n->t('Account not found. Please login to your existing account to add the OpenID to it.'));
+ DI::sysmsg()->addNotice($l10n->t('Account not found. Please login to your existing account to add the OpenID to it.'));
} else {
- notice($l10n->t('Account not found. Please register a new account or login to your existing account to add the OpenID to it.'));
+ DI::sysmsg()->addNotice($l10n->t('Account not found. Please register a new account or login to your existing account to add the OpenID to it.'));
}
DI::baseUrl()->redirect('login');
}
}
+
+ return '';
}
}