Skip to content
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

Fix session validation error in WebKit browsers #177

Merged
merged 1 commit into from
Jun 25, 2024
Merged

Fix session validation error in WebKit browsers #177

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
25 changes: 20 additions & 5 deletions openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/services/SessionService.jsm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* Portions copyright 2024 Wren Security.
*/

import $ from "jquery";
import _ from "lodash";

import { sessionAddInfo } from "store/actions/creators";
Expand All @@ -37,11 +38,25 @@ const getSessionInfo = (options) => {
};

export const getTimeLeft = () => {
return getSessionInfo({ suppressSpinner: true }).then((sessionInfo) => {
const idleExpiration = moment(sessionInfo.maxIdleExpirationTime).diff(moment(), "seconds");
const maxExpiration = moment(sessionInfo.maxSessionExpirationTime).diff(moment(), "seconds");
return _.min([idleExpiration, maxExpiration]);
});
// Number of seconds to indicate in case of network error (see WrenSecurity/wrenam#176)
const NETWORK_ERROR_EXPIRATION_SECONDS = 30;

return getSessionInfo({
suppressEvents: true,
suppressSpinner: true
}).then(
(sessionInfo) => {
const idleExpiration = moment(sessionInfo.maxIdleExpirationTime).diff(moment(), "seconds");
const maxExpiration = moment(sessionInfo.maxSessionExpirationTime).diff(moment(), "seconds");
return _.min([idleExpiration, maxExpiration]);
},
(jqXhr, textStatus, errorThrown) => {
if (jqXhr.status === 0) { // ignore network error
return $.Deferred().resolve(NETWORK_ERROR_EXPIRATION_SECONDS);
}
return $.Deferred().reject(jqXhr, textStatus, errorThrown);
}
);
};

export const updateSessionInfo = (options) => {
Expand Down
Loading