status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-09 13:26:07 +00:00
Code Issues Projects Releases Wiki Activity

fix token list by auth method (#11196)

Browse Source 
* add tests to OIDC authmethod and fix entMeta when retrieving auth-methods

* fix oss compilation error
This commit is contained in:
Dhia Ayachi 2021-10-01 12:00:43 -04:00 committed by GitHub
parent 8b002d086a
commit a5b09493ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/consul/state/acl.go
View File

@ -528,7 +528,9 @@ func aclTokenSetTxn(tx WriteTxn, idx uint64, token *structs.ACLToken, opts ACLTo
} }
if token.AuthMethod != "" && !opts.FromReplication { if token.AuthMethod != "" && !opts.FromReplication {
method, err := getAuthMethodWithTxn(tx, nil, token.AuthMethod, token.ACLAuthMethodEnterpriseMeta.ToEnterpriseMeta()) methodMeta := token.ACLAuthMethodEnterpriseMeta.ToEnterpriseMeta()
methodMeta.Merge(&token.EnterpriseMeta)
method, err := getAuthMethodWithTxn(tx, nil, token.AuthMethod, methodMeta)
if err != nil { if err != nil {
return err return err
} else if method == nil { } else if method == nil {