Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Direct access to rules map when getting auth provider #3028

Merged
merged 2 commits into from
Nov 29, 2022
Merged

Direct access to rules map when getting auth provider #3028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d8ab30
direct access to rules map when getting auth provider
gmgigi96 Jul 4, 2022
2bafb32
add changelog
gmgigi96 Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/unreleased/auth-registry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Enhancement: Access directly auth registry rules map when getting provider

https://github.com/cs3org/reva/pull/3028
14 changes: 6 additions & 8 deletions pkg/auth/registry/static/static.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type reg struct {
}

func (r *reg) ListProviders(ctx context.Context) ([]*registrypb.ProviderInfo, error) {
providers := []*registrypb.ProviderInfo{}
providers := make([]*registrypb.ProviderInfo, len(r.rules))
for k, v := range r.rules {
providers = append(providers, &registrypb.ProviderInfo{
ProviderType: k,
Expand All @@ -61,13 +61,11 @@ func (r *reg) ListProviders(ctx context.Context) ([]*registrypb.ProviderInfo, er
}

func (r *reg) GetProvider(ctx context.Context, authType string) (*registrypb.ProviderInfo, error) {
for k, v := range r.rules {
if k == authType {
return &registrypb.ProviderInfo{
ProviderType: k,
Address: v,
}, nil
}
if address, ok := r.rules[authType]; ok {
return &registrypb.ProviderInfo{
ProviderType: authType,
Address: address,
}, nil
}
return nil, errtypes.NotFound("static: auth type not found: " + authType)
}
Expand Down