diff --git a/controllers/auth.go b/controllers/auth.go index a73560d1..ffa75447 100644 --- a/controllers/auth.go +++ b/controllers/auth.go @@ -890,6 +890,7 @@ func (c *ApiController) GetSamlLogin() { authURL, method, err := object.GenerateSamlRequest(providerId, relayState, c.Ctx.Request.Host, c.GetAcceptLanguage()) if err != nil { c.ResponseError(err.Error()) + return } c.ResponseOk(authURL, method) } @@ -900,6 +901,7 @@ func (c *ApiController) HandleSamlLogin() { decode, err := base64.StdEncoding.DecodeString(relayState) if err != nil { c.ResponseError(err.Error()) + return } slice := strings.Split(string(decode), "&") relayState = url.QueryEscape(relayState) diff --git a/object/provider.go b/object/provider.go index 9524fbd7..f66a257d 100644 --- a/object/provider.go +++ b/object/provider.go @@ -312,8 +312,6 @@ func GetPaymentProvider(p *Provider) (pp.PaymentProvider, error) { } else { return nil, fmt.Errorf("the payment provider type: %s is not supported", p.Type) } - - return nil, nil } func (p *Provider) GetId() string { diff --git a/object/user_enforcer.go b/object/user_enforcer.go index 27d73453..052d9fea 100644 --- a/object/user_enforcer.go +++ b/object/user_enforcer.go @@ -1,10 +1,12 @@ package object import ( + errors2 "errors" "fmt" - "github.com/casbin/casbin/v2" "github.com/casbin/casbin/v2/errors" + + "github.com/casbin/casbin/v2" "github.com/casdoor/casdoor/util" ) @@ -87,7 +89,7 @@ func (e *UserGroupEnforcer) GetAllUsersByGroup(group string) ([]string, error) { users, err := e.enforcer.GetUsersForRole(GetGroupWithPrefix(group)) if err != nil { - if err == errors.ErrNameNotFound { + if errors2.Is(err, errors.ErrNameNotFound) { return []string{}, nil } return nil, err