feat(go): add display name and account disabled to return user as well;

logic/users.go

@@ -41,13 +41,15 @@ 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,
-		PlatformRoleID: user.PlatformRoleID,
-		AuthType:       user.AuthType,
-		UserGroups:     user.UserGroups,
-		NetworkRoles:   user.NetworkRoles,
-		RemoteGwIDs:    user.RemoteGwIDs,
-		LastLoginTime:  user.LastLoginTime,
+		UserName:        user.UserName,
+		DisplayName:     user.DisplayName,
+		AccountDisabled: user.AccountDisabled,
+		AuthType:        user.AuthType,
+		RemoteGwIDs:     user.RemoteGwIDs,
+		UserGroups:      user.UserGroups,
+		PlatformRoleID:  user.PlatformRoleID,
+		NetworkRoles:    user.NetworkRoles,
+		LastLoginTime:   user.LastLoginTime,
 	}
 }
 

models/user_mgmt.go

@@ -177,15 +177,17 @@ type ReturnUserWithRolesAndGroups struct {
 
 // ReturnUser - return user struct
 type ReturnUser struct {
-	UserName       string                                `json:"username"`
-	IsAdmin        bool                                  `json:"isadmin"`
-	IsSuperAdmin   bool                                  `json:"issuperadmin"`
-	AuthType       AuthType                              `json:"auth_type"`
-	RemoteGwIDs    map[string]struct{}                   `json:"remote_gw_ids"` // deprecated
-	UserGroups     map[UserGroupID]struct{}              `json:"user_group_ids"`
-	PlatformRoleID UserRoleID                            `json:"platform_role_id"`
-	NetworkRoles   map[NetworkID]map[UserRoleID]struct{} `json:"network_roles"`
-	LastLoginTime  time.Time                             `json:"last_login_time"`
+	UserName        string                                `json:"username"`
+	DisplayName     string                                `json:"display_name"`
+	AccountDisabled bool                                  `json:"account_disabled"`
+	IsAdmin         bool                                  `json:"isadmin"`
+	IsSuperAdmin    bool                                  `json:"issuperadmin"`
+	AuthType        AuthType                              `json:"auth_type"`
+	RemoteGwIDs     map[string]struct{}                   `json:"remote_gw_ids"` // deprecated
+	UserGroups      map[UserGroupID]struct{}              `json:"user_group_ids"`
+	PlatformRoleID  UserRoleID                            `json:"platform_role_id"`
+	NetworkRoles    map[NetworkID]map[UserRoleID]struct{} `json:"network_roles"`
+	LastLoginTime   time.Time                             `json:"last_login_time"`
 }
 
 // UserAuthParams - user auth params struct