Skip to content

Commit c5d3bc3

Browse files
committed
fix idletimeout calculator not showing specialized (non-global) time in UI
1 parent 9daa2c9 commit c5d3bc3

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

server/src/main/java/password/pwm/http/IdleTimeoutCalculator.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ public static TimeDuration idleTimeoutForRequest( final PwmRequest pwmRequest )
181181
throws PwmUnrecoverableException
182182
{
183183
final PwmURL pwmURL = pwmRequest.getURL();
184+
return idleTimeoutForRequest( pwmRequest, pwmURL );
185+
}
186+
187+
public static TimeDuration idleTimeoutForRequest( final PwmRequest pwmRequest, final PwmURL pwmURL )
188+
throws PwmUnrecoverableException
189+
{
184190
final PwmApplication pwmApplication = pwmRequest.getPwmApplication();
185191
final PwmSession pwmSession = pwmRequest.getPwmSession();
186192

server/src/main/java/password/pwm/http/servlet/ClientApiServlet.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import password.pwm.http.PwmHttpRequestWrapper;
4343
import password.pwm.http.PwmRequest;
4444
import password.pwm.http.PwmSession;
45+
import password.pwm.http.PwmURL;
4546
import password.pwm.i18n.Display;
4647
import password.pwm.svc.sessiontrack.UserAgentUtils;
4748
import password.pwm.svc.stats.EpsStatistic;
@@ -66,6 +67,7 @@
6667
import javax.servlet.http.HttpServletResponse;
6768
import java.io.IOException;
6869
import java.io.Serializable;
70+
import java.net.URI;
6971
import java.time.Instant;
7072
import java.util.ArrayList;
7173
import java.util.Collection;
@@ -340,7 +342,8 @@ private static Map<String, Object> makeClientData(
340342
{
341343
try
342344
{
343-
final TimeDuration maxIdleTime = IdleTimeoutCalculator.idleTimeoutForRequest( pwmRequest );
345+
final PwmURL pwmUrl = new PwmURL( URI.create( pageUrl ), pwmRequest.getContextPath() );
346+
final TimeDuration maxIdleTime = IdleTimeoutCalculator.idleTimeoutForRequest( pwmRequest, pwmUrl );
344347
idleSeconds = maxIdleTime.as( TimeDuration.Unit.SECONDS );
345348
}
346349
catch ( final Exception e )

0 commit comments

Comments
 (0)