allow secondary claims to cascade tenancy data

pitabwire · pitabwire · commit 6e04036c1944 · 2025-12-17T09:55:09.000+03:00
diff --git a/data/model.go b/data/model.go
@@ -45,6 +45,14 @@ func (model *BaseModel) GenID(ctx context.Context) {
 		return
 	}
 
+	if authClaim.GetTenantID() == "" {
+
+		secondaryClaims := security.SecondaryClaimsFromContext(ctx)
+		if secondaryClaims != nil {
+			authClaim = secondaryClaims
+		}
+	}
+
 	if model.AccessID == "" && authClaim.GetAccessID() != "" {
 		model.AccessID = authClaim.GetAccessID()
 	}

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,14 @@ func (model *BaseModel) GenID(ctx context.Context) {`
`45`	`45`	`return`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ if authClaim.GetTenantID() == "" {`
	`49`	`+`
	`50`	`+ secondaryClaims := security.SecondaryClaimsFromContext(ctx)`
	`51`	`+ if secondaryClaims != nil {`
	`52`	`+ authClaim = secondaryClaims`
	`53`	`+ }`
	`54`	`+ }`
	`55`	`+`
`48`	`56`	`if model.AccessID == "" && authClaim.GetAccessID() != "" {`
`49`	`57`	`model.AccessID = authClaim.GetAccessID()`
`50`	`58`	`}`