From dbbfa243bc13c8c8f77456a55f7c7e716b51b21e Mon Sep 17 00:00:00 2001 From: Gani Georgiev Date: Thu, 14 Jul 2022 20:01:53 +0300 Subject: [PATCH] added new lines for readability and consistency --- forms/user_oauth2_login.go | 1 + models/record.go | 1 + tools/search/filter.go | 2 ++ 3 files changed, 4 insertions(+) diff --git a/forms/user_oauth2_login.go b/forms/user_oauth2_login.go index a869277c..df39d7dc 100644 --- a/forms/user_oauth2_login.go +++ b/forms/user_oauth2_login.go @@ -100,6 +100,7 @@ func (form *UserOauth2Login) Submit() (*models.User, *auth.AuthUser, error) { } return user, authData, nil } + if !config.AllowRegistrations { // registration of new users is not allowed via the Oauth2 provider return nil, authData, errors.New("Cannot find user with the authorized email.") diff --git a/models/record.go b/models/record.go index 979a714e..e2698849 100644 --- a/models/record.go +++ b/models/record.go @@ -69,6 +69,7 @@ func NewRecordFromNullStringMap(collection *Collection, data dbx.NullStringMap) // each row in the provided NullStringMap slice. func NewRecordsFromNullStringMaps(collection *Collection, rows []dbx.NullStringMap) []*Record { result := make([]*Record, len(rows)) + for i, row := range rows { result[i] = NewRecordFromNullStringMap(collection, row) } diff --git a/tools/search/filter.go b/tools/search/filter.go index 9efccee4..09e151e2 100644 --- a/tools/search/filter.go +++ b/tools/search/filter.go @@ -153,11 +153,13 @@ func (f FilterData) resolveToken(token fexpr.Token, fieldResolver FieldResolver) } return "", nil, err } + return name, params, err case fexpr.TokenNumber, fexpr.TokenText: placeholder := "t" + security.RandomString(7) name := fmt.Sprintf("{:%s}", placeholder) params := dbx.Params{placeholder: token.Literal} + return name, params, nil }