minor refactoring

Author: ashishdevtron

api/auth/user/UserRestHandler.go

@@ -210,12 +210,12 @@ func (handler UserRestHandlerImpl) CreateUser(w http.ResponseWriter, r *http.Req
 
 		if len(restrictedGroups) != len(userInfo.UserRoleGroup) {
 			// warning
-			message := fmt.Errorf("User permissions added partially. %v%v", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
+			message := fmt.Errorf("User permissions added partially. %s%s", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
 			common.WriteJsonResp(w, message, nil, http.StatusExpectationFailed)
 
 		} else {
 			//error
-			message := fmt.Errorf("Permission could not be added. %v%v", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
+			message := fmt.Errorf("Permission could not be added. %s%s", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
 			common.WriteJsonResp(w, message, nil, http.StatusBadRequest)
 		}
 	}
@@ -271,12 +271,12 @@ func (handler UserRestHandlerImpl) UpdateUser(w http.ResponseWriter, r *http.Req
 
 		if rolesChanged || groupsModified {
 			// warning
-			message := fmt.Errorf("User permissions updated partially. %v%v", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
+			message := fmt.Errorf("User permissions updated partially. %s%s", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
 			common.WriteJsonResp(w, message, nil, http.StatusExpectationFailed)
 
 		} else {
 			//error
-			message := fmt.Errorf("Permission could not be added/removed. %v%v", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
+			message := fmt.Errorf("Permission could not be added/removed. %s%s", errorMessageForGroupsWithoutSuperAdmin, errorMessageForGroupsWithSuperAdmin)
 			common.WriteJsonResp(w, message, nil, http.StatusBadRequest)
 		}
 	}

pkg/auth/user/UserService.go

@@ -415,11 +415,8 @@ func (impl *UserServiceImpl) createUserIfNotExists(userInfo *bean.UserInfo, emai
 			if hasAccessToGroup {
 				policies = append(policies, casbin2.Policy{Type: "g", Sub: casbin2.Subject(userInfo.EmailId), Obj: casbin2.Object(userGroup.CasbinName)})
 			} else {
-				trimmedGroup := strings.TrimPrefix(item.RoleGroup.Name, "group:")
-				restrictedGroups = append(restrictedGroups, bean.RestrictedGroup{
-					Group:                   trimmedGroup,
-					HasSuperAdminPermission: hasSuperAdminPermission,
-				})
+				restrictedGroup := adapter.CreateRestrictedGroup(item.RoleGroup.Name, hasSuperAdminPermission)
+				restrictedGroups = append(restrictedGroups, restrictedGroup)
 			}
 		}
 		// END GROUP POLICY
@@ -787,11 +784,8 @@ func (impl *UserServiceImpl) UpdateUser(userInfo *bean.UserInfo, token string, m
 					groupsModified = true
 					addedPolicies = append(addedPolicies, casbin2.Policy{Type: "g", Sub: casbin2.Subject(userInfo.EmailId), Obj: casbin2.Object(userGroup.CasbinName)})
 				} else {
-					trimmedGroup := strings.TrimPrefix(item.RoleGroup.Name, "group:")
-					restrictedGroups = append(restrictedGroups, bean.RestrictedGroup{
-						Group:                   trimmedGroup,
-						HasSuperAdminPermission: hasSuperAdminPermission,
-					})
+					restrictedGroup := adapter.CreateRestrictedGroup(item.RoleGroup.Name, hasSuperAdminPermission)
+					restrictedGroups = append(restrictedGroups, restrictedGroup)
 				}
 			}
 		}
@@ -808,11 +802,8 @@ func (impl *UserServiceImpl) UpdateUser(userInfo *bean.UserInfo, token string, m
 							}
 							eliminatedPolicies = append(eliminatedPolicies, casbin2.Policy{Type: "g", Sub: casbin2.Subject(userInfo.EmailId), Obj: casbin2.Object(item)})
 						} else {
-							trimmedGroup := strings.TrimPrefix(item, "group:")
-							restrictedGroups = append(restrictedGroups, bean.RestrictedGroup{
-								Group:                   trimmedGroup,
-								HasSuperAdminPermission: hasSuperAdminPermission,
-							})
+							restrictedGroup := adapter.CreateRestrictedGroup(item, hasSuperAdminPermission)
+							restrictedGroups = append(restrictedGroups, restrictedGroup)
 						}
 					}
 				}

pkg/auth/user/adapter/adapter.go

@@ -1,7 +1,9 @@
 package adapter
 
 import (
+	"github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/pkg/auth/user/repository"
+	"strings"
 	"time"
 )
 
@@ -12,3 +14,11 @@ func GetLastLoginTime(model repository.UserModel) time.Time {
 	}
 	return lastLoginTime
 }
+
+func CreateRestrictedGroup(roleGroupName string, hasSuperAdminPermission bool) bean.RestrictedGroup {
+	trimmedGroup := strings.TrimPrefix(roleGroupName, "group:")
+	return bean.RestrictedGroup{
+		Group:                   trimmedGroup,
+		HasSuperAdminPermission: hasSuperAdminPermission,
+	}
+}