Commit4fedc7c

authored

chore: include merged claims into the database (#15570)

Merging happens before IDP sync. Storing this will make some SQL queriesmuch simplier.

1 parent097b84f commit4fedc7cCopy full SHA for 4fedc7c

File tree

+14

-0

lines changed

+14

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,9 @@ func (p AgentIDNamePair) Value() (driver.Value, error) {`
`214`	`214`	`typeUserLinkClaimsstruct {`
`215`	`215`	IDTokenClaimsmap[string]interface{}`json:"id_token_claims"`
`216`	`216`	UserInfoClaimsmap[string]interface{}`json:"user_info_claims"`
	`217`	`+// MergeClaims are computed in Golang. It is the result of merging`
	`218`	`+// the IDTokenClaims and UserInfoClaims. UserInfoClaims take precedence.`
	`219`	+MergedClaimsmap[string]interface{}`json:"merged_claims"`
`217`	`220`	`}`
`218`	`221`
`219`	`222`	`func (a*UserLinkClaims)Scan(srcinterface{})error {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1326,6 +1326,7 @@ func (api API) userOIDC(rw http.ResponseWriter, r http.Request) {`
`1326`	`1326`	`UserClaims: database.UserLinkClaims{`
`1327`	`1327`	`IDTokenClaims:idtokenClaims,`
`1328`	`1328`	`UserInfoClaims:userInfoClaims,`
	`1329`	`+MergedClaims:mergedClaims,`
`1329`	`1330`	`},`
`1330`	`1331`	`}).SetInitAuditRequest(func(paramsaudit.RequestParams) (audit.Request[database.User],func()) {`
`1331`	`1332`	`returnaudit.InitRequest[database.User](rw,params)`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,16 @@ func TestUserLinks(t *testing.T) {`
`64`	`64`	`"number":float64(2),`
`65`	`65`	`},`
`66`	`66`	`},`
	`67`	`+MergedClaims:map[string]interface{}{`
	`68`	`+"sub":"123",`
	`69`	`+"groups": []interface{}{`
	`70`	`+"foo","bar",`
	`71`	`+},`
	`72`	`+"number":float64(2),`
	`73`	`+"struct":map[string]interface{}{`
	`74`	`+"number":float64(2),`
	`75`	`+},`
	`76`	`+},`
`67`	`77`	`}`
`68`	`78`
`69`	`79`	`updated,err:=crypt.UpdateUserLink(ctx, database.UpdateUserLinkParams{`

Comments

(0)