TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 02:37:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(auth): switch project role requests to query pkg (#2613)

Browse Source
This commit is contained in:
Silvan
2021-11-04 13:46:15 +01:00
committed by GitHub
parent 3a7d68fccd
commit a34ca05691
10 changed files with 18 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/api/oidc/auth_request.go
View File

@@ -14,6 +14,7 @@ import (
"github.com/caos/zitadel/internal/api/http/middleware"
"github.com/caos/zitadel/internal/errors"
proj_model "github.com/caos/zitadel/internal/project/model"
"github.com/caos/zitadel/internal/query"
"github.com/caos/zitadel/internal/telemetry/tracing"
grant_model "github.com/caos/zitadel/internal/usergrant/model"
)
@@ -213,11 +214,15 @@ func (o *OPStorage) assertProjectRoleScopes(app *proj_model.ApplicationView, sco
return scopes, nil
}
}
roles, err := o.repo.ProjectRolesByProjectID(app.ProjectID)
projectIDQuery, err := query.NewProjectRoleProjectIDSearchQuery(app.ProjectID)
if err != nil {
return nil, errors.ThrowInternal(err, "OIDC-Cyc78", "Errors.Internal")
}
roles, err := o.query.SearchProjectRoles(context.TODO(), &query.ProjectRoleSearchQueries{Queries: []query.SearchQuery{projectIDQuery}})
if err != nil {
return nil, err
}
for _, role := range roles {
for _, role := range roles.ProjectRoles {
scopes = append(scopes, ScopeProjectRolePrefix+role.Key)
}
return scopes, nil