sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Heartbeat: Do not disable the login prompts when the user needs to log in again but has closed the log in modal. Add a 5 minutes timeout before asking them to log in again.

Browse Source 
Props dsixinetu, adamsilverstein, azaozz.
Fixes #49573.

git-svn-id: https://develop.svn.wordpress.org/trunk@48337 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2020-07-06 16:12:24 +00:00
parent 46971a83ec
commit 9f8a9a3239
1 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/js/_enqueues/lib/auth-check.js
View File

@ -6,7 +6,9 @@
/* global adminpage */ /* global adminpage */
( function( $ ) { ( function( $ ) {
var wrap; var wrap,
tempHidden,
tempHiddenTimeout;
/** /**
* Shows the authentication form popup. * Shows the authentication form popup.
@ -22,8 +24,8 @@
if ( form.length ) { if ( form.length ) {
// Add unload confirmation to counter (frame-busting) JS redirects. // Add unload confirmation to counter (frame-busting) JS redirects.
$(window).on( 'beforeunload.wp-auth-check', function(e) { $( window ).on( 'beforeunload.wp-auth-check', function( event ) {
e.originalEvent.returnValue = wp.i18n.__( 'Your session has expired. You can log in again from this page or go to the login page.' ); event.originalEvent.returnValue = window.wp.i18n.__( 'Your session has expired. You can log in again from this page or go to the login page.' );
}); });
frame = $( '<iframe id="wp-auth-check-frame" frameborder="0">' ).attr( 'title', noframe.text() ); frame = $( '<iframe id="wp-auth-check-frame" frameborder="0">' ).attr( 'title', noframe.text() );
@ -37,7 +39,7 @@
try { try {
body = $( this ).contents().find( 'body' ); body = $( this ).contents().find( 'body' );
height = body.height(); height = body.height();
} catch(e) { } catch( er ) {
wrap.addClass( 'fallback' ); wrap.addClass( 'fallback' );
parent.css( 'max-height', '' ); parent.css( 'max-height', '' );
form.remove(); form.remove();
@ -46,10 +48,11 @@
} }
if ( height ) { if ( height ) {
if ( body && body.hasClass('interim-login-success') ) if ( body && body.hasClass( 'interim-login-success' ) ) {
hide(); hide();
else } else {
parent.css( 'max-height', height + 40 + 'px' ); parent.css( 'max-height', height + 40 + 'px' );
}
} else if ( ! body || ! body.length ) { } else if ( ! body || ! body.length ) {
// Catch "silent" iframe origin exceptions in WebKit // Catch "silent" iframe origin exceptions in WebKit
// after another page is loaded in the iframe. // after another page is loaded in the iframe.
@ -92,14 +95,14 @@
* @private * @private
*/ */
function hide() { function hide() {
var adminpage = window.adminpage,
wp = window.wp;
$( window ).off( 'beforeunload.wp-auth-check' ); $( window ).off( 'beforeunload.wp-auth-check' );
// When on the Edit Post screen, speed up heartbeat // When on the Edit Post screen, speed up heartbeat
// after the user logs in to quickly refresh nonces. // after the user logs in to quickly refresh nonces.
if ( typeof adminpage !== 'undefined' && ( adminpage === 'post-php' || adminpage === 'post-new-php' ) && if ( ( adminpage === 'post-php' || adminpage === 'post-new-php' ) && wp && wp.heartbeat ) {
typeof wp !== 'undefined' && wp.heartbeat ) {
$(document).off( 'heartbeat-tick.wp-auth-check' );
wp.heartbeat.connectNow(); wp.heartbeat.connectNow();
} }
@ -110,6 +113,24 @@
}); });
} }
/**
* Set or reset the tempHidden variable used to pause showing of the modal
* after a user closes it without logging in.
*
* @since 5.5.0
* @private
*/
function setShowTimeout() {
tempHidden = true;
window.clearTimeout( tempHiddenTimeout );
tempHiddenTimeout = window.setTimeout(
function() {
tempHidden = false;
},
300000 // 5 min.
);
}
/** /**
* Binds to the Heartbeat Tick event. * Binds to the Heartbeat Tick event.
* *
@ -126,7 +147,7 @@
*/ */
$( document ).on( 'heartbeat-tick.wp-auth-check', function( e, data ) { $( document ).on( 'heartbeat-tick.wp-auth-check', function( e, data ) {
if ( 'wp-auth-check' in data ) { if ( 'wp-auth-check' in data ) {
if ( ! data['wp-auth-check'] && wrap.hasClass('hidden') ) { if ( ! data['wp-auth-check'] && wrap.hasClass( 'hidden' ) && ! tempHidden ) {
show(); show();
} else if ( data['wp-auth-check'] && ! wrap.hasClass( 'hidden' ) ) { } else if ( data['wp-auth-check'] && ! wrap.hasClass( 'hidden' ) ) {
hide(); hide();
@ -144,6 +165,7 @@
wrap = $( '#wp-auth-check-wrap' ); wrap = $( '#wp-auth-check-wrap' );
wrap.find( '.wp-auth-check-close' ).on( 'click', function() { wrap.find( '.wp-auth-check-close' ).on( 'click', function() {
hide(); hide();
setShowTimeout();
}); });
}); });