nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7971 from annando/issue-7685

Browse source 
Issue 7685: Just forward on remoteauth for non legacy-DFRN and other contacts
This commit is contained in:
Hypolite Petovan 2019-12-19 07:51:49 -05:00 committed by GitHub
commit 85ae12a873
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/api.php
View file

@ -5098,14 +5098,17 @@ function api_friendica_remoteauth()
// traditional DFRN // traditional DFRN
$contact = DBA::selectFirst('contact', [], ['uid' => api_user(), 'nurl' => $c_url]); $contact = DBA::selectFirst('contact', [], ['uid' => api_user(), 'nurl' => $c_url]);
if (!DBA::isResult($contact)) {
if (!DBA::isResult($contact) || ($contact['network'] !== Protocol::DFRN)) {
throw new BadRequestException("Unknown contact"); throw new BadRequestException("Unknown contact");
} }
$cid = $contact['id']; $cid = $contact['id'];
$dfrn_id = $contact['issued-id'] ?? $contact['dfrn-id']; $dfrn_id = $contact['issued-id'] ?: $contact['dfrn-id'];
if (($contact['network'] !== Protocol::DFRN) || empty($dfrn_id)) {
System::externalRedirect($url ?: $c_url);
}
if ($contact['duplex'] && $contact['issued-id']) { if ($contact['duplex'] && $contact['issued-id']) {
$orig_id = $contact['issued-id']; $orig_id = $contact['issued-id'];