llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: improve error handling and code format (#2682)

Browse Source 
* feat: improve error process and code format

* feat: improve error process and code format
This commit is contained in:
DacongDA 2024-02-07 20:55:33 +08:00 committed by GitHub
parent 3ac4be64b8
commit 5c4e22288e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/auth.go
View File

@ -890,6 +890,7 @@ func (c *ApiController) GetSamlLogin() {
authURL, method, err := object.GenerateSamlRequest(providerId, relayState, c.Ctx.Request.Host, c.GetAcceptLanguage()) authURL, method, err := object.GenerateSamlRequest(providerId, relayState, c.Ctx.Request.Host, c.GetAcceptLanguage())
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return
} }
c.ResponseOk(authURL, method) c.ResponseOk(authURL, method)
} }
@ -900,6 +901,7 @@ func (c *ApiController) HandleSamlLogin() {
decode, err := base64.StdEncoding.DecodeString(relayState) decode, err := base64.StdEncoding.DecodeString(relayState)
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return
} }
slice := strings.Split(string(decode), "&") slice := strings.Split(string(decode), "&")
relayState = url.QueryEscape(relayState) relayState = url.QueryEscape(relayState)

2
object/provider.go
View File

@ -312,8 +312,6 @@ func GetPaymentProvider(p *Provider) (pp.PaymentProvider, error) {
} else { } else {
return nil, fmt.Errorf("the payment provider type: %s is not supported", p.Type) return nil, fmt.Errorf("the payment provider type: %s is not supported", p.Type)
} }
return nil, nil
} }
func (p *Provider) GetId() string { func (p *Provider) GetId() string {

6
object/user_enforcer.go
View File

@ -1,10 +1,12 @@
package object package object
import ( import (
errors2 "errors"
"fmt" "fmt"
"github.com/casbin/casbin/v2"
"github.com/casbin/casbin/v2/errors" "github.com/casbin/casbin/v2/errors"
"github.com/casbin/casbin/v2"
"github.com/casdoor/casdoor/util" "github.com/casdoor/casdoor/util"
) )
@ -87,7 +89,7 @@ func (e *UserGroupEnforcer) GetAllUsersByGroup(group string) ([]string, error) {
users, err := e.enforcer.GetUsersForRole(GetGroupWithPrefix(group)) users, err := e.enforcer.GetUsersForRole(GetGroupWithPrefix(group))
if err != nil { if err != nil {
if err == errors.ErrNameNotFound { if errors2.Is(err, errors.ErrNameNotFound) {
return []string{}, nil return []string{}, nil
} }
return nil, err return nil, err