refactor(services): move config to serviceConfig

* authentication, flip to platform redux action * platform, userActions, move authorizeUser * platform, userTypes, move authorize user type * userReducer, flip to platform redux types * userSelectors, passthrough for transformed responses * services, move config to serviceConfig * serviceConfig, expand cancel ability to url funcs * platformServices, schemas, transformers, mock calls * rhsmServices, testing naming for consistency * userServices, remove deprecated authorizeUser func
RedHatInsights · Mar 16, 2022 · d952387 · d952387
1 parent 1064a6f
commit d952387
Show file tree

Hide file tree

Showing 40 changed files with 1,569 additions and 1,280 deletions.
diff --git a/src/components/authentication/authentication.js b/src/components/authentication/authentication.js
@@ -131,7 +131,7 @@ Authentication.propTypes = {
  */
 Authentication.defaultProps = {
   appName: routerHelpers.appName,
-  authorizeUser: reduxActions.user.authorizeUser,
+  authorizeUser: reduxActions.platform.authorizeUser,
   hideGlobalFilter: reduxActions.platform.hideGlobalFilter,
   initializeChrome: reduxActions.platform.initializeChrome,
   isDisabled: helpers.UI_DISABLED,

diff --git a/src/redux/actions/__tests__/platformActions.test.js b/src/redux/actions/__tests__/platformActions.test.js
@@ -1,6 +1,30 @@
+import promiseMiddleware from 'redux-promise-middleware';
+import { applyMiddleware, combineReducers, createStore } from 'redux';
 import { platformActions } from '../platformActions';
+import { userReducer } from '../../reducers';
 
 describe('PlatformActions', () => {
+  const middleware = [promiseMiddleware];
+  const generateStore = () =>
+    createStore(
+      combineReducers({
+        user: userReducer
+      }),
+      applyMiddleware(...middleware)
+    );
+
+  it('Should return response content for authorizeUser method', done => {
+    const store = generateStore();
+    const dispatcher = platformActions.authorizeUser();
+
+    dispatcher(store.dispatch).then(() => {
+      const response = store.getState().user;
+
+      expect(response.session.fulfilled).toBe(true);
+      done();
+    });
+  });
+
   it('Should return a dispatch object for the hideGlobalFilter method', () => {
     expect(platformActions.hideGlobalFilter()).toMatchSnapshot('dispatch object');
   });

diff --git a/src/redux/actions/__tests__/userActions.test.js b/src/redux/actions/__tests__/userActions.test.js
@@ -31,18 +31,6 @@ describe('UserActions', () => {
     moxios.uninstall();
   });
 
-  it('Should return response content for authorizeUser method', done => {
-    const store = generateStore();
-    const dispatcher = userActions.authorizeUser();
-
-    dispatcher(store.dispatch).then(() => {
-      const response = store.getState().user;
-
-      expect(response.session.fulfilled).toBe(true);
-      done();
-    });
-  });
-
   it('Should return response content for deleteAccountOptIn method', done => {
     const store = generateStore();
     const dispatcher = userActions.deleteAccountOptIn();

diff --git a/src/redux/actions/platformActions.js b/src/redux/actions/platformActions.js
@@ -29,6 +29,18 @@ const removeNotification = id => RcsRemoveNotification(id);
  */
 const clearNotifications = () => RcsClearNotifications();
 
+/**
+ * Get an emulated and combined API response from the platforms "getUser" and "getUserPermissions" global methods.
+ *
+ * @param {string|Array} appName
+ * @returns {Function}
+ */
+const authorizeUser = appName => dispatch =>
+  dispatch({
+    type: platformTypes.PLATFORM_USER_AUTH,
+    payload: Promise.all([platformServices.getUser(), platformServices.getUserPermissions(appName)])
+  });
+
 /**
  * Hide platform global filter.
  *
@@ -103,6 +115,7 @@ const platformActions = {
   addNotification,
   removeNotification,
   clearNotifications,
+  authorizeUser,
   hideGlobalFilter,
   initializeChrome,
   onNavigation,
@@ -116,6 +129,7 @@ export {
   addNotification,
   removeNotification,
   clearNotifications,
+  authorizeUser,
   hideGlobalFilter,
   initializeChrome,
   onNavigation,

diff --git a/src/redux/actions/userActions.js b/src/redux/actions/userActions.js
@@ -3,17 +3,6 @@ import { userServices } from '../../services/user/userServices';
 import { helpers } from '../../common/helpers';
 import { translate } from '../../components/i18n/i18n';
 
-/**
- * Get an emulated API response from the platforms "getUser" method.
- *
- * @returns {Function}
- */
-const authorizeUser = () => dispatch =>
-  dispatch({
-    type: userTypes.USER_AUTH,
-    payload: userServices.authorizeUser()
-  });
-
 /**
  * Get a user's locale.
  *
@@ -84,14 +73,6 @@ const updateAccountOptIn =
       }
     });
 
-const userActions = { authorizeUser, getLocale, deleteAccountOptIn, getAccountOptIn, updateAccountOptIn };
+const userActions = { getLocale, deleteAccountOptIn, getAccountOptIn, updateAccountOptIn };
 
-export {
-  userActions as default,
-  userActions,
-  authorizeUser,
-  getLocale,
-  deleteAccountOptIn,
-  getAccountOptIn,
-  updateAccountOptIn
-};
+export { userActions as default, userActions, getLocale, deleteAccountOptIn, getAccountOptIn, updateAccountOptIn };
diff --git a/src/redux/reducers/__tests__/__snapshots__/userReducer.test.js.snap b/src/redux/reducers/__tests__/__snapshots__/userReducer.test.js.snap
@@ -40,42 +40,42 @@ Object {
 }
 `;
 
-exports[`UserReducer should handle all defined error types: rejected types UPDATE_USER_OPTIN 1`] = `
+exports[`UserReducer should handle all defined error types: rejected types PLATFORM_USER_AUTH 1`] = `
 Object {
   "result": Object {
-    "optin": Object {
+    "optin": Object {},
+    "session": Object {
       "error": true,
+      "errorCodes": Array [],
       "errorMessage": "MESSAGE",
       "fulfilled": false,
+      "locale": null,
       "meta": Object {},
       "pending": false,
       "status": 0,
     },
-    "session": Object {
-      "errorCodes": Array [],
-      "locale": null,
-    },
   },
-  "type": "UPDATE_USER_OPTIN_REJECTED",
+  "type": "PLATFORM_USER_AUTH_REJECTED",
 }
 `;
 
-exports[`UserReducer should handle all defined error types: rejected types USER_AUTH 1`] = `
+exports[`UserReducer should handle all defined error types: rejected types UPDATE_USER_OPTIN 1`] = `
 Object {
   "result": Object {
-    "optin": Object {},
-    "session": Object {
+    "optin": Object {
       "error": true,
-      "errorCodes": Array [],
       "errorMessage": "MESSAGE",
       "fulfilled": false,
-      "locale": null,
       "meta": Object {},
       "pending": false,
       "status": 0,
     },
+    "session": Object {
+      "errorCodes": Array [],
+      "locale": null,
+    },
   },
-  "type": "USER_AUTH_REJECTED",
+  "type": "UPDATE_USER_OPTIN_REJECTED",
 }
 `;
 
@@ -143,10 +143,11 @@ Object {
 }
 `;
 
-exports[`UserReducer should handle all defined fulfilled types: fulfilled types UPDATE_USER_OPTIN 1`] = `
+exports[`UserReducer should handle all defined fulfilled types: fulfilled types PLATFORM_USER_AUTH 1`] = `
 Object {
   "result": Object {
-    "optin": Object {
+    "optin": Object {},
+    "session": Object {
       "data": Object {
         "permissions": Array [],
         "test": "success",
@@ -160,26 +161,23 @@ Object {
       },
       "date": null,
       "error": false,
+      "errorCodes": Array [],
       "errorMessage": "",
       "fulfilled": true,
+      "locale": null,
       "meta": Object {},
       "pending": false,
       "status": 0,
     },
-    "session": Object {
-      "errorCodes": Array [],
-      "locale": null,
-    },
   },
-  "type": "UPDATE_USER_OPTIN_FULFILLED",
+  "type": "PLATFORM_USER_AUTH_FULFILLED",
 }
 `;
 
-exports[`UserReducer should handle all defined fulfilled types: fulfilled types USER_AUTH 1`] = `
+exports[`UserReducer should handle all defined fulfilled types: fulfilled types UPDATE_USER_OPTIN 1`] = `
 Object {
   "result": Object {
-    "optin": Object {},
-    "session": Object {
+    "optin": Object {
       "data": Object {
         "permissions": Array [],
         "test": "success",
@@ -193,16 +191,18 @@ Object {
       },
       "date": null,
       "error": false,
-      "errorCodes": Array [],
       "errorMessage": "",
       "fulfilled": true,
-      "locale": null,
       "meta": Object {},
       "pending": false,
       "status": 0,
     },
+    "session": Object {
+      "errorCodes": Array [],
+      "locale": null,
+    },
   },
-  "type": "USER_AUTH_FULFILLED",
+  "type": "UPDATE_USER_OPTIN_FULFILLED",
 }
 `;
 
@@ -267,40 +267,40 @@ Object {
 }
 `;
 
-exports[`UserReducer should handle all defined pending types: pending types UPDATE_USER_OPTIN 1`] = `
+exports[`UserReducer should handle all defined pending types: pending types PLATFORM_USER_AUTH 1`] = `
 Object {
   "result": Object {
-    "optin": Object {
+    "optin": Object {},
+    "session": Object {
       "error": false,
+      "errorCodes": Array [],
       "errorMessage": "",
       "fulfilled": false,
+      "locale": null,
       "meta": Object {},
       "pending": true,
     },
-    "session": Object {
-      "errorCodes": Array [],
-      "locale": null,
-    },
   },
-  "type": "UPDATE_USER_OPTIN_PENDING",
+  "type": "PLATFORM_USER_AUTH_PENDING",
 }
 `;
 
-exports[`UserReducer should handle all defined pending types: pending types USER_AUTH 1`] = `
+exports[`UserReducer should handle all defined pending types: pending types UPDATE_USER_OPTIN 1`] = `
 Object {
   "result": Object {
-    "optin": Object {},
-    "session": Object {
+    "optin": Object {
       "error": false,
-      "errorCodes": Array [],
       "errorMessage": "",
       "fulfilled": false,
-      "locale": null,
       "meta": Object {},
       "pending": true,
     },
+    "session": Object {
+      "errorCodes": Array [],
+      "locale": null,
+    },
   },
-  "type": "USER_AUTH_PENDING",
+  "type": "UPDATE_USER_OPTIN_PENDING",
 }
 `;
 

diff --git a/src/redux/reducers/__tests__/userReducer.test.js b/src/redux/reducers/__tests__/userReducer.test.js
@@ -1,7 +1,7 @@
 import userReducer from '../userReducer';
 import { rhsmApiTypes } from '../../../types';
 import { platformConstants as platformApiTypes } from '../../../services/platform/platformConstants';
-import { appTypes, userTypes as types } from '../../types';
+import { appTypes, platformTypes, userTypes as types } from '../../types';
 import { reduxHelpers } from '../../common/reduxHelpers';
 
 describe('UserReducer', () => {
@@ -44,7 +44,12 @@ describe('UserReducer', () => {
   });
 
   it('should handle all defined error types', () => {
-    const specificTypes = [types.USER_AUTH, types.DELETE_USER_OPTIN, types.GET_USER_OPTIN, types.UPDATE_USER_OPTIN];
+    const specificTypes = [
+      platformTypes.PLATFORM_USER_AUTH,
+      types.DELETE_USER_OPTIN,
+      types.GET_USER_OPTIN,
+      types.UPDATE_USER_OPTIN
+    ];
 
     specificTypes.forEach(value => {
       const dispatched = {
@@ -71,7 +76,12 @@ describe('UserReducer', () => {
   });
 
   it('should handle all defined pending types', () => {
-    const specificTypes = [types.USER_AUTH, types.DELETE_USER_OPTIN, types.GET_USER_OPTIN, types.UPDATE_USER_OPTIN];
+    const specificTypes = [
+      platformTypes.PLATFORM_USER_AUTH,
+      types.DELETE_USER_OPTIN,
+      types.GET_USER_OPTIN,
+      types.UPDATE_USER_OPTIN
+    ];
 
     specificTypes.forEach(value => {
       const dispatched = {
@@ -88,7 +98,7 @@ describe('UserReducer', () => {
 
   it('should handle all defined fulfilled types', () => {
     const specificTypes = [
-      types.USER_AUTH,
+      platformTypes.PLATFORM_USER_AUTH,
       types.USER_LOCALE,
       types.DELETE_USER_OPTIN,
       types.GET_USER_OPTIN,

diff --git a/src/redux/reducers/userReducer.js b/src/redux/reducers/userReducer.js
@@ -1,5 +1,5 @@
 import _get from 'lodash/get';
-import { appTypes, userTypes } from '../types';
+import { appTypes, platformTypes, userTypes } from '../types';
 import { rhsmApiTypes } from '../../types/rhsmApiTypes';
 import { reduxHelpers } from '../common/reduxHelpers';
 
@@ -72,7 +72,7 @@ const userReducer = (state = initialState, action) => {
           { ref: 'optin', type: userTypes.DELETE_USER_OPTIN },
           { ref: 'optin', type: userTypes.GET_USER_OPTIN },
           { ref: 'optin', type: userTypes.UPDATE_USER_OPTIN },
-          { ref: 'session', type: userTypes.USER_AUTH }
+          { ref: 'session', type: platformTypes.PLATFORM_USER_AUTH }
         ],
         state,
         action