fix auth initialisation (#1630)

This commit is contained in:
Asim Aslam 2020-05-13 17:35:57 +01:00 committed by GitHub
parent ebd53794af
commit bba8c254d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -17,11 +17,6 @@ import (
"github.com/micro/go-micro/v2/util/jitter" "github.com/micro/go-micro/v2/util/jitter"
) )
// NewAuth returns a new instance of the Auth service
func NewAuth(opts ...auth.Option) auth.Auth {
return &svc{options: auth.NewOptions(opts...)}
}
// svc is the service implementation of the Auth interface // svc is the service implementation of the Auth interface
type svc struct { type svc struct {
options auth.Options options auth.Options
@ -45,6 +40,7 @@ func (s *svc) Init(opts ...auth.Option) {
if s.options.Client == nil { if s.options.Client == nil {
s.options.Client = client.DefaultClient s.options.Client = client.DefaultClient
} }
s.auth = pb.NewAuthService("go.micro.auth", s.options.Client) s.auth = pb.NewAuthService("go.micro.auth", s.options.Client)
s.rule = pb.NewRulesService("go.micro.auth", s.options.Client) s.rule = pb.NewRulesService("go.micro.auth", s.options.Client)
@ -315,3 +311,18 @@ func serializeAccount(a *pb.Account) *auth.Account {
Namespace: a.Namespace, Namespace: a.Namespace,
} }
} }
// NewAuth returns a new instance of the Auth service
func NewAuth(opts ...auth.Option) auth.Auth {
options := auth.NewOptions(opts...)
if options.Client == nil {
options.Client = client.DefaultClient
}
return &svc{
auth: pb.NewAuthService("go.micro.auth", options.Client),
rule: pb.NewRulesService("go.micro.auth", options.Client),
options: options,
}
}