Merged in bug/eula-email (pull request #212)

fix eula issue when email not present in jwt

* bug fix
This commit is contained in:
Jay Brown
2026-02-26 21:46:00 +00:00
parent c668485e6f
commit 62b5de5722
7 changed files with 648 additions and 312 deletions
+10 -10
View File
@@ -654,8 +654,8 @@ type EulaAgreement struct {
// Id Agreement record ID
Id openapi_types.UUID `json:"id"`
// UserEmail User's email at time of agreement
UserEmail openapi_types.Email `json:"userEmail"`
// UserEmail User identifier at time of agreement (email, username, or subject ID)
UserEmail string `json:"userEmail"`
}
// EulaAgreementList Paginated list of EULA agreements
@@ -750,11 +750,11 @@ type EulaComplianceUser struct {
// CognitoSubjectId User's Cognito subject ID
CognitoSubjectId string `json:"cognitoSubjectId"`
// CurrentEmail User's current email from Cognito
CurrentEmail openapi_types.Email `json:"currentEmail"`
// CurrentEmail User's current email from Cognito (may be empty or a non-email identifier)
CurrentEmail string `json:"currentEmail"`
// Email User's email at time of agreement (null if not agreed)
Email nullable.Nullable[openapi_types.Email] `json:"email,omitempty"`
// Email User identifier at time of agreement (email, username, or subject ID; null if not agreed)
Email nullable.Nullable[string] `json:"email,omitempty"`
}
// EulaPublicResponse Public response for current EULA version
@@ -798,8 +798,8 @@ type EulaVersion struct {
// ActivatedAt When this version was activated
ActivatedAt nullable.Nullable[time.Time] `json:"activatedAt,omitempty"`
// ActivatedBy Email of admin who activated this version
ActivatedBy nullable.Nullable[openapi_types.Email] `json:"activatedBy,omitempty"`
// ActivatedBy Identifier of admin who activated this version (email, username, or subject ID)
ActivatedBy nullable.Nullable[string] `json:"activatedBy,omitempty"`
// Content Full EULA text in Markdown format
Content string `json:"content"`
@@ -807,8 +807,8 @@ type EulaVersion struct {
// CreatedAt Creation timestamp
CreatedAt time.Time `json:"createdAt"`
// CreatedBy Email of admin who created this version
CreatedBy openapi_types.Email `json:"createdBy"`
// CreatedBy Identifier of admin who created this version (email, username, or subject ID)
CreatedBy string `json:"createdBy"`
// EffectiveDate When this version becomes effective (optional)
EffectiveDate nullable.Nullable[time.Time] `json:"effectiveDate,omitempty"`