sforkowany z mirror/friendica
Merge pull request #6412 from annando/issue-6149
Issue 6149: Making OWA (hopefully) compatible with Hubzilla2022.09-rc
commit
3b80f335fa
|
@ -92,7 +92,7 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
|
||||||
['rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'],
|
['rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'],
|
||||||
['rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::baseUrl().'/follow?url={uri}'],
|
['rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::baseUrl().'/follow?url={uri}'],
|
||||||
['rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,'.$salmon_key],
|
['rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,'.$salmon_key],
|
||||||
['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-dfrn+json', 'href' => System::baseUrl().'/owa']
|
['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-zot+json', 'href' => System::baseUrl().'/owa']
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,7 @@ class Magic extends BaseModule
|
||||||
$basepath = $exp[0];
|
$basepath = $exp[0];
|
||||||
|
|
||||||
$headers = [];
|
$headers = [];
|
||||||
$headers['Accept'] = 'application/x-dfrn+json';
|
$headers['Accept'] = 'application/x-dfrn+json, application/x-zot+json';
|
||||||
$headers['X-Open-Web-Auth'] = Strings::getRandomHex();
|
$headers['X-Open-Web-Auth'] = Strings::getRandomHex();
|
||||||
|
|
||||||
// Create a header that is signed with the local users private key.
|
// Create a header that is signed with the local users private key.
|
||||||
|
|
|
@ -86,6 +86,6 @@ class Owa extends BaseModule
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
System::jsonExit($ret, 'application/x-dfrn+json');
|
System::jsonExit($ret, 'application/x-zot+json');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,6 +34,6 @@
|
||||||
<Link rel="magic-public-key"
|
<Link rel="magic-public-key"
|
||||||
href="{{$modexp}}" />
|
href="{{$modexp}}" />
|
||||||
<Link rel="http://purl.org/openwebauth/v1"
|
<Link rel="http://purl.org/openwebauth/v1"
|
||||||
type="application/x-dfrn+json"
|
type="application/x-zot+json"
|
||||||
href="{{$openwebauth}}" />
|
href="{{$openwebauth}}" />
|
||||||
</XRD>
|
</XRD>
|
||||||
|
|
Ładowanie…
Reference in New Issue