Skip to content

fix: Fix the incorrect parameter order #6461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: Fix the incorrect parameter order #6461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/auth/user/UserCommonService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func (impl UserCommonServiceImpl) CreateDefaultPoliciesForAllTypesV2(team, entit
return false, err, nil
}
_, err = impl.userAuthRepository.CreateRole(renderedRole)
if err != nil && strings.Contains("duplicate key value violates unique constraint", err.Error()) {
if err != nil && strings.Contains(err.Error(), "duplicate key value violates unique constraint") {
return false, err, nil
}
return true, nil, renderedPolicyDetails
Expand Down
6 changes: 3 additions & 3 deletions pkg/auth/user/repository/UserAuthRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ func (impl UserAuthRepositoryImpl) CreateDefaultPoliciesForAllTypes(team, entity
return false, err, nil
}
_, err = impl.createRole(&roleData, UserId)
if err != nil && strings.Contains("duplicate key value violates unique constraint", err.Error()) {
if err != nil && strings.Contains(err.Error(), "duplicate key value violates unique constraint") {
return false, err, nil
}
err = tx.Commit()
Expand All @@ -516,7 +516,7 @@ func (impl UserAuthRepositoryImpl) CreateRolesWithAccessTypeAndEntity(team, enti
Resource: resource,
}
_, err := impl.createRole(&roleData, UserId)
if err != nil && strings.Contains("duplicate key value violates unique constraint", err.Error()) {
if err != nil && strings.Contains(err.Error(), "duplicate key value violates unique constraint") {
return false, err
}
return true, nil
Expand All @@ -543,7 +543,7 @@ func (impl UserAuthRepositoryImpl) CreateRoleForSuperAdminIfNotExists(tx *pg.Tx,
return false, err
}
_, err = impl.createRole(&roleManagerData, UserId)
if err != nil && strings.Contains("duplicate key value violates unique constraint", err.Error()) {
if err != nil && strings.Contains(err.Error(), "duplicate key value violates unique constraint") {
return false, err
}
}
Expand Down