Decouple the rest of an api calls

src/components/auth/actions.js

@@ -1,9 +1,9 @@
 import { routeActions } from 'react-router-redux';
 
 import { updateUser, logout as logoutUser, changePassword as changeUserPassword, authenticate } from 'components/user/actions';
-import request from 'services/request';
 import authentication from 'services/api/authentication';
 import oauth from 'services/api/oauth';
+import signup from 'services/api/signup';
 
 export function login({login = '', password = '', rememberMe = false}) {
     const PASSWORD_REQUIRED = 'error.password_required';
@@ -50,14 +50,11 @@ export function forgotPassword({
     login = ''
 }) {
     return wrapInLoader((dispatch, getState) =>
-        request.post(
+        authentication.forgotPassword({login})
-            '/api/authentication/forgot-password',
+            .then(({data = {}}) => dispatch(updateUser({
-            {login}
+                maskedEmail: data.emailMask || getState().user.email
-        )
+            })))
-        .then(({data = {}}) => dispatch(updateUser({
+            .catch(validationErrorsHandler(dispatch))
-            maskedEmail: data.emailMask || getState().user.email
-        })))
-        .catch(validationErrorsHandler(dispatch))
     );
 }
 
@@ -67,12 +64,9 @@ export function recoverPassword({
     newRePassword = ''
 }) {
     return wrapInLoader((dispatch) =>
-        request.post(
+        authentication.recoverPassword({key, newPassword, newRePassword})
-            '/api/authentication/recover-password',
+            .then(authHandler(dispatch))
-            {key, newPassword, newRePassword}
+            .catch(validationErrorsHandler(dispatch, '/forgot-password'))
-        )
-        .then(authHandler(dispatch))
-        .catch(validationErrorsHandler(dispatch, '/forgot-password'))
     );
 }
 
@@ -84,10 +78,11 @@ export function register({
     rulesAgreement = false
 }) {
     return wrapInLoader((dispatch, getState) =>
-        request.post(
+        signup.register({
-            '/api/signup',
+            email, username,
-            {email, username, password, rePassword, rulesAgreement, lang: getState().user.lang}
+            password, rePassword,
-        )
+            rulesAgreement, lang: getState().user.lang
+        })
         .then(() => {
             dispatch(updateUser({
                 username,
@@ -102,29 +97,23 @@ export function register({
 
 export function activate({key = ''}) {
     return wrapInLoader((dispatch) =>
-        request.post(
+        signup.activate({key})
-            '/api/signup/confirm',
+            .then(authHandler(dispatch))
-            {key}
+            .catch(validationErrorsHandler(dispatch, '/resend-activation'))
-        )
-        .then(authHandler(dispatch))
-        .catch(validationErrorsHandler(dispatch, '/resend-activation'))
     );
 }
 
 export function resendActivation({email = ''}) {
     return wrapInLoader((dispatch) =>
-        request.post(
+        signup.resendActivation({email})
-            '/api/signup/repeat-message',
+            .then((resp) => {
-            {email}
+                dispatch(updateUser({
-        )
+                    email
-        .then((resp) => {
+                }));
-            dispatch(updateUser({
-                email
-            }));
 
-            return resp;
+                return resp;
-        })
+            })
-        .catch(validationErrorsHandler(dispatch))
+            .catch(validationErrorsHandler(dispatch))
     );
 }
 

src/services/api/authentication.js

@@ -16,6 +16,26 @@ export default {
         return request.post('/api/authentication/logout');
     },
 
+    forgotPassword({
+        login = ''
+    }) {
+        return request.post(
+            '/api/authentication/forgot-password',
+            {login}
+        );
+    },
+
+    recoverPassword({
+        key = '',
+        newPassword = '',
+        newRePassword = ''
+    }) {
+        return request.post(
+            '/api/authentication/recover-password',
+            {key, newPassword, newRePassword}
+        );
+    },
+
     refreshToken(refresh_token) {
         return request.post(
             '/api/authentication/refresh-token',

src/services/api/signup.js

@@ -0,0 +1,31 @@
+import request from 'services/request';
+
+export default {
+    register({
+        email = '',
+        username = '',
+        password = '',
+        rePassword = '',
+        rulesAgreement = false,
+        lang = ''
+    }) {
+        return request.post(
+            '/api/signup',
+            {email, username, password, rePassword, rulesAgreement, lang}
+        );
+    },
+
+    activate({key = ''}) {
+        return request.post(
+            '/api/signup/confirm',
+            {key}
+        );
+    },
+
+    resendActivation({email = ''}) {
+        return request.post(
+            '/api/signup/repeat-message',
+            {email}
+        );
+    }
+};