mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-06 09:22:42 +08:00
NET-1227: User Mgmt V2 (#3055)
* user mgmt models * define user roles * define models for new user mgmt and groups * oauth debug log * initialize user role after db conn * print oauth token in debug log * user roles CRUD apis * user groups CRUD Apis * additional api checks * add additional scopes * add additional scopes url * add additional scopes url * rm additional scopes url * setup middlleware permission checks * integrate permission check into middleware * integrate permission check into middleware * check for headers for subjects * refactor user role models * refactor user groups models * add new user to pending user via RAC login * untracked * allow multiple groups for an user * change json tag * add debug headers * refer network controls form roles, add debug headers * refer network controls form roles, add debug headers * replace auth checks, add network id to role model * nodes handler * migration funcs * invoke sync users migration func * add debug logs * comment middleware * fix get all nodes api * add debug logs * fix middleware error nil check * add new func to get username from jwt * fix jwt parsing * abort on error * allow multiple network roles * allow multiple network roles * add migration func * return err if jwt parsing fails * set global check to true when accessing user apis * set netid for acls api calls * set netid for acls api calls * update role and groups routes * add validation checks * add invite flow apis and magic links * add invited user via oauth signup automatically * create invited user on oauth signup, with groups in the invite * add group validation for user invite * update create user handler with new role mgmt * add validation checks * create user invites tables * add error logging for email invite * fix invite singup url * debug log * get query params from url * get query params from url * add query escape * debug log * debug log * fix user signup via invite api * set admin field for backward compatbility * use new role id for user apis * deprecate use of old admin fields * deprecate usage of old user fields * add user role as service user if empty * setup email sender * delete invite after user singup * add plaform user role * redirect on invite verification link * fix invite redirect * temporary redirect * fix invite redirect * point invite link to frontend * fix query params lookup * add resend support, configure email interface types * fix groups and user creation * validate user groups, add check for metrics api in middleware * add invite url to invite model * migrate rac apis to new user mgmt * handle network nodes * add platform user to default role * fix user role migration * add default on rag creation and cleanup after deletion * fix rac apis * change to invite code param * filter nodes and hosts based on user network access * extend create user group req to accomodate users * filter network based on user access * format oauth error * move user roles and groups * fix get user v1 api * move user mgmt func to pro * add user auth type to user model * fix roles init * remove platform role from group object * list only platform roles * add network roles to invite req * create default groups and roles * fix middleware for global access * create default role * fix nodes filter with global network roles * block selfupdate of groups and network roles * delete netID if net roles are empty * validate user roles nd groups on update * set extclient permission scope when rag vpn access is set * allow deletion of roles and groups * replace _ with - in role naming convention * fix failover middleware mgmt * format oauth templates * fetch route temaplate * return err if user wrong login type * check user groups on rac apis * fix rac apis * fix resp msg * add validation checks for admin invite * return oauth type * format group err msg * fix html tag * clean up default groups * create default rag role * add UI name to roles * remove default net group from user when deleted * reorder migration funcs * fix duplicacy of hosts * check old field for migration * from pro to ce make all secondary users admins * from pro to ce make all secondary users admins * revert: from pro to ce make all secondary users admins * make sure downgrades work * fix pending users approval * fix duplicate hosts * fix duplicate hosts entries * fix cache reference issue * feat: configure FRONTEND_URL during installation * disable user vpn access when network roles are modified * rm vpn acces when roles or groups are deleted * add http to frontend url * revert crypto version * downgrade crytpo version * add platform id check on user invites --------- Co-authored-by: the_aceix <aceixsmartx@gmail.com>
This commit is contained in:
@@ -41,10 +41,13 @@ func GetReturnUser(username string) (models.ReturnUser, error) {
|
||||
// ToReturnUser - gets a user as a return user
|
||||
func ToReturnUser(user models.User) models.ReturnUser {
|
||||
return models.ReturnUser{
|
||||
UserName: user.UserName,
|
||||
IsSuperAdmin: user.IsSuperAdmin,
|
||||
IsAdmin: user.IsAdmin,
|
||||
RemoteGwIDs: user.RemoteGwIDs,
|
||||
UserName: user.UserName,
|
||||
PlatformRoleID: user.PlatformRoleID,
|
||||
AuthType: user.AuthType,
|
||||
UserGroups: user.UserGroups,
|
||||
NetworkRoles: user.NetworkRoles,
|
||||
RemoteGwIDs: user.RemoteGwIDs,
|
||||
LastLoginTime: user.LastLoginTime,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,6 +56,12 @@ func SetUserDefaults(user *models.User) {
|
||||
if user.RemoteGwIDs == nil {
|
||||
user.RemoteGwIDs = make(map[string]struct{})
|
||||
}
|
||||
if len(user.NetworkRoles) == 0 {
|
||||
user.NetworkRoles = make(map[models.NetworkID]map[models.UserRoleID]struct{})
|
||||
}
|
||||
if len(user.UserGroups) == 0 {
|
||||
user.UserGroups = make(map[models.UserGroupID]struct{})
|
||||
}
|
||||
}
|
||||
|
||||
// SortUsers - Sorts slice of Users by username
|
||||
@@ -119,3 +128,66 @@ func ListPendingUsers() ([]models.ReturnUser, error) {
|
||||
}
|
||||
return pendingUsers, nil
|
||||
}
|
||||
|
||||
func GetUserMap() (map[string]models.User, error) {
|
||||
userMap := make(map[string]models.User)
|
||||
records, err := database.FetchRecords(database.USERS_TABLE_NAME)
|
||||
if err != nil && !database.IsEmptyRecord(err) {
|
||||
return userMap, err
|
||||
}
|
||||
for _, record := range records {
|
||||
u := models.User{}
|
||||
err = json.Unmarshal([]byte(record), &u)
|
||||
if err == nil {
|
||||
userMap[u.UserName] = u
|
||||
}
|
||||
}
|
||||
return userMap, nil
|
||||
}
|
||||
|
||||
func InsertUserInvite(invite models.UserInvite) error {
|
||||
data, err := json.Marshal(invite)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return database.Insert(invite.Email, string(data), database.USER_INVITES_TABLE_NAME)
|
||||
}
|
||||
|
||||
func GetUserInvite(email string) (in models.UserInvite, err error) {
|
||||
d, err := database.FetchRecord(database.USER_INVITES_TABLE_NAME, email)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = json.Unmarshal([]byte(d), &in)
|
||||
return
|
||||
}
|
||||
|
||||
func ListUserInvites() ([]models.UserInvite, error) {
|
||||
invites := []models.UserInvite{}
|
||||
records, err := database.FetchRecords(database.USER_INVITES_TABLE_NAME)
|
||||
if err != nil && !database.IsEmptyRecord(err) {
|
||||
return invites, err
|
||||
}
|
||||
for _, record := range records {
|
||||
in := models.UserInvite{}
|
||||
err = json.Unmarshal([]byte(record), &in)
|
||||
if err == nil {
|
||||
invites = append(invites, in)
|
||||
}
|
||||
}
|
||||
return invites, nil
|
||||
}
|
||||
|
||||
func DeleteUserInvite(email string) error {
|
||||
return database.DeleteRecord(database.USER_INVITES_TABLE_NAME, email)
|
||||
}
|
||||
func ValidateAndApproveUserInvite(email, code string) error {
|
||||
in, err := GetUserInvite(email)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if code != in.InviteCode {
|
||||
return errors.New("invalid code")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user