Enforce use of any instead of interface{} (#30588)

server/public/model/bot.go

@@ -33,8 +33,8 @@ type Bot struct {
 	DeleteAt       int64  `json:"delete_at"`
 }
 
-func (b *Bot) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (b *Bot) Auditable() map[string]any {
+	return map[string]any{
 		"user_id":          b.UserId,
 		"username":         b.Username,
 		"display_name":     b.DisplayName,
@@ -54,8 +54,8 @@ type BotPatch struct {
 	Description *string `json:"description"`
 }
 
-func (b *BotPatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (b *BotPatch) Auditable() map[string]any {
+	return map[string]any{
 		"username":     b.Username,
 		"display_name": b.DisplayName,
 		"description":  b.Description,

server/public/model/channel.go

@@ -46,7 +46,7 @@ type ChannelBannerInfo struct {
 	BackgroundColor *string `json:"background_color"`
 }
 
-func (c *ChannelBannerInfo) Scan(value interface{}) error {
+func (c *ChannelBannerInfo) Scan(value any) error {
 	if value == nil {
 		return nil
 	}
@@ -96,8 +96,8 @@ type Channel struct {
 	BannerInfo        *ChannelBannerInfo `json:"banner_info"`
 }
 
-func (o *Channel) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *Channel) Auditable() map[string]any {
+	return map[string]any{
 		"create_at":            o.CreateAt,
 		"creator_id":           o.CreatorId,
 		"delete_at":            o.DeleteAt,
@@ -142,8 +142,8 @@ type ChannelPatch struct {
 	BannerInfo       *ChannelBannerInfo `json:"banner_info"`
 }
 
-func (c *ChannelPatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (c *ChannelPatch) Auditable() map[string]any {
+	return map[string]any{
 		"header":            c.Header,
 		"group_constrained": c.GroupConstrained,
 		"purpose":           c.Purpose,
@@ -181,8 +181,8 @@ type ChannelModerationPatch struct {
 	Roles *ChannelModeratedRolesPatch `json:"roles"`
 }
 
-func (c *ChannelModerationPatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (c *ChannelModerationPatch) Auditable() map[string]any {
+	return map[string]any{
 		"name":  c.Name,
 		"roles": c.Roles,
 	}

server/public/model/channel_bookmark.go

@@ -38,8 +38,8 @@ type ChannelBookmark struct {
 	ParentId    string              `json:"parent_id,omitempty"`
 }
 
-func (o *ChannelBookmark) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *ChannelBookmark) Auditable() map[string]any {
+	return map[string]any{
 		"id":          o.Id,
 		"create_at":   o.CreateAt,
 		"update_at":   o.UpdateAt,
@@ -193,8 +193,8 @@ type ChannelBookmarkPatch struct {
 	Emoji       *string `json:"emoji,omitempty"`
 }
 
-func (o *ChannelBookmarkPatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *ChannelBookmarkPatch) Auditable() map[string]any {
+	return map[string]any{
 		"file_id": o.FileId,
 	}
 }
@@ -226,7 +226,7 @@ type ChannelBookmarkWithFileInfo struct {
 	FileInfo *FileInfo `json:"file,omitempty"`
 }
 
-func (o *ChannelBookmarkWithFileInfo) Auditable() map[string]interface{} {
+func (o *ChannelBookmarkWithFileInfo) Auditable() map[string]any {
 	a := o.ChannelBookmark.Auditable()
 	if o.FileInfo != nil {
 		a["file"] = o.FileInfo.Auditable()

server/public/model/channel_member.go

@@ -69,8 +69,8 @@ type ChannelMember struct {
 	ExplicitRoles      string    `json:"explicit_roles"`
 }
 
-func (o *ChannelMember) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *ChannelMember) Auditable() map[string]any {
+	return map[string]any{
 		"channel_id":           o.ChannelId,
 		"user_id":              o.UserId,
 		"roles":                o.Roles,

server/public/model/command.go

@@ -41,8 +41,8 @@ type Command struct {
 	AutocompleteIconData string `db:"-" json:"autocomplete_icon_data,omitempty"`
 }
 
-func (o *Command) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *Command) Auditable() map[string]any {
+	return map[string]any{
 		"id":                 o.Id,
 		"create_at":          o.CreateAt,
 		"update_at":          o.UpdateAt,

server/public/model/command_args.go

@@ -21,8 +21,8 @@ type CommandArgs struct {
 	ChannelMentions ChannelMentionMap  `json:"-"`
 }
 
-func (o *CommandArgs) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *CommandArgs) Auditable() map[string]any {
+	return map[string]any{
 		"user_id":    o.UserId,
 		"channel_id": o.ChannelId,
 		"team_id":    o.TeamId,

server/public/model/compliance.go

@@ -35,8 +35,8 @@ type Compliance struct {
 	Emails   string `json:"emails"`
 }
 
-func (c *Compliance) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (c *Compliance) Auditable() map[string]any {
+	return map[string]any{
 		"id":        c.Id,
 		"create_at": c.CreateAt,
 		"user_id":   c.UserId,

server/public/model/config.go

@@ -3741,8 +3741,8 @@ type Config struct {
 	ConnectedWorkspacesSettings ConnectedWorkspacesSettings
 }
 
-func (o *Config) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *Config) Auditable() map[string]any {
+	return map[string]any{
 		// TODO
 	}
 }

server/public/model/data_retention_policy.go

@@ -22,8 +22,8 @@ type RetentionPolicyWithTeamAndChannelIDs struct {
 	ChannelIDs []string `json:"channel_ids"`
 }
 
-func (o *RetentionPolicyWithTeamAndChannelIDs) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *RetentionPolicyWithTeamAndChannelIDs) Auditable() map[string]any {
+	return map[string]any{
 		"retention_policy": o.RetentionPolicy,
 		"team_ids":         o.TeamIDs,
 		"channel_ids":      o.ChannelIDs,
@@ -36,8 +36,8 @@ type RetentionPolicyWithTeamAndChannelCounts struct {
 	TeamCount    int64 `json:"team_count"`
 }
 
-func (o *RetentionPolicyWithTeamAndChannelCounts) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *RetentionPolicyWithTeamAndChannelCounts) Auditable() map[string]any {
+	return map[string]any{
 		"retention_policy": o.RetentionPolicy,
 		"channel_count":    o.ChannelCount,
 		"team_count":       o.TeamCount,

server/public/model/draft.go

@@ -97,7 +97,7 @@ func (o *Draft) PreSave() {
 
 func (o *Draft) PreCommit() {
 	if o.GetProps() == nil {
-		o.SetProps(make(map[string]interface{}))
+		o.SetProps(make(map[string]any))
 	}
 
 	if o.FileIds == nil {

server/public/model/emoji.go

@@ -25,8 +25,8 @@ type Emoji struct {
 	Name      string `json:"name"`
 }
 
-func (emoji *Emoji) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (emoji *Emoji) Auditable() map[string]any {
+	return map[string]any{
 		"id":         emoji.Id,
 		"create_at":  emoji.CreateAt,
 		"update_at":  emoji.UpdateAt,

server/public/model/file_info.go

@@ -59,8 +59,8 @@ type FileInfo struct {
 	Archived        bool    `json:"archived"`
 }
 
-func (fi *FileInfo) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (fi *FileInfo) Auditable() map[string]any {
+	return map[string]any{
 		"id":         fi.Id,
 		"creator_id": fi.CreatorId,
 		"post_id":    fi.PostId,

server/public/model/group.go

@@ -43,8 +43,8 @@ type Group struct {
 	MemberIDs                   []string    `db:"-" json:"member_ids"`
 }
 
-func (group *Group) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (group *Group) Auditable() map[string]any {
+	return map[string]any{
 		"id":              group.Id,
 		"source":          group.Source,
 		"remote_id":       group.GetRemoteId(),
@@ -58,7 +58,7 @@ func (group *Group) Auditable() map[string]interface{} {
 }
 
 func (group *Group) LogClone() any {
-	return map[string]interface{}{
+	return map[string]any{
 		"id":              group.Id,
 		"name":            group.GetName(),
 		"display_name":    group.DisplayName,
@@ -78,8 +78,8 @@ type GroupWithUserIds struct {
 	UserIds []string `json:"user_ids"`
 }
 
-func (group *GroupWithUserIds) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (group *GroupWithUserIds) Auditable() map[string]any {
+	return map[string]any{
 		"id":              group.Id,
 		"source":          group.Source,
 		"remote_id":       group.GetRemoteId(),
@@ -176,8 +176,8 @@ type GroupModifyMembers struct {
 	UserIds []string `json:"user_ids"`
 }
 
-func (group *GroupModifyMembers) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (group *GroupModifyMembers) Auditable() map[string]any {
+	return map[string]any{
 		"user_ids": group.UserIds,
 	}
 }

server/public/model/group_syncable.go

@@ -42,8 +42,8 @@ type GroupSyncable struct {
 	TeamID             string `db:"-" json:"-"`
 }
 
-func (syncable *GroupSyncable) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (syncable *GroupSyncable) Auditable() map[string]any {
+	return map[string]any{
 		"group_id":             syncable.GroupId,
 		"syncable_id":          syncable.SyncableId,
 		"auto_add":             syncable.AutoAdd,
@@ -153,8 +153,8 @@ type GroupSyncablePatch struct {
 	SchemeAdmin *bool `json:"scheme_admin"`
 }
 
-func (syncable *GroupSyncablePatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (syncable *GroupSyncablePatch) Auditable() map[string]any {
+	return map[string]any{
 		"auto_add":     syncable.AutoAdd,
 		"scheme_admin": syncable.SchemeAdmin,
 	}

server/public/model/group_test.go

@@ -55,7 +55,7 @@ func TestGroupLogClone(t *testing.T) {
 		l := g.LogClone()
 		require.NotNil(t, l)
 
-		m, ok := l.(map[string]interface{})
+		m, ok := l.(map[string]any)
 		require.True(t, ok)
 		assert.Equal(t, "", m["remote_id"])
 	})
@@ -77,7 +77,7 @@ func TestGroupLogClone(t *testing.T) {
 			AllowReference: true,
 		}
 		l := g.LogClone()
-		m, ok := l.(map[string]interface{})
+		m, ok := l.(map[string]any)
 		require.True(t, ok)
 
 		expected := map[string]any{

server/public/model/guest_invite.go

@@ -13,8 +13,8 @@ type GuestsInvite struct {
 	Message  string   `json:"message"`
 }
 
-func (i *GuestsInvite) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (i *GuestsInvite) Auditable() map[string]any {
+	return map[string]any{
 		"emails":   i.Emails,
 		"channels": i.Channels,
 	}

server/public/model/incoming_webhook.go

@@ -30,8 +30,8 @@ type IncomingWebhook struct {
 	ChannelLocked bool   `json:"channel_locked"`
 }
 
-func (o *IncomingWebhook) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *IncomingWebhook) Auditable() map[string]any {
+	return map[string]any{
 		"id":             o.Id,
 		"create_at":      o.CreateAt,
 		"update_at":      o.UpdateAt,

server/public/model/ip_filtering.go

@@ -9,8 +9,8 @@ type AllowedIPRange struct {
 	OwnerID     string `json:"owner_id"`
 }
 
-func (air *AllowedIPRanges) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (air *AllowedIPRanges) Auditable() map[string]any {
+	return map[string]any{
 		"AllowedIPRanges": air,
 	}
 }

server/public/model/job.go

@@ -91,8 +91,8 @@ type Job struct {
 	Data           StringMap `json:"data"`
 }
 
-func (j *Job) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (j *Job) Auditable() map[string]any {
+	return map[string]any{
 		"id":               j.Id,
 		"type":             j.Type,
 		"priority":         j.Priority,
@@ -129,7 +129,7 @@ func (j *Job) MarshalYAML() (any, error) {
 	}, nil
 }
 
-func (j *Job) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (j *Job) UnmarshalYAML(unmarshal func(any) error) error {
 	out := struct {
 		Id             string    `yaml:"id"`
 		Type           string    `yaml:"type"`

server/public/model/member_invite.go

@@ -14,8 +14,8 @@ type MemberInvite struct {
 	Message    string   `json:"message"`
 }
 
-func (i *MemberInvite) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (i *MemberInvite) Auditable() map[string]any {
+	return map[string]any{
 		"emails":      i.Emails,
 		"channel_ids": i.ChannelIds,
 	}

server/public/model/oauth.go

@@ -32,8 +32,8 @@ type OAuthApp struct {
 	MattermostAppID string      `json:"mattermost_app_id"`
 }
 
-func (a *OAuthApp) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (a *OAuthApp) Auditable() map[string]any {
+	return map[string]any{
 		"id":                a.Id,
 		"creator_id":        a.CreatorId,
 		"create_at":         a.CreateAt,

server/public/model/onboarding.go

@@ -14,8 +14,8 @@ type CompleteOnboardingRequest struct {
 	InstallPlugins []string `json:"install_plugins"` // InstallPlugins is a list of plugins to be installed
 }
 
-func (r *CompleteOnboardingRequest) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (r *CompleteOnboardingRequest) Auditable() map[string]any {
+	return map[string]any{
 		"install_plugins": r.InstallPlugins,
 	}
 }

server/public/model/outgoing_oauth_connection.go

@@ -38,8 +38,8 @@ type OutgoingOAuthConnection struct {
 	Audiences           StringArray                      `json:"audiences"`
 }
 
-func (oa *OutgoingOAuthConnection) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (oa *OutgoingOAuthConnection) Auditable() map[string]any {
+	return map[string]any{
 		"id":         oa.Id,
 		"creator_id": oa.CreatorId,
 		"create_at":  oa.CreateAt,

server/public/model/outgoing_webhook.go

@@ -30,8 +30,8 @@ type OutgoingWebhook struct {
 	IconURL      string      `json:"icon_url"`
 }
 
-func (o *OutgoingWebhook) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *OutgoingWebhook) Auditable() map[string]any {
+	return map[string]any{
 		"id":            o.Id,
 		"create_at":     o.CreateAt,
 		"update_at":     o.UpdateAt,

server/public/model/packet_metadata_test.go

@@ -25,7 +25,7 @@ func TestPacketMetadataValidate(t *testing.T) {
 				ServerID:      NewId(),
 				LicenseID:     NewId(),
 				CustomerID:    NewId(),
-				Extras:        map[string]interface{}{"key": "value"},
+				Extras:        map[string]any{"key": "value"},
 			},
 			expectErr: false,
 		},
@@ -36,7 +36,7 @@ func TestPacketMetadataValidate(t *testing.T) {
 				GeneratedAt:   1720097114454,
 				ServerVersion: "5.33.3",
 				ServerID:      NewId(),
-				Extras:        map[string]interface{}{"key": "value"},
+				Extras:        map[string]any{"key": "value"},
 			},
 			expectErr: false,
 		},

server/public/model/post.go

@@ -122,13 +122,13 @@ type Post struct {
 	Metadata     *PostMetadata `json:"metadata,omitempty"`
 }
 
-func (o *Post) Auditable() map[string]interface{} {
+func (o *Post) Auditable() map[string]any {
 	var metaData map[string]any
 	if o.Metadata != nil {
 		metaData = o.Metadata.Auditable()
 	}
 
-	return map[string]interface{}{
+	return map[string]any{
 		"id":              o.Id,
 		"create_at":       o.CreateAt,
 		"update_at":       o.UpdateAt,
@@ -211,8 +211,8 @@ type SearchParameter struct {
 	IncludeDeletedChannels *bool   `json:"include_deleted_channels"`
 }
 
-func (sp SearchParameter) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (sp SearchParameter) Auditable() map[string]any {
+	return map[string]any{
 		"terms":                    sp.Terms,
 		"is_or_search":             sp.IsOrSearch,
 		"time_zone_offset":         sp.TimeZoneOffset,
@@ -240,8 +240,8 @@ func (o *PostPatch) WithRewrittenImageURLs(f func(string) string) *PostPatch {
 	return &pCopy
 }
 
-func (o *PostPatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *PostPatch) Auditable() map[string]any {
+	return map[string]any{
 		"is_pinned":     o.IsPinned,
 		"props":         o.Props,
 		"file_ids":      o.FileIds,

server/public/model/post_search_results.go

@@ -40,7 +40,7 @@ func (o *PostSearchResults) ForPlugin() *PostSearchResults {
 	return &plCopy
 }
 
-func (o *PostSearchResults) Auditable() map[string]interface{} {
+func (o *PostSearchResults) Auditable() map[string]any {
 	var numResults int
 	var hasNext bool
 

server/public/model/property_field.go

@@ -35,8 +35,8 @@ type PropertyField struct {
 	DeleteAt   int64             `json:"delete_at"`
 }
 
-func (pf *PropertyField) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (pf *PropertyField) Auditable() map[string]any {
+	return map[string]any{
 		"id":          pf.ID,
 		"group_id":    pf.GroupID,
 		"name":        pf.Name,
@@ -106,8 +106,8 @@ type PropertyFieldPatch struct {
 	TargetType *string            `json:"target_type"`
 }
 
-func (pfp *PropertyFieldPatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (pfp *PropertyFieldPatch) Auditable() map[string]any {
+	return map[string]any{
 		"name":        pfp.Name,
 		"type":        pfp.Type,
 		"attrs":       pfp.Attrs,

server/public/model/remote_cluster.go

@@ -70,8 +70,8 @@ type RemoteCluster struct {
 	Options       Bitmask `json:"options"`   // bit-flag set of options
 }
 
-func (rc *RemoteCluster) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (rc *RemoteCluster) Auditable() map[string]any {
+	return map[string]any{
 		"remote_id":       rc.RemoteId,
 		"remote_team_id":  rc.RemoteTeamId,
 		"name":            rc.Name,
@@ -148,8 +148,8 @@ type RemoteClusterPatch struct {
 	DefaultTeamId *string `json:"default_team_id"`
 }
 
-func (rcp *RemoteClusterPatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (rcp *RemoteClusterPatch) Auditable() map[string]any {
+	return map[string]any{
 		"display_name":    rcp.DisplayName,
 		"default_team_id": rcp.DefaultTeamId,
 	}
@@ -300,8 +300,8 @@ type RemoteClusterFrame struct {
 	Msg      RemoteClusterMsg `json:"msg"`
 }
 
-func (f *RemoteClusterFrame) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (f *RemoteClusterFrame) Auditable() map[string]any {
+	return map[string]any{
 		"remote_id": f.RemoteId,
 		"msg_id":    f.Msg.Id,
 		"topic":     f.Msg.Topic,

server/public/model/role.go

@@ -425,8 +425,8 @@ type Role struct {
 	BuiltIn       bool     `json:"built_in"`
 }
 
-func (r *Role) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (r *Role) Auditable() map[string]any {
+	return map[string]any{
 		"id":             r.Id,
 		"name":           r.Name,
 		"display_name":   r.DisplayName,
@@ -471,7 +471,7 @@ func (r *Role) MarshalYAML() (any, error) {
 	}, nil
 }
 
-func (r *Role) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (r *Role) UnmarshalYAML(unmarshal func(any) error) error {
 	out := struct {
 		Id            string   `yaml:"id"`
 		Name          string   `yaml:"name"`
@@ -522,8 +522,8 @@ type RolePatch struct {
 	Permissions *[]string `json:"permissions"`
 }
 
-func (r *RolePatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (r *RolePatch) Auditable() map[string]any {
+	return map[string]any{
 		"permissions": r.Permissions,
 	}
 }

server/public/model/scheduled_post.go

@@ -128,13 +128,13 @@ func (s *ScheduledPost) ToPost() (*Post, error) {
 	return post, nil
 }
 
-func (s *ScheduledPost) Auditable() map[string]interface{} {
+func (s *ScheduledPost) Auditable() map[string]any {
 	var metaData map[string]any
 	if s.Metadata != nil {
 		metaData = s.Metadata.Auditable()
 	}
 
-	return map[string]interface{}{
+	return map[string]any{
 		"id":         s.Id,
 		"create_at":  s.CreateAt,
 		"update_at":  s.UpdateAt,

server/public/model/scheme.go

@@ -41,8 +41,8 @@ type Scheme struct {
 	DefaultRunMemberRole      string `json:"default_run_member_role"`
 }
 
-func (scheme *Scheme) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (scheme *Scheme) Auditable() map[string]any {
+	return map[string]any{
 		"id":                           scheme.Id,
 		"name":                         scheme.Name,
 		"display_name":                 scheme.DisplayName,
@@ -112,7 +112,7 @@ func (scheme *Scheme) MarshalYAML() (any, error) {
 	}, nil
 }
 
-func (scheme *Scheme) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (scheme *Scheme) UnmarshalYAML(unmarshal func(any) error) error {
 	out := struct {
 		Id                        string `yaml:"id"`
 		Name                      string `yaml:"name"`
@@ -181,8 +181,8 @@ type SchemePatch struct {
 	Description *string `json:"description"`
 }
 
-func (scheme *SchemePatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (scheme *SchemePatch) Auditable() map[string]any {
+	return map[string]any{
 		"name":         scheme.Name,
 		"display_name": scheme.DisplayName,
 		"description":  scheme.Description,
@@ -193,8 +193,8 @@ type SchemeIDPatch struct {
 	SchemeID *string `json:"scheme_id"`
 }
 
-func (p *SchemeIDPatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (p *SchemeIDPatch) Auditable() map[string]any {
+	return map[string]any{
 		"scheme_id": p.SchemeID,
 	}
 }
@@ -243,8 +243,8 @@ type SchemeRoles struct {
 	SchemeGuest bool `json:"scheme_guest"`
 }
 
-func (s *SchemeRoles) Auditable() map[string]interface{} {
-	return map[string]interface{}{}
+func (s *SchemeRoles) Auditable() map[string]any {
+	return map[string]any{}
 }
 
 func (scheme *Scheme) IsValid() bool {

server/public/model/session.go

@@ -68,8 +68,8 @@ type Session struct {
 	Local          bool          `json:"local" db:"-"`
 }
 
-func (s *Session) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (s *Session) Auditable() map[string]any {
+	return map[string]any{
 		"id":               s.Id,
 		"create_at":        s.CreateAt,
 		"expires_at":       s.ExpiresAt,

server/public/model/switch_request.go

@@ -13,8 +13,8 @@ type SwitchRequest struct {
 	LdapLoginId    string `json:"ldap_id"`
 }
 
-func (o *SwitchRequest) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *SwitchRequest) Auditable() map[string]any {
+	return map[string]any{
 		"current_service": o.CurrentService,
 		"new_service":     o.NewService,
 		"email":           o.Email,

server/public/model/team.go

@@ -44,8 +44,8 @@ type Team struct {
 	CloudLimitsArchived bool    `json:"cloud_limits_archived"`
 }
 
-func (o *Team) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *Team) Auditable() map[string]any {
+	return map[string]any{
 		"id":                    o.Id,
 		"create_at":             o.CreateAt,
 		"update_at":             o.UpdateAt,
@@ -74,8 +74,8 @@ type TeamPatch struct {
 	CloudLimitsArchived *bool   `json:"cloud_limits_archived"`
 }
 
-func (o *TeamPatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *TeamPatch) Auditable() map[string]any {
+	return map[string]any{
 		"allow_open_invite":     o.AllowOpenInvite,
 		"group_constrained":     o.GroupConstrained,
 		"cloud_limits_archived": o.CloudLimitsArchived,

server/public/model/team_member.go

@@ -29,8 +29,8 @@ type TeamMember struct {
 	CreateAt      int64  `json:"-"`
 }
 
-func (o *TeamMember) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (o *TeamMember) Auditable() map[string]any {
+	return map[string]any{
 		"team_id":        o.TeamId,
 		"user_id":        o.UserId,
 		"roles":          o.Roles,

server/public/model/upload_session.go

@@ -47,8 +47,8 @@ type UploadSession struct {
 	ReqFileId string `json:"req_file_id"`
 }
 
-func (us *UploadSession) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (us *UploadSession) Auditable() map[string]any {
+	return map[string]any{
 		"id":         us.Id,
 		"type":       us.Type,
 		"user_id":    us.UserId,

server/public/model/user.go

@@ -112,8 +112,8 @@ type User struct {
 	MfaUsedTimestamps      StringArray `json:"mfa_used_timestamps,omitempty"`
 }
 
-func (u *User) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (u *User) Auditable() map[string]any {
+	return map[string]any{
 		"id":                         u.Id,
 		"create_at":                  u.CreateAt,
 		"update_at":                  u.UpdateAt,
@@ -145,7 +145,7 @@ func (u *User) Auditable() map[string]interface{} {
 }
 
 func (u *User) LogClone() any {
-	return map[string]interface{}{
+	return map[string]any{
 		"id":              u.Id,
 		"create_at":       u.CreateAt,
 		"update_at":       u.UpdateAt,
@@ -195,8 +195,8 @@ type UserPatch struct {
 	RemoteId    *string   `json:"remote_id"`
 }
 
-func (u *UserPatch) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (u *UserPatch) Auditable() map[string]any {
+	return map[string]any{
 		"username":     u.Username,
 		"nickname":     u.Nickname,
 		"first_name":   u.FirstName,
@@ -217,8 +217,8 @@ type UserAuth struct {
 	AuthService string  `json:"auth_service,omitempty"`
 }
 
-func (u *UserAuth) Auditable() map[string]interface{} {
-	return map[string]interface{}{
+func (u *UserAuth) Auditable() map[string]any {
+	return map[string]any{
 		"auth_service": u.AuthService,
 	}
 }

server/public/model/user_test.go

@@ -99,7 +99,7 @@ func TestUserLogClone(t *testing.T) {
 		l := u.LogClone()
 		require.NotNil(t, l)
 
-		m, ok := l.(map[string]interface{})
+		m, ok := l.(map[string]any)
 		require.True(t, ok)
 		assert.Equal(t, "", m["remote_id"])
 	})
@@ -135,7 +135,7 @@ func TestUserLogClone(t *testing.T) {
 		}
 
 		l := u.LogClone()
-		m, ok := l.(map[string]interface{})
+		m, ok := l.(map[string]any)
 		require.True(t, ok)
 
 		expected := map[string]any{