diff --git a/pro/controllers/users.go b/pro/controllers/users.go index fbd6db9d..0c6c4093 100644 --- a/pro/controllers/users.go +++ b/pro/controllers/users.go @@ -488,12 +488,12 @@ func deleteUserGroup(w http.ResponseWriter, r *http.Request) { gid, _ := url.QueryUnescape(r.URL.Query().Get("group_id")) if gid == "" { - logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("role is required"), "badrequest")) + logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("group id is required"), "badrequest")) return } userG, err := proLogic.GetUserGroup(models.UserGroupID(gid)) if err != nil { - logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("role is required"), "badrequest")) + logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("failed to fetch group details"), "badrequest")) return } err = proLogic.DeleteUserGroup(models.UserGroupID(gid)) diff --git a/pro/logic/user_mgmt.go b/pro/logic/user_mgmt.go index 84c5987b..1d336cc1 100644 --- a/pro/logic/user_mgmt.go +++ b/pro/logic/user_mgmt.go @@ -75,6 +75,9 @@ func UserRolesInit() { } func CreateDefaultNetworkRolesAndGroups(netID models.NetworkID) { + if netID.String() == "" { + return + } var NetworkAdminPermissionTemplate = models.UserRolePermissionTemplate{ ID: models.UserRoleID(fmt.Sprintf("%s-%s", netID, models.NetworkAdmin)), Default: true, @@ -120,7 +123,7 @@ func CreateDefaultNetworkRolesAndGroups(netID models.NetworkID) { models.UserRoleID(fmt.Sprintf("%s-%s", netID, models.NetworkAdmin)): {}, }, }, - MetaData: "The network role was automatically created by Netmaker.", + MetaData: "The network group was automatically created by Netmaker.", } var NetworkUserGroup = models.UserGroup{ ID: models.UserGroupID(fmt.Sprintf("%s-%s-grp", netID, models.NetworkUser)), @@ -129,7 +132,7 @@ func CreateDefaultNetworkRolesAndGroups(netID models.NetworkID) { models.UserRoleID(fmt.Sprintf("%s-%s", netID, models.NetworkUser)): {}, }, }, - MetaData: "The network role was automatically created by Netmaker.", + MetaData: "The network group was automatically created by Netmaker.", } d, _ = json.Marshal(NetworkAdminGroup) database.Insert(NetworkAdminGroup.ID.String(), string(d), database.USER_GROUPS_TABLE_NAME)