Add confirmation modal when logging out from the web app (#11671)
* [WiP] Add a confirmation modal before logging out from the web interface * Add confirmation to logout link in getting started footer * Please CodeClimatemaster
parent
2b853158dc
commit
fd3d45d38f
@ -1,11 +1,29 @@ |
||||
import { connect } from 'react-redux'; |
||||
import { defineMessages, injectIntl } from 'react-intl'; |
||||
import NavigationBar from '../components/navigation_bar'; |
||||
import { logOut } from 'mastodon/utils/log_out'; |
||||
import { openModal } from 'mastodon/actions/modal'; |
||||
import { me } from '../../../initial_state'; |
||||
|
||||
const messages = defineMessages({ |
||||
logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' }, |
||||
logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' }, |
||||
}); |
||||
|
||||
const mapStateToProps = state => { |
||||
return { |
||||
account: state.getIn(['accounts', me]), |
||||
}; |
||||
}; |
||||
|
||||
export default connect(mapStateToProps)(NavigationBar); |
||||
const mapDispatchToProps = (dispatch, { intl }) => ({ |
||||
onLogout () { |
||||
dispatch(openModal('CONFIRM', { |
||||
message: intl.formatMessage(messages.logoutMessage), |
||||
confirm: intl.formatMessage(messages.logoutConfirm), |
||||
onConfirm: () => logOut(), |
||||
})); |
||||
}, |
||||
}); |
||||
|
||||
export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NavigationBar)); |
||||
|
@ -0,0 +1,33 @@ |
||||
import Rails from 'rails-ujs'; |
||||
|
||||
export const logOut = () => { |
||||
const form = document.createElement('form'); |
||||
|
||||
const methodInput = document.createElement('input'); |
||||
methodInput.setAttribute('name', '_method'); |
||||
methodInput.setAttribute('value', 'delete'); |
||||
methodInput.setAttribute('type', 'hidden'); |
||||
form.appendChild(methodInput); |
||||
|
||||
const csrfToken = Rails.csrfToken(); |
||||
const csrfParam = Rails.csrfParam(); |
||||
|
||||
if (csrfParam && csrfToken) { |
||||
const csrfInput = document.createElement('input'); |
||||
csrfInput.setAttribute('name', csrfParam); |
||||
csrfInput.setAttribute('value', csrfToken); |
||||
csrfInput.setAttribute('type', 'hidden'); |
||||
form.appendChild(csrfInput); |
||||
} |
||||
|
||||
const submitButton = document.createElement('input'); |
||||
submitButton.setAttribute('type', 'submit'); |
||||
form.appendChild(submitButton); |
||||
|
||||
form.method = 'post'; |
||||
form.action = '/auth/sign_out'; |
||||
form.style.display = 'none'; |
||||
|
||||
document.body.appendChild(form); |
||||
submitButton.click(); |
||||
}; |
Loading…
Reference in new issue