Skip to content

Use $wgOpenIDEndpoint to configure endpoint used #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanielWTQ wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use $wgOpenIDEndpoint to configure endpoint used #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions includes/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ class Hooks {
*/
public static function doSignin ( Title &$title, $article, OutputPage $out, User $user,
WebRequest $request, MediaWiki $mw ) {

global $wgOpenIDEndpoint;

$sessionId = null;
$sessionId = @$_COOKIE['fssessionid'];
$wikiSessionId = @$_COOKIE['wiki_en_session'];
Expand All @@ -66,8 +69,7 @@ public static function doSignin ( Title &$title, $article, OutputPage $out, User
}
// make sure we test if the session is expired before we auto-login
// example 1135c3c1-4dc9-477c-b5dd-c41c57f6bedf-prod
// OLD $ch = curl_init("https://ident.familysearch.org/cis-public-api/v4/session/$sessionId");
$ch = curl_init("https://ident.familysearch.org/service/ident/cis/cis-public-api/v4/session/$sessionId");
$ch = curl_init("https://$wgOpenIDEndpoint/service/ident/cis/cis-public-api/v4/session/$sessionId");
// When we curl_exec, return a string rather than output directly
curl_setopt ($ch, CURLOPT_RETURNTRANSFER, true);
// Ask for JSON instead of XML
Expand All @@ -83,8 +85,8 @@ public static function doSignin ( Title &$title, $article, OutputPage $out, User
// make sure we have a valid user before we auto-login
// if the session is stale, we'll have a statusCode of 453
// if there is no session, we'll have a user count of zero
if (
( !empty($objJson->statusCode) && ( $objJson->statusCode == 453 ) ) ||
if (
( !empty($objJson->statusCode) && ( $objJson->statusCode == 453 ) ) ||
( !count($objJson->users) )
) {
return;
Expand Down