Bring back web3 field #4935

ref DEV-2300

Author: tung2744

pkg/api/model/user.go

@@ -6,18 +6,21 @@ import (
 
 type User struct {
 	Meta
-	LastLoginAt          *time.Time             `json:"last_login_at,omitempty"`
-	IsAnonymous          bool                   `json:"is_anonymous"`
-	IsVerified           bool                   `json:"is_verified"`
-	IsDisabled           bool                   `json:"is_disabled"`
-	DisableReason        *string                `json:"disable_reason,omitempty"`
-	IsDeactivated        bool                   `json:"is_deactivated"`
-	DeleteAt             *time.Time             `json:"delete_at,omitempty"`
-	IsAnonymized         bool                   `json:"is_anonymized"`
-	AnonymizeAt          *time.Time             `json:"anonymize_at,omitempty"`
-	CanReauthenticate    bool                   `json:"can_reauthenticate"`
-	StandardAttributes   map[string]interface{} `json:"standard_attributes,omitempty"`
-	CustomAttributes     map[string]interface{} `json:"custom_attributes,omitempty"`
+	LastLoginAt        *time.Time             `json:"last_login_at,omitempty"`
+	IsAnonymous        bool                   `json:"is_anonymous"`
+	IsVerified         bool                   `json:"is_verified"`
+	IsDisabled         bool                   `json:"is_disabled"`
+	DisableReason      *string                `json:"disable_reason,omitempty"`
+	IsDeactivated      bool                   `json:"is_deactivated"`
+	DeleteAt           *time.Time             `json:"delete_at,omitempty"`
+	IsAnonymized       bool                   `json:"is_anonymized"`
+	AnonymizeAt        *time.Time             `json:"anonymize_at,omitempty"`
+	CanReauthenticate  bool                   `json:"can_reauthenticate"`
+	StandardAttributes map[string]interface{} `json:"standard_attributes,omitempty"`
+	CustomAttributes   map[string]interface{} `json:"custom_attributes,omitempty"`
+	// Web3 is kept for backwards compatibility purpose.
+	// It is always an empty map.
+	Web3                 map[string]interface{} `json:"x_web3,omitempty"`
 	Roles                []string               `json:"roles,omitempty"`
 	Groups               []string               `json:"groups,omitempty"`
 	MFAGracePeriodtEndAt *time.Time             `json:"mfa_grace_period_end_at,omitempty"`

pkg/lib/authn/user/model.go

@@ -320,18 +320,21 @@ func newUserModel(
 			CreatedAt: user.CreatedAt,
 			UpdatedAt: user.UpdatedAt,
 		},
-		LastLoginAt:          user.MostRecentLoginAt,
-		IsAnonymous:          isAnonymous,
-		IsVerified:           isVerified,
-		IsDisabled:           user.IsDisabled,
-		DisableReason:        user.DisableReason,
-		IsDeactivated:        user.IsDeactivated,
-		DeleteAt:             user.DeleteAt,
-		IsAnonymized:         user.IsAnonymized,
-		AnonymizeAt:          user.AnonymizeAt,
-		CanReauthenticate:    canReauthenticate,
-		StandardAttributes:   derivedStandardAttributes,
-		CustomAttributes:     customAttributes,
+		LastLoginAt:        user.MostRecentLoginAt,
+		IsAnonymous:        isAnonymous,
+		IsVerified:         isVerified,
+		IsDisabled:         user.IsDisabled,
+		DisableReason:      user.DisableReason,
+		IsDeactivated:      user.IsDeactivated,
+		DeleteAt:           user.DeleteAt,
+		IsAnonymized:       user.IsAnonymized,
+		AnonymizeAt:        user.AnonymizeAt,
+		CanReauthenticate:  canReauthenticate,
+		StandardAttributes: derivedStandardAttributes,
+		CustomAttributes:   customAttributes,
+		// For backwards compatibility, we always output an empty object here.
+		// The AdminAPI has marked this field non-null, so it MUST BE a map.
+		Web3:                 make(map[string]interface{}),
 		Roles:                roles,
 		Groups:               groups,
 		MFAGracePeriodtEndAt: user.MFAGracePeriodtEndAt,

pkg/lib/oauth/oidc/id_token.go

@@ -272,6 +272,7 @@ func (ti *IDTokenIssuer) GetUserInfo(ctx context.Context, userID string, clientL
 		}
 
 		out["custom_attributes"] = user.CustomAttributes
+		out["x_web3"] = user.Web3
 	} else {
 		// When the client is third party, we include the standard claims according to scopes.
 		for k, v := range user.StandardAttributes {