From b7655e1cf8d76aed8a43dbc5496ea03e529cf294 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Sat, 15 Aug 2020 19:25:14 +0200 Subject: [PATCH] Refactored system auth notification --- system/service/auth.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/system/service/auth.go b/system/service/auth.go index d302badf1..b1593852d 100644 --- a/system/service/auth.go +++ b/system/service/auth.go @@ -4,24 +4,21 @@ import ( "context" "errors" "fmt" - "github.com/cortezaproject/corteza-server/pkg/id" - "github.com/cortezaproject/corteza-server/store" - "regexp" - "strconv" - "time" - - "github.com/markbates/goth" - "golang.org/x/crypto/bcrypt" - "github.com/cortezaproject/corteza-server/pkg/actionlog" internalAuth "github.com/cortezaproject/corteza-server/pkg/auth" "github.com/cortezaproject/corteza-server/pkg/eventbus" "github.com/cortezaproject/corteza-server/pkg/handle" + "github.com/cortezaproject/corteza-server/pkg/id" "github.com/cortezaproject/corteza-server/pkg/permissions" "github.com/cortezaproject/corteza-server/pkg/rand" - "github.com/cortezaproject/corteza-server/system/repository" + "github.com/cortezaproject/corteza-server/store" "github.com/cortezaproject/corteza-server/system/service/event" "github.com/cortezaproject/corteza-server/system/types" + "github.com/markbates/goth" + "golang.org/x/crypto/bcrypt" + "regexp" + "strconv" + "time" ) type ( @@ -84,6 +81,7 @@ func Auth() *auth { notifications: DefaultAuthNotification, actionlog: DefaultActionlog, + store: DefaultNgStore, providerValidator: defaultProviderValidator, } @@ -925,7 +923,7 @@ func (svc auth) loadUserFromToken(ctx context.Context, token, kind string) (u *t } c, err := svc.store.LookupCredentialsByID(ctx, credentialsID) - if err == repository.ErrCredentialsNotFound { + if errors.Is(err, store.ErrNotFound) { return nil, AuthErrInvalidToken(aam) }