@frontegg/redux-store 7.99.0 → 7.100.0-alpha.0

package/auth/ProfileState/actions.js

@@ -11,14 +11,35 @@ export default ((store, api, sharedActions) => {
   const resetProfileState = () => {
     deepResetState(store, ['auth', 'profileState'], initialState);
   };
+
+  /**
+   * Helper function to preserve groups from currentUser if profile doesn't have them
+   * The authorization API returns merged roles/permissions but may not include groups array
+   * @param profileData - User profile data from API (may or may not have groups)
+   * @param currentUser - Current user from store (has groups if they were loaded before)
+   * @returns Groups array to use (prefers profile.groups if they exist, otherwise currentUser.groups)
+   */
+  const preserveGroups = (profileData, currentUser) => {
+    if (profileData != null && profileData.groups && profileData.groups.length > 0) {
+      return profileData.groups;
+    }
+    if (currentUser != null && currentUser.groups && currentUser.groups.length > 0) {
+      return currentUser.groups;
+    }
+    return profileData == null ? void 0 : profileData.groups;
+  };
   const loadProfile = async () => {
     setProfileState({
       loading: true
     });
     try {
-      const profile = await retry(api.teams.getProfile, 3, 2000);
+      const profile = await retry(api.auth.getMeAndEntitlements, 3, 2000);
       const currentUser = store.auth.user;
-      actions.setUser(_extends({}, currentUser, profile));
+      const preservedGroups = preserveGroups(profile, currentUser);
+      const mergedUser = _extends({}, currentUser, profile, {
+        groups: preservedGroups
+      });
+      actions.setUser(mergedUser);
       setProfileState({
         profile,
         loading: false
@@ -117,13 +138,16 @@ export default ((store, api, sharedActions) => {
       const newProfileData = _extends({}, oldProfileData, payload, {
         profilePictureUrl: newProfilePictureUrl
       });
-
-      //TODO: change the payload type to IUpdateUserProfile which is the right type to send, currently we send more data then actually needed.
-      const profile = await api.users.updateUserProfileV2(newProfileData);
+      await api.users.updateUserProfileV2(newProfileData);
       const currentUser = store.auth.user;
-      actions.setUser(_extends({}, currentUser, profile));
+      const completeUserData = await retry(api.auth.getMeAndEntitlements, 3, 2000);
+      const preservedGroups = preserveGroups(completeUserData, currentUser);
+      const mergedUser = _extends({}, currentUser, completeUserData, {
+        groups: preservedGroups
+      });
+      actions.setUser(mergedUser);
       actions.setProfileState({
-        profile,
+        profile: completeUserData,
         saving: false,
         loading: false
       });

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.99.0
+/** @license Frontegg v7.100.0-alpha.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/auth/ProfileState/actions.js

@@ -18,14 +18,35 @@ var _default = (store, api, sharedActions) => {
   const resetProfileState = () => {
     (0, _helpers.deepResetState)(store, ['auth', 'profileState'], _state.initialState);
   };
+
+  /**
+   * Helper function to preserve groups from currentUser if profile doesn't have them
+   * The authorization API returns merged roles/permissions but may not include groups array
+   * @param profileData - User profile data from API (may or may not have groups)
+   * @param currentUser - Current user from store (has groups if they were loaded before)
+   * @returns Groups array to use (prefers profile.groups if they exist, otherwise currentUser.groups)
+   */
+  const preserveGroups = (profileData, currentUser) => {
+    if (profileData != null && profileData.groups && profileData.groups.length > 0) {
+      return profileData.groups;
+    }
+    if (currentUser != null && currentUser.groups && currentUser.groups.length > 0) {
+      return currentUser.groups;
+    }
+    return profileData == null ? void 0 : profileData.groups;
+  };
   const loadProfile = async () => {
     setProfileState({
       loading: true
     });
     try {
-      const profile = await (0, _helpers.retry)(api.teams.getProfile, 3, 2000);
+      const profile = await (0, _helpers.retry)(api.auth.getMeAndEntitlements, 3, 2000);
       const currentUser = store.auth.user;
-      actions.setUser((0, _extends2.default)({}, currentUser, profile));
+      const preservedGroups = preserveGroups(profile, currentUser);
+      const mergedUser = (0, _extends2.default)({}, currentUser, profile, {
+        groups: preservedGroups
+      });
+      actions.setUser(mergedUser);
       setProfileState({
         profile,
         loading: false
@@ -124,13 +145,16 @@ var _default = (store, api, sharedActions) => {
       const newProfileData = (0, _extends2.default)({}, oldProfileData, payload, {
         profilePictureUrl: newProfilePictureUrl
       });
-
-      //TODO: change the payload type to IUpdateUserProfile which is the right type to send, currently we send more data then actually needed.
-      const profile = await api.users.updateUserProfileV2(newProfileData);
+      await api.users.updateUserProfileV2(newProfileData);
       const currentUser = store.auth.user;
-      actions.setUser((0, _extends2.default)({}, currentUser, profile));
+      const completeUserData = await (0, _helpers.retry)(api.auth.getMeAndEntitlements, 3, 2000);
+      const preservedGroups = preserveGroups(completeUserData, currentUser);
+      const mergedUser = (0, _extends2.default)({}, currentUser, completeUserData, {
+        groups: preservedGroups
+      });
+      actions.setUser(mergedUser);
       actions.setProfileState({
-        profile,
+        profile: completeUserData,
         saving: false,
         loading: false
       });

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v7.99.0
+/** @license Frontegg v7.100.0-alpha.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@frontegg/redux-store",
-  "version": "7.99.0",
+  "version": "7.100.0-alpha.0",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
     "@frontegg/entitlements-javascript-commons": "1.1.2",
-    "@frontegg/rest-api": "7.99.0",
+    "@frontegg/rest-api": "7.100.0-alpha.0",
     "fast-deep-equal": "3.1.3",
     "get-value": "^3.0.1",
     "proxy-compare": "^3.0.0",