<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[48337] trunk/src/js/_enqueues/lib/auth-check.js: Heartbeat: Do not disable the login prompts when the user needs to log in again but has closed the log in modal.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/48337">48337</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48337","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-06 16:12:24 +0000 (Mon, 06 Jul 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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.
Props dsixinetu, adamsilverstein, azaozz.
Fixes <a href="https://core.trac.wordpress.org/ticket/49573">#49573</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueslibauthcheckjs">trunk/src/js/_enqueues/lib/auth-check.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueslibauthcheckjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/auth-check.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/auth-check.js 2020-07-06 12:02:45 UTC (rev 48336)
+++ trunk/src/js/_enqueues/lib/auth-check.js 2020-07-06 16:12:24 UTC (rev 48337)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,8 +5,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* global adminpage */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function($){
- var wrap;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+( function( $ ) {
+ var wrap,
+ tempHidden,
+ tempHiddenTimeout;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Shows the authentication form popup.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,18 +17,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @private
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function show() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var parent = $('#wp-auth-check'),
- form = $('#wp-auth-check-form'),
- noframe = wrap.find('.wp-auth-fallback-expired'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var parent = $( '#wp-auth-check' ),
+ form = $( '#wp-auth-check-form' ),
+ noframe = wrap.find( '.wp-auth-fallback-expired' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> frame, loaded = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( form.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add unload confirmation to counter (frame-busting) JS redirects.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(window).on( 'beforeunload.wp-auth-check', function(e) {
- e.originalEvent.returnValue = wp.i18n.__( 'Your session has expired. You can log in again from this page or go to the login page.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( window ).on( 'beforeunload.wp-auth-check', function( event ) {
+ event.originalEvent.returnValue = window.wp.i18n.__( 'Your session has expired. You can log in again from this page or go to the login page.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- frame = $('<iframe id="wp-auth-check-frame" frameborder="0">').attr( 'title', noframe.text() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ frame = $( '<iframe id="wp-auth-check-frame" frameborder="0">' ).attr( 'title', noframe.text() );
</ins><span class="cx" style="display: block; padding: 0 10px"> frame.on( 'load', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var height, body;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,10 +37,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> form.removeClass( 'loading' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body = $(this).contents().find('body');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ body = $( this ).contents().find( 'body' );
</ins><span class="cx" style="display: block; padding: 0 10px"> height = body.height();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } catch(e) {
- wrap.addClass('fallback');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } catch( er ) {
+ wrap.addClass( 'fallback' );
</ins><span class="cx" style="display: block; padding: 0 10px"> parent.css( 'max-height', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> form.remove();
</span><span class="cx" style="display: block; padding: 0 10px"> noframe.focus();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,25 +48,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( height ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( body && body.hasClass('interim-login-success') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( body && body.hasClass( 'interim-login-success' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> hide();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent.css( 'max-height', height + 40 + 'px' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( ! body || ! body.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Catch "silent" iframe origin exceptions in WebKit
</span><span class="cx" style="display: block; padding: 0 10px"> // after another page is loaded in the iframe.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wrap.addClass('fallback');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wrap.addClass( 'fallback' );
</ins><span class="cx" style="display: block; padding: 0 10px"> parent.css( 'max-height', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> form.remove();
</span><span class="cx" style="display: block; padding: 0 10px"> noframe.focus();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }).attr( 'src', form.data('src') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }).attr( 'src', form.data( 'src' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> form.append( frame );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'body' ).addClass( 'modal-open' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wrap.removeClass('hidden');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wrap.removeClass( 'hidden' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( frame ) {
</span><span class="cx" style="display: block; padding: 0 10px"> frame.focus();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! loaded ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wrap.addClass('fallback');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wrap.addClass( 'fallback' );
</ins><span class="cx" style="display: block; padding: 0 10px"> form.remove();
</span><span class="cx" style="display: block; padding: 0 10px"> noframe.focus();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,25 +95,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @private
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function hide() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(window).off( 'beforeunload.wp-auth-check' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var adminpage = window.adminpage,
+ wp = window.wp;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( window ).off( 'beforeunload.wp-auth-check' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // When on the Edit Post screen, speed up heartbeat
</span><span class="cx" style="display: block; padding: 0 10px"> // after the user logs in to quickly refresh nonces.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( typeof adminpage !== 'undefined' && ( adminpage === 'post-php' || adminpage === 'post-new-php' ) &&
- typeof wp !== 'undefined' && wp.heartbeat ) {
-
- $(document).off( 'heartbeat-tick.wp-auth-check' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( adminpage === 'post-php' || adminpage === 'post-new-php' ) && wp && wp.heartbeat ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.heartbeat.connectNow();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wrap.fadeOut( 200, function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wrap.addClass('hidden').css('display', '');
- $('#wp-auth-check-frame').remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wrap.addClass( 'hidden' ).css( 'display', '' );
+ $( '#wp-auth-check-frame' ).remove();
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'body' ).removeClass( 'modal-open' );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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.
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Binds to the Heartbeat Tick event.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * - Shows the authentication form popup if user is not logged in.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,9 +147,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $( document ).on( 'heartbeat-tick.wp-auth-check', function( e, data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'wp-auth-check' in data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! data['wp-auth-check'] && wrap.hasClass('hidden') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! data['wp-auth-check'] && wrap.hasClass( 'hidden' ) && ! tempHidden ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> show();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( data['wp-auth-check'] && ! wrap.hasClass('hidden') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( data['wp-auth-check'] && ! wrap.hasClass( 'hidden' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> hide();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,9 +162,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wrap = $('#wp-auth-check-wrap');
- wrap.find('.wp-auth-check-close').on( 'click', function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wrap = $( '#wp-auth-check-wrap' );
+ wrap.find( '.wp-auth-check-close' ).on( 'click', function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> hide();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setShowTimeout();
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>