From 04dbe30f49468742b412f5ef0bf33f2fc9e156d4 Mon Sep 17 00:00:00 2001 From: Pavel Korotkov Date: Thu, 23 Jul 2020 14:29:36 +0300 Subject: [PATCH] Refactor if-blocks in GetBearerToken method --- auth/bearer-token.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/auth/bearer-token.go b/auth/bearer-token.go index d7b76711..33c25301 100644 --- a/auth/bearer-token.go +++ b/auth/bearer-token.go @@ -13,14 +13,15 @@ const bearerTokenContextKey contextKey = "bearer-token" // GetBearerToken returns a bearer token embedded into a context or error, if any. func GetBearerToken(ctx context.Context) (*service.BearerTokenMsg, error) { - if bt := ctx.Value(bearerTokenContextKey); bt != nil { - v, ok := bt.(*service.BearerTokenMsg) - if !ok { - return nil, errors.Errorf("extracted unexpected type other than bearer token's: %T", v) - } - return v, nil + bt := ctx.Value(bearerTokenContextKey) + if bt == nil { + return nil, errors.New("got nil bearer token") } - return nil, errors.New("got nil bearer token") + v, ok := bt.(*service.BearerTokenMsg) + if !ok { + return nil, errors.Errorf("extracted unexpected type other than bearer token's: %T", v) + } + return v, nil } // SetBearerToken return a context with embedded bearer token.