Browse Source

Update casdoor-go-sdk to v0.9.1

HEAD
Yang Luo 3 years ago
parent
commit
eec642aa6f
4 changed files with 15 additions and 15 deletions
  1. +4
    -4
      controllers/account.go
  2. +8
    -8
      controllers/base.go
  3. +1
    -1
      go.mod
  4. +2
    -2
      go.sum

+ 4
- 4
controllers/account.go View File

@@ -4,7 +4,7 @@ import (
_ "embed"

"github.com/astaxie/beego"
"github.com/casdoor/casdoor-go-sdk/auth"
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
)

//go:embed token_jwt_key.pem
@@ -21,19 +21,19 @@ func InitAuthConfig() {
casdoorOrganization := beego.AppConfig.String("casdoorOrganization")
casdoorApplication := beego.AppConfig.String("casdoorApplication")

auth.InitConfig(casdoorEndpoint, clientId, clientSecret, JwtPublicKey, casdoorOrganization, casdoorApplication)
casdoorsdk.InitConfig(casdoorEndpoint, clientId, clientSecret, JwtPublicKey, casdoorOrganization, casdoorApplication)
}

func (c *ApiController) Signin() {
code := c.Input().Get("code")
state := c.Input().Get("state")

token, err := auth.GetOAuthToken(code, state)
token, err := casdoorsdk.GetOAuthToken(code, state)
if err != nil {
panic(err)
}

claims, err := auth.ParseJwtToken(token.AccessToken)
claims, err := casdoorsdk.ParseJwtToken(token.AccessToken)
if err != nil {
panic(err)
}


+ 8
- 8
controllers/base.go View File

@@ -4,7 +4,7 @@ import (
"encoding/gob"

"github.com/astaxie/beego"
"github.com/casdoor/casdoor-go-sdk/auth"
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
)

type ApiController struct {
@@ -12,10 +12,10 @@ type ApiController struct {
}

func init() {
gob.Register(auth.Claims{})
gob.Register(casdoorsdk.Claims{})
}

func GetUserName(user *auth.User) string {
func GetUserName(user *casdoorsdk.User) string {
if user == nil {
return ""
}
@@ -23,17 +23,17 @@ func GetUserName(user *auth.User) string {
return user.Name
}

func (c *ApiController) GetSessionClaims() *auth.Claims {
func (c *ApiController) GetSessionClaims() *casdoorsdk.Claims {
s := c.GetSession("user")
if s == nil {
return nil
}

claims := s.(auth.Claims)
claims := s.(casdoorsdk.Claims)
return &claims
}

func (c *ApiController) SetSessionClaims(claims *auth.Claims) {
func (c *ApiController) SetSessionClaims(claims *casdoorsdk.Claims) {
if claims == nil {
c.DelSession("user")
return
@@ -42,7 +42,7 @@ func (c *ApiController) SetSessionClaims(claims *auth.Claims) {
c.SetSession("user", *claims)
}

func (c *ApiController) GetSessionUser() *auth.User {
func (c *ApiController) GetSessionUser() *casdoorsdk.User {
claims := c.GetSessionClaims()
if claims == nil {
return nil
@@ -51,7 +51,7 @@ func (c *ApiController) GetSessionUser() *auth.User {
return &claims.User
}

func (c *ApiController) SetSessionUser(user *auth.User) {
func (c *ApiController) SetSessionUser(user *casdoorsdk.User) {
if user == nil {
c.DelSession("user")
return


+ 1
- 1
go.mod View File

@@ -7,7 +7,7 @@ require (
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible
github.com/astaxie/beego v1.12.3
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
github.com/casdoor/casdoor-go-sdk v0.3.3
github.com/casdoor/casdoor-go-sdk v0.9.1
github.com/danaugrs/go-tsne/tsne v0.0.0-20220306155740-2250969e057f
github.com/go-sql-driver/mysql v1.6.0
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect


+ 2
- 2
go.sum View File

@@ -79,8 +79,8 @@ github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl
github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/casdoor/casdoor-go-sdk v0.3.3 h1:oyUNjpkC6zOEwBtY96qzqIQliQLsHZguOdrwItcGWnY=
github.com/casdoor/casdoor-go-sdk v0.3.3/go.mod h1:MBed3ISHQfXTtoOCAk5T8l5lt4wFvsyynrw0awggydY=
github.com/casdoor/casdoor-go-sdk v0.9.1 h1:z+5nJ4IvP9cNUodLf8wS42AYtDoUCvN6McRB5M+1SAQ=
github.com/casdoor/casdoor-go-sdk v0.9.1/go.mod h1:MBed3ISHQfXTtoOCAk5T8l5lt4wFvsyynrw0awggydY=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=


Loading…
Cancel
Save