updated unlock condition (#3770)

devtron-labs · Aug 21, 2023 · 6b6402e · 6b6402e
1 parent 70f119e
commit 6b6402e
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/pkg/user/UserService.go b/pkg/user/UserService.go
@@ -674,6 +674,12 @@ func (impl *UserServiceImpl) UpdateUser(userInfo *bean.UserInfo, token string, m
 			impl.logger.Errorw("error in locking, lockUnlockUserReqState", "userId", userInfo.Id)
 			return nil, false, false, nil, err
 		}
+		defer func() {
+			err = impl.lockUnlockUserReqState(userInfo.Id, false)
+			if err != nil {
+				impl.logger.Errorw("error in unlocking, lockUnlockUserReqState", "userId", userInfo.Id)
+			}
+		}()
 	}
 	//validating if action user is not admin and trying to update user who has super admin polices, return 403
 	isUserSuperAdmin, err := impl.IsSuperAdmin(int(userInfo.Id))
@@ -859,13 +865,6 @@ func (impl *UserServiceImpl) UpdateUser(userInfo *bean.UserInfo, token string, m
 	}
 	//loading policy for syncing orchestrator to casbin with newly added policies
 	casbin2.LoadPolicy()
-
-	err = impl.lockUnlockUserReqState(userInfo.Id, false)
-	if err != nil {
-		impl.logger.Errorw("error in unlocking, lockUnlockUserReqState", "userId", userInfo.Id)
-		return nil, false, false, nil, err
-	}
-
 	return userInfo, rolesChanged, groupsModified, restrictedGroups, nil
 }