Skip to content

Commit 44fe603

Browse files
committed
Revert "feat: add ability to logout immediately"
This reverts commit 4dd155e. # Conflicts: # config/constants/development.js
1 parent 3ac85b3 commit 44fe603

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/routes.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import { connect } from 'react-redux'
1818
import { checkAllowedRoles } from './util/tc'
1919
import { setCookie, removeCookie, isBetaMode } from './util/cookie'
2020
import IdleTimer from 'react-idle-timer'
21+
import AlertModal from './components/Modal/AlertModal'
2122
import modalStyles from './styles/modal.module.scss'
22-
import ConfirmationModal from './components/Modal/ConfirmationModal'
2323

2424
const { ACCOUNTS_APP_LOGIN_URL, IDLE_TIMEOUT_MINUTES, IDLE_TIMEOUT_GRACE_MINUTES, COMMUNITY_APP_URL } = process.env
2525

@@ -127,25 +127,21 @@ class Routes extends React.Component {
127127
}
128128

129129
const isAllowed = checkAllowedRoles(_.get(decodeToken(this.props.token), 'roles'))
130-
const modal = (<ConfirmationModal
130+
const modal = (<AlertModal
131131
theme={theme}
132132
title='Session Timeout'
133133
message={`You've been idle for quite sometime. You'll be automatically logged out in ${this.state.logsoutIn >= 60 ? Math.ceil(this.state.logsoutIn / 60) + ' minute(s).' : this.state.logsoutIn + ' second(s)'}`}
134-
confirmText='Logout Now'
135-
cancelText='Resume Session'
136-
onCancel={() => {
134+
closeText='Resume Session'
135+
onClose={() => {
137136
clearInterval(this.state.logoutIntervalRef)
138137
if (this.idleTimer.isIdle()) {
139138
this.idleTimer.resume()
140139
this.idleTimer.reset()
141140
this.setState(state => ({
142-
...state, showIdleModal: false, logsoutIn: IDLE_TIMEOUT_GRACE_MINUTES * 60
141+
...state, showIdleModal: false, logsoutIn: 120
143142
}))
144143
}
145144
}}
146-
onConfirm={() => {
147-
window.location = `${COMMUNITY_APP_URL}/logout`
148-
}}
149145
/>)
150146

151147
return (

0 commit comments

Comments
 (0)