llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-02 11:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: make hard-coded authz adapter editable, rename adapter to ormer (#2149)

Browse Source 
* refactor: rename casbinAdapter to casdoorAdapter

* feat: add initEnforcer

* fix: router

* refactor: make hard-coded code configurable

* fix: data type

* feat: support sqlite3

* feat: disable delete and edit name for built in resources

* feat: optimize code

* fix: init

* fix: e2e

* fix: remove datasourcename

* fix: revert rename

* refactor: change all ORM's Adatper to Ormer

* refactor: name
This commit is contained in:
Yaodong Yu
2023-07-29 15:07:04 +08:00
committed by GitHub
parent 74b058aa3f
commit ea10f8e615
56 changed files with 1314 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
object/provider.go
View File

@ -119,7 +119,7 @@ func GetGlobalProviderCount(field, value string) (int64, error) {
func GetProviders(owner string) ([]*Provider, error) {
providers := []*Provider{}
err := adapter.Engine.Where("owner = ? or owner = ? ", "admin", owner).Desc("created_time").Find(&providers, &Provider{})
err := ormer.Engine.Where("owner = ? or owner = ? ", "admin", owner).Desc("created_time").Find(&providers, &Provider{})
if err != nil {
return providers, err
}
@ -129,7 +129,7 @@ func GetProviders(owner string) ([]*Provider, error) {
func GetGlobalProviders() ([]*Provider, error) {
providers := []*Provider{}
err := adapter.Engine.Desc("created_time").Find(&providers)
err := ormer.Engine.Desc("created_time").Find(&providers)
if err != nil {
return providers, err
}
@ -165,7 +165,7 @@ func getProvider(owner string, name string) (*Provider, error) {
}
provider := Provider{Name: name}
existed, err := adapter.Engine.Get(&provider)
existed, err := ormer.Engine.Get(&provider)
if err != nil {
return &provider, err
}
@ -184,7 +184,7 @@ func GetProvider(id string) (*Provider, error) {
func getDefaultAiProvider() (*Provider, error) {
provider := Provider{Owner: "admin", Category: "AI"}
existed, err := adapter.Engine.Get(&provider)
existed, err := ormer.Engine.Get(&provider)
if err != nil {
return &provider, err
}
@ -221,7 +221,7 @@ func UpdateProvider(id string, provider *Provider) (bool, error) {
}
}
session := adapter.Engine.ID(core.PK{owner, name}).AllCols()
session := ormer.Engine.ID(core.PK{owner, name}).AllCols()
if provider.ClientSecret == "***" {
session = session.Omit("client_secret")
}
@ -248,7 +248,7 @@ func AddProvider(provider *Provider) (bool, error) {
provider.IntranetEndpoint = util.GetEndPoint(provider.IntranetEndpoint)
}
affected, err := adapter.Engine.Insert(provider)
affected, err := ormer.Engine.Insert(provider)
if err != nil {
return false, err
}
@ -257,7 +257,7 @@ func AddProvider(provider *Provider) (bool, error) {
}
func DeleteProvider(provider *Provider) (bool, error) {
affected, err := adapter.Engine.ID(core.PK{provider.Owner, provider.Name}).Delete(&Provider{})
affected, err := ormer.Engine.ID(core.PK{provider.Owner, provider.Name}).Delete(&Provider{})
if err != nil {
return false, err
}
@ -297,7 +297,7 @@ func (p *Provider) GetId() string {
func GetCaptchaProviderByOwnerName(applicationId, lang string) (*Provider, error) {
owner, name := util.GetOwnerAndNameFromId(applicationId)
provider := Provider{Owner: owner, Name: name, Category: "Captcha"}
existed, err := adapter.Engine.Get(&provider)
existed, err := ormer.Engine.Get(&provider)
if err != nil {
return nil, err
}
@ -333,7 +333,7 @@ func GetCaptchaProviderByApplication(applicationId, isCurrentProvider, lang stri
}
func providerChangeTrigger(oldName string, newName string) error {
session := adapter.Engine.NewSession()
session := ormer.Engine.NewSession()
defer session.Close()
err := session.Begin()
@ -342,7 +342,7 @@ func providerChangeTrigger(oldName string, newName string) error {
}
var applications []*Application
err = adapter.Engine.Find(&applications)
err = ormer.Engine.Find(&applications)
if err != nil {
return err
}