Skip to content

Fix the URL for initiating a JSConnect Sign In when using V3. #808

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

Merged
merged 2 commits into from
May 29, 2020
Merged

Fix the URL for initiating a JSConnect Sign In when using V3. #808

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f4e3ee
Create a method to create a JWT when sending the connection request.
May 28, 2020
4c66650
Add a method to redirect all v3 sign ins to go to the jsconnect-redir…
May 28, 2020
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
47 changes: 35 additions & 12 deletions plugins/jsconnect/class.jsconnect.plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,28 @@ public function __construct(\Garden\Web\Cookie $cookie, UserModel $userModel) {
$this->userModel = $userModel;
}

/**
* Create a URL that directs the browser to the V3 redirect to create the JWT.
*
* @param array $provider JSConnect settings.
* @return string URL with the target.
*/
private static function entryRedirectURL(array $provider): string {
$target = Gdn::request()->get('Target', Gdn::request()->get('Target'));
if (!$target) {
$target = '/' . ltrim(Gdn::request()->path());
}
if (stringBeginsWith($target, '/entry/signin')) {
$target = '/';
}

$baseURL = url('/entry/jsconnect-redirect');
return $baseURL . '?' . http_build_query([
'client_id' => $provider[self::FIELD_PROVIDER_CLIENT_ID],
'target' => $target
]);
}

/**
* Get the AuthenticationSchemeAlias value.
*
Expand Down Expand Up @@ -173,18 +195,7 @@ public static function connectButton($provider, $options = []) {
* @return string
*/
private static function connectButtonV3(array $provider): string {
$target = Gdn::request()->get('target', Gdn::request()->get('target'));
if (!$target) {
$target = '/'.ltrim(Gdn::request()->path());
}
if (stringBeginsWith($target, '/entry/signin')) {
$target = '/';
}

$url = url('/entry/jsconnect-redirect').'?'.http_build_query([
'client_id' => $provider[self::FIELD_PROVIDER_CLIENT_ID],
'target' => $target
]);
$url = self::entryRedirectURL($provider);

$result = '<div class="JsConnect-Guest">'.
anchor(
Expand Down Expand Up @@ -421,6 +432,18 @@ public function authenticationProviderModel_calculateJsConnect_handler($sender,
$provider['RegisterUrlFinal'] = static::getRegisterUrl($provider, $target);
}

/**
* If this is the default provider and V3, make sure it goes through the redirect URL.
*
* @param EntryController $sender
* @param array $args
*/
public function entryController_overrideSignIn_handler($sender, $args) {
$protocol = $args['DefaultProvider']['Protocol'] ?? null;
if ($protocol === self::PROTOCOL_V3) {
$args['DefaultProvider']['SignInUrl'] = static::entryRedirectURL($args['DefaultProvider']);
}
}
/**
* Add jsConnect buttons to the page.
*
Expand Down