Merge pull request #7907 from nupplaphil/task/reduce_app_deps

Cleanup Session/Authentication
This commit is contained in:
Hypolite Petovan 2019-12-14 09:53:40 -05:00 committed by GitHub
commit 6e4a428c73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 8791 additions and 7936 deletions

View file

@ -5,6 +5,8 @@
*/
use Friendica\App;
use Friendica\BaseObject;
use Friendica\App\Authentication;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
@ -20,7 +22,9 @@ use Friendica\Util\XML;
function dfrn_poll_init(App $a)
{
Login::sessionAuth();
/** @var Authentication $authentication */
$authentication = BaseObject::getClass(Authentication::class);
$authentication->withSession($a);
$dfrn_id = $_GET['dfrn_id'] ?? '';
$type = ($_GET['type'] ?? '') ?: 'data';

View file

@ -4,6 +4,8 @@
*/
use Friendica\App;
use Friendica\BaseObject;
use Friendica\App\Authentication;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
@ -45,7 +47,9 @@ function openid_content(App $a) {
unset($_SESSION['openid']);
Session::setAuthenticatedForUser($a, $user, true, true);
/** @var Authentication $authentication */
$authentication = BaseObject::getClass(Authentication::class);
$authentication->setForUser($a, $user, true, true);
// just in case there was no return url set
// and we fell through