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

util/wrapper: set auth credentials on streams (#1735)

Browse Source
This commit is contained in:
ben-toogood 2020-06-24 16:45:34 +01:00 committed by GitHub
parent a2a1f4dfbd
commit 00cd07a3a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/wrapper/wrapper.go
View File

@ -136,6 +136,16 @@ type authWrapper struct {
} }
func (a *authWrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error { func (a *authWrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
ctx = a.wrapContext(ctx, opts...)
return a.Client.Call(ctx, req, rsp, opts...)
}
func (a *authWrapper) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
ctx = a.wrapContext(ctx, opts...)
return a.Client.Stream(ctx, req, opts...)
}
func (a *authWrapper) wrapContext(ctx context.Context, opts ...client.CallOption) context.Context {
// parse the options // parse the options
var options client.CallOptions var options client.CallOptions
for _, o := range opts { for _, o := range opts {
@ -146,14 +156,14 @@ func (a *authWrapper) Call(ctx context.Context, req client.Request, rsp interfac
// We dont't override the header unless the ServiceToken option has // We dont't override the header unless the ServiceToken option has
// been specified or the header wasn't provided // been specified or the header wasn't provided
if _, ok := metadata.Get(ctx, "Authorization"); ok && !options.ServiceToken { if _, ok := metadata.Get(ctx, "Authorization"); ok && !options.ServiceToken {
return a.Client.Call(ctx, req, rsp, opts...) return ctx
} }
// if auth is nil we won't be able to get an access token, so we execute // if auth is nil we won't be able to get an access token, so we execute
// the request without one. // the request without one.
aa := a.auth() aa := a.auth()
if aa == nil { if aa == nil {
return a.Client.Call(ctx, req, rsp, opts...) return ctx
} }
// set the namespace header if it has not been set (e.g. on a service to service request) // set the namespace header if it has not been set (e.g. on a service to service request)
@ -165,11 +175,11 @@ func (a *authWrapper) Call(ctx context.Context, req client.Request, rsp interfac
aaOpts := aa.Options() aaOpts := aa.Options()
if aaOpts.Token != nil && !aaOpts.Token.Expired() { if aaOpts.Token != nil && !aaOpts.Token.Expired() {
ctx = metadata.Set(ctx, "Authorization", auth.BearerScheme+aaOpts.Token.AccessToken) ctx = metadata.Set(ctx, "Authorization", auth.BearerScheme+aaOpts.Token.AccessToken)
return a.Client.Call(ctx, req, rsp, opts...) return ctx
} }
// call without an auth token // call without an auth token
return a.Client.Call(ctx, req, rsp, opts...) return ctx
} }
// AuthClient wraps requests with the auth header // AuthClient wraps requests with the auth header