fix: fix some api and function error

* feat:Add GetCert api * fix:Move enfocer.go -> enforcer.go * fix:Add ModelText to struct Model * fix:fix func DeleteOrganization * fix:fix func GetOrganization * fix:fix func GetSession
casdoor · Sep 15, 2023 · 50aa926 · 50aa926
1 parent 6c2f3f8
commit 50aa926
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/casdoorsdk/cert_global.go b/casdoorsdk/cert_global.go
@@ -22,6 +22,10 @@ func GetCerts() ([]*Cert, error) {
 	return globalClient.GetCerts()
 }
 
+func GetCert(name string) (*Cert, error) {
+	return globalClient.GetCert(name)
+}
+
 func UpdateCert(cert *Cert) (bool, error) {
 	return globalClient.UpdateCert(cert)
 }

diff --git a/casdoorsdk/enfocer.go → casdoorsdk/enforcer.go b/casdoorsdk/enfocer.go → casdoorsdk/enforcer.go
diff --git a/casdoorsdk/model.go b/casdoorsdk/model.go
@@ -39,6 +39,7 @@ type Model struct {
 	Key      string   `json:"key,omitempty"`
 	Children []*Model `json:"children,omitempty"`
 
+	ModelText string `xorm:"mediumtext" json:"modelText"`
 	IsEnabled bool `json:"isEnabled"`
 }
 

diff --git a/casdoorsdk/organization.go b/casdoorsdk/organization.go
@@ -136,7 +136,7 @@ func (c *Client) AddOrganization(organization *Organization) (bool, error) {
 
 func (c *Client) DeleteOrganization(name string) (bool, error) {
 	organization := Organization{
-		Owner: "admin",
+		Owner: c.OrganizationName,
 		Name:  name,
 	}
 

diff --git a/casdoorsdk/organization_global.go b/casdoorsdk/organization_global.go
@@ -14,8 +14,8 @@
 
 package casdoorsdk
 
-func GetOrganization(name string) ([]*Organization, error) {
-	return globalClient.GetOrganizations()
+func GetOrganization(name string) (*Organization, error) {
+	return globalClient.GetOrganization(name)
 }
 
 func GetOrganizations() ([]*Organization, error) {

diff --git a/casdoorsdk/session.go b/casdoorsdk/session.go
@@ -74,9 +74,9 @@ func (c *Client) GetPaginationSessions(p int, pageSize int, queryMap map[string]
 	return sessions, int(response.Data2.(float64)), nil
 }
 
-func (c *Client) GetSession(name string) (*Session, error) {
+func (c *Client) GetSession(name string, application string) (*Session, error) {
 	queryMap := map[string]string{
-		"id": fmt.Sprintf("%s/%s", c.OrganizationName, name),
+		"sessionPkId": fmt.Sprintf("%s/%s/%s", c.OrganizationName, name, application),
 	}
 
 	url := c.GetUrl("get-session", queryMap)

diff --git a/casdoorsdk/session_global.go b/casdoorsdk/session_global.go
@@ -22,8 +22,8 @@ func GetPaginationSessions(p int, pageSize int, queryMap map[string]string) ([]*
 	return globalClient.GetPaginationSessions(p, pageSize, queryMap)
 }
 
-func GetSession(name string) (*Session, error) {
-	return globalClient.GetSession(name)
+func GetSession(name string, application string) (*Session, error) {
+	return globalClient.GetSession(name, application)
 }
 
 func UpdateSession(session *Session) (bool, error) {