mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-14 13:18:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix id or samaccount query

Browse Source
This commit is contained in:
Ilja Neumann
2020-10-14 17:11:46 +02:00
parent 20e3bd0826
commit f651303866
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
accounts/pkg/service/v0/accounts.go
View File

@@ -185,10 +185,20 @@ func (s Service) ListAccounts(ctx context.Context, in *proto.ListAccountsRequest
}
// id eq 'marie' or on_premises_sam_account_name eq 'marie'
var idOrQuery = regexp.MustCompile(`^$id eq '(.*)' or on_premises_sam_account_name eq '(.*)'`)
var idOrQuery = regexp.MustCompile(`^id eq '(.*)' or on_premises_sam_account_name eq '(.*)'$`)
match = idOrQuery.FindStringSubmatch(in.Query)
if len(match) == 3 {
searchResults, err = s.index.FindBy(&proto.Account{}, "OnPremisesSamAccountName", match[2])
qId, qSam := match[1], match[2]
tmp := &proto.Account{}
_ = s.repo.LoadAccount(ctx, qId, tmp)
searchResults, err = s.index.FindBy(&proto.Account{}, "OnPremisesSamAccountName", qSam)
if tmp.Id != "" {
searchResults = append(searchResults, tmp.Id)
}
searchResults = unique(searchResults)
}
if in.Query == "" {