fix for casbin duplicate issue during init and removing all deletes from init

This commit is contained in:
niravparikh05
2022-04-07 17:57:37 +05:30
parent f45ab36fb6
commit 8397d88836
3 changed files with 4 additions and 22 deletions
@@ -1,4 +1,5 @@
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
GRANT EXECUTE ON FUNCTION uuid_generate_v4() TO admindbuser;
CREATE TABLE IF NOT EXISTS authsrv_partner (
id uuid NOT NULL default uuid_generate_v4(),
name character varying(256) NOT NULL,
+1 -1
View File
@@ -259,7 +259,7 @@ func (s *userService) createGroupAccountRelations(ctx context.Context, db bun.ID
}
grpaccs = append(grpaccs, grp)
ugs = append(ugs, &authzv1.UserGroup{
Grp: "g:" + grp.Name,
Grp: "g:" + group,
User: "u:" + usr.Metadata.Name,
})
}
+2 -21
View File
@@ -17,7 +17,6 @@ import (
"github.com/RafayLabs/rcloud-base/pkg/common"
"github.com/RafayLabs/rcloud-base/pkg/enforcer"
"github.com/RafayLabs/rcloud-base/pkg/service"
authzv1 "github.com/RafayLabs/rcloud-base/proto/types/authz"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3"
rolev3 "github.com/RafayLabs/rcloud-base/proto/types/rolepb/v3"
systemv3 "github.com/RafayLabs/rcloud-base/proto/types/systempb/v3"
@@ -171,32 +170,14 @@ func main() {
us := service.NewUserService(providers.NewKratosAuthProvider(kc), db, as, nil, common.CliConfigDownloadData{})
prs := service.NewProjectService(db, as)
//delete all casbin rules
as.DeletePolicies(context.Background(), &authzv1.Policy{})
//delete all role permissions, roles
err = dao.HardDeleteAll(context.Background(), db, &models.ResourceRolePermission{})
if err != nil {
log.Fatal(err)
}
err = dao.HardDeleteAll(context.Background(), db, &models.ResourcePermission{})
if err != nil {
log.Fatal(err)
}
err = dao.HardDeleteAll(context.Background(), db, &models.Role{})
if err != nil {
log.Fatal(err)
}
//add resource permissions
err = addResourcePermissions(db, path.Join("scripts", "initialize", "permissions", "base"))
if err != nil {
fmt.Println("Run from base directory")
log.Fatal(err)
log.Fatal("Error running from base directory ", err)
}
err = addResourcePermissions(db, path.Join("scripts", "initialize", "permissions", "ztka"))
if err != nil {
fmt.Println("Run from ztka directory")
log.Fatal(err)
log.Fatal("Error running from ztka directory ", err)
}
// Create partner