unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

WithRoles variadic args (#1395)

Browse Source 
Co-authored-by: Ben Toogood <ben@micro.mu>
This commit is contained in:
ben-toogood 2020-03-24 10:18:34 +00:00 committed by GitHub
parent c1978265ab
commit 86272a3064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/options.go
View File

@ -85,7 +85,7 @@ func WithMetadata(md map[string]string) GenerateOption {
} }
// WithRoles for the generated account // WithRoles for the generated account
func WithRoles(rs []string) GenerateOption { func WithRoles(rs ...string) GenerateOption {
return func(o *GenerateOptions) { return func(o *GenerateOptions) {
o.Roles = rs o.Roles = rs
} }

4
auth/store/store.go
View File

@ -68,7 +68,7 @@ func (s *Store) Generate(id string, opts ...auth.GenerateOption) (*auth.Account,
secretOpts := []token.GenerateOption{ secretOpts := []token.GenerateOption{
token.WithExpiry(options.SecretExpiry), token.WithExpiry(options.SecretExpiry),
token.WithMetadata(options.Metadata), token.WithMetadata(options.Metadata),
token.WithRoles(options.Roles), token.WithRoles(options.Roles...),
} }
secret, err := s.secretProvider.Generate(id, secretOpts...) secret, err := s.secretProvider.Generate(id, secretOpts...)
if err != nil { if err != nil {
@ -166,6 +166,6 @@ func (s *Store) Refresh(secret string, opts ...auth.RefreshOption) (*auth.Token,
return s.tokenProvider.Generate(sec.Subject, return s.tokenProvider.Generate(sec.Subject,
token.WithExpiry(options.TokenExpiry), token.WithExpiry(options.TokenExpiry),
token.WithMetadata(sec.Metadata), token.WithMetadata(sec.Metadata),
token.WithRoles(sec.Roles), token.WithRoles(sec.Roles...),
) )
} }

6
auth/store/store_test.go
View File

@ -17,7 +17,7 @@ func TestGenerate(t *testing.T) {
metadata := map[string]string{"foo": "bar"} metadata := map[string]string{"foo": "bar"}
opts := []auth.GenerateOption{ opts := []auth.GenerateOption{
auth.WithRoles(roles), auth.WithRoles(roles...),
auth.WithMetadata(metadata), auth.WithMetadata(metadata),
} }
@ -100,7 +100,7 @@ func TestInspect(t *testing.T) {
metadata := map[string]string{"foo": "bar"} metadata := map[string]string{"foo": "bar"}
opts := []auth.GenerateOption{ opts := []auth.GenerateOption{
auth.WithRoles(roles), auth.WithRoles(roles...),
auth.WithMetadata(metadata), auth.WithMetadata(metadata),
} }
@ -146,7 +146,7 @@ func TestRefresh(t *testing.T) {
metadata := map[string]string{"foo": "bar"} metadata := map[string]string{"foo": "bar"}
opts := []auth.GenerateOption{ opts := []auth.GenerateOption{
auth.WithRoles(roles), auth.WithRoles(roles...),
auth.WithMetadata(metadata), auth.WithMetadata(metadata),
} }

2
auth/token/basic/basic_test.go
View File

@ -37,7 +37,7 @@ func TestInspect(t *testing.T) {
opts := []token.GenerateOption{ opts := []token.GenerateOption{
token.WithMetadata(md), token.WithMetadata(md),
token.WithRoles(roles), token.WithRoles(roles...),
} }
tok, err := b.Generate(subject, opts...) tok, err := b.Generate(subject, opts...)

2
auth/token/jwt/jwt_test.go
View File

@ -46,7 +46,7 @@ func TestInspect(t *testing.T) {
opts := []token.GenerateOption{ opts := []token.GenerateOption{
token.WithMetadata(md), token.WithMetadata(md),
token.WithRoles(roles), token.WithRoles(roles...),
} }
tok, err := j.Generate(subject, opts...) tok, err := j.Generate(subject, opts...)

2
auth/token/options.go
View File

@ -76,7 +76,7 @@ func WithMetadata(md map[string]string) func(o *GenerateOptions) {
} }
// WithRoles for the token // WithRoles for the token
func WithRoles(rs []string) func(o *GenerateOptions) { func WithRoles(rs ...string) func(o *GenerateOptions) {
return func(o *GenerateOptions) { return func(o *GenerateOptions) {
o.Roles = rs o.Roles = rs
} }