FWD » Core Development » Runtime Infrastructure

ISSUE DESCRIPTION:

*[MAJOR]* _functional_ @SsoReauth@.@handleSsoReauth@: No re-entrancy guard. Two @MSG_SSO_REAUTH@ messages in quick succession both @await cleanupReauthUi(true)@ (idempotent via @that.closed@) and both reach the @new p2j.ModalDialog('p2j-sso-reauth-dialog', ...)@ at sso_reauth.js:156. The second @new Dialog({id: that.id})@ at p2j.js:2013-2015 conflicts in the dijit registry.

PROPOSED FIX:

Add a module-scope inProgress Promise that serializes handleSsoReauth invocations. The second concurrent call awaits the first to complete before constructing its own dialog, eliminating the race window between cleanupReauthUi resolving and the new ModalDialog/dijit registration. The promise is cleared in a finally block so success and failure paths both release the lock.

CHANGES:

src/com/goldencode/p2j/ui/client/driver/web/res/p2j.sso_reauth.js

Before (around lines 98-160):

   var reauthDialog = null;

   /** Remaining seconds until forced logout. */

   var remainingSeconds = 0;

   ...

   async function handleSsoReauth(reauthUrl, reauthTimeoutSec)

   {

      if (!reauthUrl || typeof reauthUrl !== 'string')

      {

         console.error('SSO re-auth: Invalid re-auth URL');

         return;

      }

      const timeoutSec = (reauthTimeoutSec > 0) ? reauthTimeoutSec : 60;

      remainingSeconds = timeoutSec;

      let serverOrigin = window.location.origin;

      try { serverOrigin = new URL(p2j.socket.getLogoutPage()).origin; } catch(e) {}

      // Fully tear down any prior dialog instance (and await close) before

      // constructing a new one with the same dijit id.

      await cleanupReauthUi(true);

      // -- Create modal dialog for the re-auth overlay --

      reauthDialog = new p2j.ModalDialog('p2j-sso-reauth-dialog', document.body, '', '', true,

         {noTitle: true, noAutofocus: true});

After:

   var reauthDialog = null;

   /** Serializes concurrent handleSsoReauth invocations to prevent dijit-id collisions. */

   var inProgress = null;

   /** Remaining seconds until forced logout. */

   var remainingSeconds = 0;

   ...

   async function handleSsoReauth(reauthUrl, reauthTimeoutSec)

   {

      if (!reauthUrl || typeof reauthUrl !== 'string')

      {

         console.error('SSO re-auth: Invalid re-auth URL');

         return;

      }

      // Re-entrancy guard: if a previous handleSsoReauth is still running,

      // wait for it to complete before starting a new one. cleanupReauthUi

      // alone is not sufficient because the new ModalDialog construction

      // races the prior dialog's dijit-registry insertion.

      if (inProgress)

      {

         try { await inProgress; } catch (e) {}

      }

      inProgress = (async function()

      {

         const timeoutSec = (reauthTimeoutSec > 0) ? reauthTimeoutSec : 60;

         remainingSeconds = timeoutSec;

         let serverOrigin = window.location.origin;

         try { serverOrigin = new URL(p2j.socket.getLogoutPage()).origin; } catch(e) {}

         // Fully tear down any prior dialog instance (and await close) before

         // constructing a new one with the same dijit id.

         await cleanupReauthUi(true);

         // -- Create modal dialog for the re-auth overlay --

         reauthDialog = new p2j.ModalDialog('p2j-sso-reauth-dialog', document.body, '', '', true,

            {noTitle: true, noAutofocus: true});

         // ... rest of original body ...

      })();

      try

      {

         await inProgress;

      }

      finally

      {

         inProgress = null;

      }

   }