From 1138dd67705829a6af0d6c610cf3dbe09082187c Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Wed, 14 Jun 2017 08:56:56 -0400 Subject: PLT-6657 Move system console to use v4 endpoints and redux (#6572) * Move system console to use v4 endpoints and redux * Rename logs dir to get past gitignore * Fix test email * Update brand unit test * Updates per feedback --- webapp/actions/admin_actions.jsx | 302 +++++++++++++++++++-------------------- 1 file changed, 149 insertions(+), 153 deletions(-) (limited to 'webapp/actions') diff --git a/webapp/actions/admin_actions.jsx b/webapp/actions/admin_actions.jsx index 9a522caf9..04d0d65bb 100644 --- a/webapp/actions/admin_actions.jsx +++ b/webapp/actions/admin_actions.jsx @@ -2,201 +2,154 @@ // See License.txt for license information. import Client from 'client/web_client.jsx'; -import * as AsyncClient from 'utils/async_client.jsx'; import {browserHistory} from 'react-router/es6'; -// Redux actions import store from 'stores/redux_store.jsx'; const dispatch = store.dispatch; const getState = store.getState; -import {getUser} from 'mattermost-redux/actions/users'; +import {updateUserMfa, updateUserPassword} from 'mattermost-redux/actions/users'; +import * as AdminActions from 'mattermost-redux/actions/admin'; export function saveConfig(config, success, error) { - Client.saveConfig( - config, - () => { - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + AdminActions.updateConfig(config)(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.updateConfig.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } export function reloadConfig(success, error) { - Client.reloadConfig( - () => { - AsyncClient.getConfig(); - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + AdminActions.reloadConfig()(dispatch, getState).then( + (data) => { + if (data && success) { + AdminActions.getConfig()(dispatch, getState); + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.reloadConfig.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } export function adminResetMfa(userId, success, error) { - Client.adminResetMfa( - userId, - () => { - getUser(userId)(dispatch, getState); - - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + updateUserMfa(userId, false)(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.users.updateUser.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } export function getClusterStatus(success, error) { - Client.getClusterStatus( + AdminActions.getClusterStatus()(dispatch, getState).then( (data) => { - if (success) { + if (data && success) { success(data); - } - }, - (err) => { - AsyncClient.dispatchError(err, 'getClusterStatus'); - if (error) { - error(err); - } - } - ); -} - -export function saveComplianceReports(job, success, error) { - Client.saveComplianceReports( - job, - () => { - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + } else if (data == null && error) { + const serverError = getState().requests.admin.getClusterStatus.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } export function testEmail(config, success, error) { - Client.testEmail( - config, - () => { - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + AdminActions.testEmail(config)(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.testEmail.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } export function ldapTest(success, error) { - Client.ldapTest( - () => { - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + AdminActions.testLdap()(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.testLdap.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } export function invalidateAllCaches(success, error) { - Client.invalidateAllCaches( - () => { - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + AdminActions.invalidateCaches()(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.invalidateCaches.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } export function recycleDatabaseConnection(success, error) { - Client.recycleDatabaseConnection( - () => { - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + AdminActions.recycleDatabase()(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.recycleDatabase.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } export function adminResetPassword(userId, password, success, error) { - Client.adminResetPassword( - userId, - password, - () => { - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + updateUserPassword(userId, '', password)(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.users.updateUser.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } export function samlCertificateStatus(success, error) { - Client.samlCertificateStatus( + AdminActions.getSamlCertificateStatus()(dispatch, getState).then( (data) => { - if (success) { + if (data && success) { success(data); - } - }, - (err) => { - if (error) { - error(err); + } else if (data == null && error) { + const serverError = getState().requests.admin.getSamlCertificateStatus.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } export function ldapSyncNow(success, error) { - Client.ldapSyncNow( - () => { - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + AdminActions.syncLdap()(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.syncLdap.error; + error({id: serverError.server_error_id, ...serverError}); } } ); @@ -316,16 +269,13 @@ export function regenerateOAuthAppSecret(oauthAppId, success, error) { } export function uploadBrandImage(brandImage, success, error) { - Client.uploadBrandImage( - brandImage, - () => { - if (success) { - success(); - } - }, - (err) => { - if (error) { - error(err); + AdminActions.uploadBrandImage(brandImage)(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.uploadBrandImage.error; + error({id: serverError.server_error_id, ...serverError}); } } ); @@ -362,33 +312,79 @@ export function removeLicenseFile(success, error) { ); } -export function uploadCertificateFile(certificateFile, success, error) { - Client.uploadCertificateFile( - certificateFile, - () => { - if (success) { - success(); +export function uploadPublicSamlCertificate(file, success, error) { + AdminActions.uploadPublicSamlCertificate(file)(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.uploadPublicSamlCertificate.error; + error({id: serverError.server_error_id, ...serverError}); } - }, - (err) => { - if (error) { - error(err); + } + ); +} + +export function uploadPrivateSamlCertificate(file, success, error) { + AdminActions.uploadPrivateSamlCertificate(file)(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.uploadPrivateSamlCertificate.error; + error({id: serverError.server_error_id, ...serverError}); } } ); } -export function removeCertificateFile(certificateId, success, error) { - Client.removeCertificateFile( - certificateId, - () => { - if (success) { - success(); +export function uploadIdpSamlCertificate(file, success, error) { + AdminActions.uploadIdpSamlCertificate(file)(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.uploadIdpSamlCertificate.error; + error({id: serverError.server_error_id, ...serverError}); } - }, - (err) => { - if (error) { - error(err); + } + ); +} + +export function removePublicSamlCertificate(success, error) { + AdminActions.removePublicSamlCertificate()(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.removePublicSamlCertificate.error; + error({id: serverError.server_error_id, ...serverError}); + } + } + ); +} + +export function removePrivateSamlCertificate(success, error) { + AdminActions.removePrivateSamlCertificate()(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.removePrivateSamlCertificate.error; + error({id: serverError.server_error_id, ...serverError}); + } + } + ); +} + +export function removeIdpSamlCertificate(success, error) { + AdminActions.removeIdpSamlCertificate()(dispatch, getState).then( + (data) => { + if (data && success) { + success(data); + } else if (data == null && error) { + const serverError = getState().requests.admin.removeIdpSamlCertificate.error; + error({id: serverError.server_error_id, ...serverError}); } } ); -- cgit v1.2.3-1-g7c22