summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings/user_settings_security/index.js
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-08-01 11:06:53 -0400
committerGitHub <noreply@github.com>2017-08-01 11:06:53 -0400
commit5da5c0bbfb80cb5c9cf2699f42d17decc2d60f5b (patch)
treefdd886332e75a9ae8138a31d3c34b240adb094b5 /webapp/components/user_settings/user_settings_security/index.js
parent4ef844298fdb0d6fb41eac760f8ac00cee82b3bc (diff)
downloadchat-5da5c0bbfb80cb5c9cf2699f42d17decc2d60f5b.tar.gz
chat-5da5c0bbfb80cb5c9cf2699f42d17decc2d60f5b.tar.bz2
chat-5da5c0bbfb80cb5c9cf2699f42d17decc2d60f5b.zip
PLT-6987 User access token UI (#7007)
* Add user access token UI * Fix enter press and update mattermost-redux * Updating UI for access token stuff (#7066) * Revert segment key
Diffstat (limited to 'webapp/components/user_settings/user_settings_security/index.js')
-rw-r--r--webapp/components/user_settings/user_settings_security/index.js16
1 files changed, 13 insertions, 3 deletions
diff --git a/webapp/components/user_settings/user_settings_security/index.js b/webapp/components/user_settings/user_settings_security/index.js
index cdbabd055..a3e83d7de 100644
--- a/webapp/components/user_settings/user_settings_security/index.js
+++ b/webapp/components/user_settings/user_settings_security/index.js
@@ -3,20 +3,30 @@
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
-import {getMe} from 'mattermost-redux/actions/users';
+import {getMe, getUserAccessTokensForUser, createUserAccessToken, revokeUserAccessToken, clearUserAccessTokens} from 'mattermost-redux/actions/users';
+import * as UserUtils from 'mattermost-redux/utils/user_utils';
import SecurityTab from './user_settings_security.jsx';
function mapStateToProps(state, ownProps) {
+ const tokensEnabled = state.entities.general.config.EnableUserAccessTokens === 'true';
+ const userHasTokenRole = UserUtils.hasUserAccessTokenRole(ownProps.user.roles) || UserUtils.isSystemAdmin(ownProps.user.roles);
+
return {
- ...ownProps
+ ...ownProps,
+ userAccessTokens: state.entities.users.myUserAccessTokens,
+ canUseAccessTokens: tokensEnabled && userHasTokenRole
};
}
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({
- getMe
+ getMe,
+ getUserAccessTokensForUser,
+ createUserAccessToken,
+ revokeUserAccessToken,
+ clearUserAccessTokens
}, dispatch)
};
}