From 45150254ad1709faaee3bed1c099c3cdf663f491 Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Mon, 29 Oct 2018 09:02:23 -0700 Subject: [PATCH] Updates based on feedback Signed-off-by: Derek Collison --- nats.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nats.go b/nats.go index b8d0cb58b..625bc81fa 100644 --- a/nats.go +++ b/nats.go @@ -705,7 +705,7 @@ func Nkey(pubKey string, sigCB SignatureHandler) Option { return func(o *Options) error { o.Nkey = pubKey o.SignatureCB = sigCB - if sigCB == nil { + if pubKey != "" && sigCB == nil { return ErrNkeyButNoSigCB } return nil @@ -823,6 +823,11 @@ func (o Options) Connect() (*Conn, error) { nc.Opts.Timeout = DefaultTimeout } + // Check if we have an nkey but no signature callback defined. + if nc.Opts.Nkey != "" && nc.Opts.SignatureCB == nil { + return nil, ErrNkeyButNoSigCB + } + // Allow custom Dialer for connecting using DialTimeout by default if nc.Opts.Dialer == nil { nc.Opts.Dialer = &net.Dialer{ @@ -1273,11 +1278,6 @@ func (nc *Conn) processExpectedInfo() error { return ErrNkeysNoSupported } - // Check if we have an nkey but no signature callback defined. - if nc.Opts.Nkey != "" && nc.Opts.SignatureCB == nil { - return ErrNkeyButNoSigCB - } - return nc.checkForSecure() }