Skip to content

Fix looping when JSConnect fails and site has Private Community turned on. #777

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 1 commit into from
Mar 5, 2020
Merged

Fix looping when JSConnect fails and site has Private Community turned on. #777

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions plugins/jsconnect/class.jsconnect.plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,18 @@ public function entryController_jsConnect_create($sender, $action = '', $target
$get = arrayTranslate($sender->Request->get(), ['client_id', 'display']);

$sender->addDefinition('JsAuthenticateUrl', self::connectUrl($provider, true));
if ($provider['TestMode'] ?? false) {
$sender->addDefinition('JsConnectTestMode', true);
}

if (gdn::config('Garden.PrivateCommunity') && $provider['IsDefault']) {
// jsconnect.js needs to know to not to redirect if there is an error
// and PrivateCommunity is on and this is the only log in method,
// this causes a loop.
$sender->addDefinition('PrivateCommunity', true);
$sender->addDefinition('GenericSSOErrorMessage', gdn::translate('An error has occurred, please try again.'));
}

$sender->addJsFile('jsconnect.js', 'plugins/jsconnect');
$sender->setData('Title', t('Connecting...'));
$sender->Form->Action = url('/entry/connect/jsconnect?'.http_build_query($get));
Expand Down
19 changes: 17 additions & 2 deletions plugins/jsconnect/js/jsconnect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,39 @@ $.jsConnectAuthenticate = function(url) {
url: url,
dataType: 'json',
timeout: 10000,
cache: false,
success: function(data) {
var connectData = $.param(data);
if (gdn.definition('JsConnectTestMode', false)) {
console.log('AuthenticationResponse', JSON.stringify(data));
}

if ($('#Form_JsConnect-Connect').length > 0) {
if (data['error']) {
$('#Form_JsConnect-Connect').attr('action', gdn.url('/entry/jsconnect/error'));
} else if (!data['uniqueid']) {
// Just redirect to the target.
var target = $('#Form_Target').val();
if (!target)
if (!target) {
target = '/';
}

// Do not redirect if it is a private community, this will cause a loop.
if (gdn.definition('PrivateCommunity', false)) {
setTimeout(function() {
$('.Connect-Wait').hide();
$('.jsConnect-Connecting').html('<h2>'+gdn.definition('GenericSSOErrorMessage')+'</h2>');
}, 2000);
return;
}

window.location.replace(gdn.url(target));
return;
// data = {'error': 'unauthorized', 'message': 'You are not signed in.' };
// $('#Form_JsConnect-Connect').attr('action', gdn.url('/entry/jsconnect/guest'));
} else {
for (var key in data) {
if (data[key] == null) {
if (data[key] === null) {
data[key] = '';
}
}
Expand Down Expand Up @@ -114,6 +128,7 @@ $.fn.jsconnect = function(options) {
$.ajax({
url: url,
dataType: 'json',
cache: false,
success: function(data, textStatus) {
var connectUrl = gdn.url('/entry/jsconnect?client_id=' + client_id + '&Target=' + target);

Expand Down