Merge 50f5470 into f319e84

shopgate · Apr 5, 2019 · 3ee8ad6 · 3ee8ad6
2 parents f319e84 + 50f5470
commit 3ee8ad6
Showing 1 changed file with 28 additions and 18 deletions.
diff --git a/libraries/common/selectors/user.js b/libraries/common/selectors/user.js
@@ -8,32 +8,40 @@ import { getUrl } from './url';
 export const getUserState = state => state.user;
 
 /**
- * @param {Object} state The current application state.
- * @return {Object}
+ * Gets user.login from the redux store.
+ * @param {Object} state The application state.
+ * @return {Object|null}
  */
-export const getUserData = createSelector(
+export const getLoginData = createSelector(
   getUserState,
   (user) => {
-    if (!user.data) {
+    if (!user || !user.login) {
       return null;
     }
 
-    return user.data;
+    return user.login;
   }
 );
 
 /**
  * @param {Object} state The current application state.
  * @return {Object|null}
+ * @deprecated
  */
-export const getUserLogin = createSelector(
+export const getUserLogin = getLoginData;
+
+/**
+ * @param {Object} state The current application state.
+ * @return {Object}
+ */
+export const getUserData = createSelector(
   getUserState,
-  (userState) => {
-    if (!userState) {
+  (user) => {
+    if (!user.data) {
       return null;
     }
 
-    return userState.login;
+    return user.data;
   }
 );
 
@@ -43,7 +51,7 @@ export const getUserLogin = createSelector(
  * @return {boolean}
  */
 export const isUserLoggedIn = createSelector(
-  getUserLogin,
+  getLoginData,
   (login) => {
     if (!login) {
       return false;
@@ -98,19 +106,21 @@ export const getUserEmail = createSelector(
   }
 );
 
-/**
- * Gets user.login from the redux store.
- * @param {Object} state The application state.
- * @return {Object|null}
- */
-export const getLoginData = state => state.user.login;
-
 /**
  * Selects the disabled state of the login action from the redux store.
  * @param {Object} state The application state.
  * @return {Object|null}
  */
-export const isUserLoginDisabled = state => getLoginData(state).disabled;
+export const isUserLoginDisabled = createSelector(
+  getLoginData,
+  (login) => {
+    if (!login) {
+      return false;
+    }
+
+    return login.disabled;
+  }
+);
 
 /**
  * Gets the register url.