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)
     };
 }