mirror of https://github.com/casbin/casnode.git
Update casdoor-go-sdk to v0.9.1
This commit is contained in:
parent
538d84077a
commit
a84384db0c
|
@ -14,13 +14,13 @@
|
||||||
|
|
||||||
package casdoor
|
package casdoor
|
||||||
|
|
||||||
import "github.com/casdoor/casdoor-go-sdk/auth"
|
import "github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
|
|
||||||
func GetUsers() []*auth.User {
|
func GetUsers() []*casdoorsdk.User {
|
||||||
if adapter != nil {
|
if adapter != nil {
|
||||||
return getUsers()
|
return getUsers()
|
||||||
} else {
|
} else {
|
||||||
users, err := auth.GetUsers()
|
users, err := casdoorsdk.GetUsers()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -29,11 +29,11 @@ func GetUsers() []*auth.User {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetSortedUsers(sorter string, limit int) []*auth.User {
|
func GetSortedUsers(sorter string, limit int) []*casdoorsdk.User {
|
||||||
if adapter != nil {
|
if adapter != nil {
|
||||||
return getSortedUsers(sorter, limit)
|
return getSortedUsers(sorter, limit)
|
||||||
} else {
|
} else {
|
||||||
users, err := auth.GetSortedUsers(sorter, limit)
|
users, err := casdoorsdk.GetSortedUsers(sorter, limit)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ func GetUserCount() int {
|
||||||
if adapter != nil {
|
if adapter != nil {
|
||||||
return getUserCount()
|
return getUserCount()
|
||||||
} else {
|
} else {
|
||||||
count, err := auth.GetUserCount("")
|
count, err := casdoorsdk.GetUserCount("")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -59,7 +59,7 @@ func GetOnlineUserCount() int {
|
||||||
if adapter != nil {
|
if adapter != nil {
|
||||||
return getOnlineUserCount()
|
return getOnlineUserCount()
|
||||||
} else {
|
} else {
|
||||||
count, err := auth.GetUserCount("1")
|
count, err := casdoorsdk.GetUserCount("1")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -68,11 +68,11 @@ func GetOnlineUserCount() int {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetUserByEmail(email string) *auth.User {
|
func GetUserByEmail(email string) *casdoorsdk.User {
|
||||||
if adapter != nil {
|
if adapter != nil {
|
||||||
return getUserByEmail(email)
|
return getUserByEmail(email)
|
||||||
} else {
|
} else {
|
||||||
user, err := auth.GetUserByEmail(email)
|
user, err := casdoorsdk.GetUserByEmail(email)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,19 +18,19 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
"xorm.io/core"
|
"xorm.io/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
func getUsers() []*auth.User {
|
func getUsers() []*casdoorsdk.User {
|
||||||
owner := CasdoorOrganization
|
owner := CasdoorOrganization
|
||||||
|
|
||||||
if adapter == nil {
|
if adapter == nil {
|
||||||
panic("casdoor adapter is nil")
|
panic("casdoor adapter is nil")
|
||||||
}
|
}
|
||||||
|
|
||||||
users := []*auth.User{}
|
users := []*casdoorsdk.User{}
|
||||||
err := adapter.Engine.Desc("created_time").Find(&users, &auth.User{Owner: owner})
|
err := adapter.Engine.Desc("created_time").Find(&users, &casdoorsdk.User{Owner: owner})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -38,15 +38,15 @@ func getUsers() []*auth.User {
|
||||||
return users
|
return users
|
||||||
}
|
}
|
||||||
|
|
||||||
func getSortedUsers(sorter string, limit int) []*auth.User {
|
func getSortedUsers(sorter string, limit int) []*casdoorsdk.User {
|
||||||
owner := CasdoorOrganization
|
owner := CasdoorOrganization
|
||||||
|
|
||||||
if adapter == nil {
|
if adapter == nil {
|
||||||
panic("casdoor adapter is nil")
|
panic("casdoor adapter is nil")
|
||||||
}
|
}
|
||||||
|
|
||||||
users := []*auth.User{}
|
users := []*casdoorsdk.User{}
|
||||||
err := adapter.Engine.Desc(sorter).Limit(limit, 0).Find(&users, &auth.User{Owner: owner})
|
err := adapter.Engine.Desc(sorter).Limit(limit, 0).Find(&users, &casdoorsdk.User{Owner: owner})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ func getUserCount() int {
|
||||||
panic("casdoor adapter is nil")
|
panic("casdoor adapter is nil")
|
||||||
}
|
}
|
||||||
|
|
||||||
count, err := adapter.Engine.Count(&auth.User{Owner: owner})
|
count, err := adapter.Engine.Count(&casdoorsdk.User{Owner: owner})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ func getOnlineUserCount() int {
|
||||||
panic("casdoor adapter is nil")
|
panic("casdoor adapter is nil")
|
||||||
}
|
}
|
||||||
|
|
||||||
count, err := adapter.Engine.Where("is_online = ?", 1).Count(&auth.User{Owner: owner})
|
count, err := adapter.Engine.Where("is_online = ?", 1).Count(&casdoorsdk.User{Owner: owner})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -84,7 +84,7 @@ func getOnlineUserCount() int {
|
||||||
return int(count)
|
return int(count)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetUser(name string) *auth.User {
|
func GetUser(name string) *casdoorsdk.User {
|
||||||
owner := CasdoorOrganization
|
owner := CasdoorOrganization
|
||||||
|
|
||||||
if adapter == nil {
|
if adapter == nil {
|
||||||
|
@ -95,7 +95,7 @@ func GetUser(name string) *auth.User {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
user := auth.User{Owner: owner, Name: name}
|
user := casdoorsdk.User{Owner: owner, Name: name}
|
||||||
existed, err := adapter.Engine.Get(&user)
|
existed, err := adapter.Engine.Get(&user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
|
@ -108,7 +108,7 @@ func GetUser(name string) *auth.User {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func getUserByEmail(email string) *auth.User {
|
func getUserByEmail(email string) *casdoorsdk.User {
|
||||||
owner := CasdoorOrganization
|
owner := CasdoorOrganization
|
||||||
|
|
||||||
if adapter == nil {
|
if adapter == nil {
|
||||||
|
@ -119,7 +119,7 @@ func getUserByEmail(email string) *auth.User {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
user := auth.User{Owner: owner, Email: email}
|
user := casdoorsdk.User{Owner: owner, Email: email}
|
||||||
existed, err := adapter.Engine.Get(&user)
|
existed, err := adapter.Engine.Get(&user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
|
@ -132,7 +132,7 @@ func getUserByEmail(email string) *auth.User {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func AddUser(user *auth.User) bool {
|
func AddUser(user *casdoorsdk.User) bool {
|
||||||
if adapter == nil {
|
if adapter == nil {
|
||||||
panic("casdoor adapter is nil")
|
panic("casdoor adapter is nil")
|
||||||
}
|
}
|
||||||
|
@ -145,7 +145,7 @@ func AddUser(user *auth.User) bool {
|
||||||
return affected != 0
|
return affected != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func AddUsers(users []*auth.User) bool {
|
func AddUsers(users []*casdoorsdk.User) bool {
|
||||||
if adapter == nil {
|
if adapter == nil {
|
||||||
panic("casdoor adapter is nil")
|
panic("casdoor adapter is nil")
|
||||||
}
|
}
|
||||||
|
@ -162,7 +162,7 @@ func AddUsers(users []*auth.User) bool {
|
||||||
return affected != 0
|
return affected != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func AddUsersInBatch(users []*auth.User) bool {
|
func AddUsersInBatch(users []*casdoorsdk.User) bool {
|
||||||
batchSize := 1000
|
batchSize := 1000
|
||||||
|
|
||||||
if len(users) == 0 {
|
if len(users) == 0 {
|
||||||
|
@ -187,7 +187,7 @@ func AddUsersInBatch(users []*auth.User) bool {
|
||||||
return affected
|
return affected
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateUser(owner string, name string, user *auth.User) (bool, error) {
|
func updateUser(owner string, name string, user *casdoorsdk.User) (bool, error) {
|
||||||
affected, err := adapter.Engine.ID(core.PK{owner, name}).AllCols().Update(user)
|
affected, err := adapter.Engine.ID(core.PK{owner, name}).AllCols().Update(user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
|
@ -196,7 +196,7 @@ func updateUser(owner string, name string, user *auth.User) (bool, error) {
|
||||||
return affected != 0, nil
|
return affected != 0, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func UpdateUser(owner string, name string, user *auth.User) bool {
|
func UpdateUser(owner string, name string, user *casdoorsdk.User) bool {
|
||||||
if adapter == nil {
|
if adapter == nil {
|
||||||
panic("casdoor adapter is nil")
|
panic("casdoor adapter is nil")
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"github.com/astaxie/beego"
|
"github.com/astaxie/beego"
|
||||||
"github.com/casbin/casnode/object"
|
"github.com/casbin/casnode/object"
|
||||||
"github.com/casbin/casnode/util"
|
"github.com/casbin/casnode/util"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed token_jwt_key.pem
|
//go:embed token_jwt_key.pem
|
||||||
|
@ -38,7 +38,7 @@ func InitAuthConfig() {
|
||||||
casdoorOrganization := beego.AppConfig.String("casdoorOrganization")
|
casdoorOrganization := beego.AppConfig.String("casdoorOrganization")
|
||||||
casdoorApplication := beego.AppConfig.String("casdoorApplication")
|
casdoorApplication := beego.AppConfig.String("casdoorApplication")
|
||||||
|
|
||||||
auth.InitConfig(casdoorEndpoint, clientId, clientSecret, JwtPublicKey, casdoorOrganization, casdoorApplication)
|
casdoorsdk.InitConfig(casdoorEndpoint, clientId, clientSecret, JwtPublicKey, casdoorOrganization, casdoorApplication)
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Title Signin
|
// @Title Signin
|
||||||
|
@ -52,13 +52,13 @@ func (c *ApiController) Signin() {
|
||||||
code := c.Input().Get("code")
|
code := c.Input().Get("code")
|
||||||
state := c.Input().Get("state")
|
state := c.Input().Get("state")
|
||||||
|
|
||||||
token, err := auth.GetOAuthToken(code, state)
|
token, err := casdoorsdk.GetOAuthToken(code, state)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(err.Error())
|
c.ResponseError(err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
claims, err := auth.ParseJwtToken(token.AccessToken)
|
claims, err := casdoorsdk.ParseJwtToken(token.AccessToken)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(err.Error())
|
c.ResponseError(err.Error())
|
||||||
return
|
return
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
|
|
||||||
"github.com/casbin/casnode/object"
|
"github.com/casbin/casnode/object"
|
||||||
"github.com/casbin/casnode/util"
|
"github.com/casbin/casnode/util"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
// @Tag Balance API
|
// @Tag Balance API
|
||||||
|
@ -37,7 +37,7 @@ func (c *ApiController) AddThanks() {
|
||||||
id := util.ParseInt(c.Input().Get("id"))
|
id := util.ParseInt(c.Input().Get("id"))
|
||||||
thanksType := c.Input().Get("thanksType") // 1 means topic, 2 means reply
|
thanksType := c.Input().Get("thanksType") // 1 means topic, 2 means reply
|
||||||
|
|
||||||
var author *auth.User
|
var author *casdoorsdk.User
|
||||||
if thanksType == "2" {
|
if thanksType == "2" {
|
||||||
author = object.GetReplyAuthor(id)
|
author = object.GetReplyAuthor(id)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"encoding/gob"
|
"encoding/gob"
|
||||||
|
|
||||||
"github.com/astaxie/beego"
|
"github.com/astaxie/beego"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ApiController struct {
|
type ApiController struct {
|
||||||
|
@ -26,10 +26,10 @@ type ApiController struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
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 {
|
if user == nil {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
@ -37,17 +37,17 @@ func GetUserName(user *auth.User) string {
|
||||||
return user.Name
|
return user.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ApiController) GetSessionClaims() *auth.Claims {
|
func (c *ApiController) GetSessionClaims() *casdoorsdk.Claims {
|
||||||
s := c.GetSession("user")
|
s := c.GetSession("user")
|
||||||
if s == nil {
|
if s == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
claims := s.(auth.Claims)
|
claims := s.(casdoorsdk.Claims)
|
||||||
return &claims
|
return &claims
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ApiController) SetSessionClaims(claims *auth.Claims) {
|
func (c *ApiController) SetSessionClaims(claims *casdoorsdk.Claims) {
|
||||||
if claims == nil {
|
if claims == nil {
|
||||||
c.DelSession("user")
|
c.DelSession("user")
|
||||||
return
|
return
|
||||||
|
@ -56,7 +56,7 @@ func (c *ApiController) SetSessionClaims(claims *auth.Claims) {
|
||||||
c.SetSession("user", *claims)
|
c.SetSession("user", *claims)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ApiController) GetSessionUser() *auth.User {
|
func (c *ApiController) GetSessionUser() *casdoorsdk.User {
|
||||||
claims := c.GetSessionClaims()
|
claims := c.GetSessionClaims()
|
||||||
if claims == nil {
|
if claims == nil {
|
||||||
return nil
|
return nil
|
||||||
|
@ -65,7 +65,7 @@ func (c *ApiController) GetSessionUser() *auth.User {
|
||||||
return &claims.User
|
return &claims.User
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ApiController) SetSessionUser(user *auth.User) {
|
func (c *ApiController) SetSessionUser(user *casdoorsdk.User) {
|
||||||
if user == nil {
|
if user == nil {
|
||||||
// c.DelSession("user")
|
// c.DelSession("user")
|
||||||
return
|
return
|
||||||
|
|
|
@ -23,7 +23,7 @@ import (
|
||||||
// @Title GetMember
|
// @Title GetMember
|
||||||
// @Description get member by id
|
// @Description get member by id
|
||||||
// @Param id query string true "id"
|
// @Param id query string true "id"
|
||||||
// @Success 200 {object} auth.User The Response object
|
// @Success 200 {object} casdoorsdk.User The Response object
|
||||||
// @router /get-member [get]
|
// @router /get-member [get]
|
||||||
// @Tag Member API
|
// @Tag Member API
|
||||||
func (c *ApiController) GetMember() {
|
func (c *ApiController) GetMember() {
|
||||||
|
@ -50,7 +50,7 @@ func (c *ApiController) GetMemberEditorType() {
|
||||||
|
|
||||||
// @Title GetRankingRich
|
// @Title GetRankingRich
|
||||||
// @Description RankingRich
|
// @Description RankingRich
|
||||||
// @Success 200 {array} auth.User The Response object
|
// @Success 200 {array} casdoorsdk.User The Response object
|
||||||
// @router /get-ranking-rich [get]
|
// @router /get-ranking-rich [get]
|
||||||
// @Tag Member API
|
// @Tag Member API
|
||||||
func (c *ApiController) GetRankingRich() {
|
func (c *ApiController) GetRankingRich() {
|
||||||
|
@ -65,7 +65,7 @@ func (c *ApiController) GetRankingRich() {
|
||||||
|
|
||||||
// @Title GetRankingPlayer
|
// @Title GetRankingPlayer
|
||||||
// @Description RankingPlayer
|
// @Description RankingPlayer
|
||||||
// @Success 200 {array} auth.User The Response object
|
// @Success 200 {array} casdoorsdk.User The Response object
|
||||||
// @router /get-ranking-player [get]
|
// @router /get-ranking-player [get]
|
||||||
// @Tag Member API
|
// @Tag Member API
|
||||||
func (c *ApiController) GetRankingPlayer() {
|
func (c *ApiController) GetRankingPlayer() {
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
"github.com/casbin/casnode/casdoor"
|
"github.com/casbin/casnode/casdoor"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
var discuzxDefaultAvatarUrl string
|
var discuzxDefaultAvatarUrl string
|
||||||
|
@ -30,7 +30,7 @@ func init() {
|
||||||
discuzxDefaultAvatarUrl = fmt.Sprintf("%suc_server/images/noavatar_middle.gif", discuzxDomain)
|
discuzxDefaultAvatarUrl = fmt.Sprintf("%suc_server/images/noavatar_middle.gif", discuzxDomain)
|
||||||
}
|
}
|
||||||
|
|
||||||
func syncAvatarForUser(user *auth.User) string {
|
func syncAvatarForUser(user *casdoorsdk.User) string {
|
||||||
uid := user.Ranking
|
uid := user.Ranking
|
||||||
username := user.Name
|
username := user.Name
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ func syncAvatarForUser(user *auth.User) string {
|
||||||
return avatarUrl
|
return avatarUrl
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateDefaultAvatarForUser(user *auth.User) string {
|
func updateDefaultAvatarForUser(user *casdoorsdk.User) string {
|
||||||
uid := user.Ranking
|
uid := user.Ranking
|
||||||
username := user.Name
|
username := user.Name
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"github.com/casbin/casnode/casdoor"
|
"github.com/casbin/casnode/casdoor"
|
||||||
"github.com/casbin/casnode/controllers"
|
"github.com/casbin/casnode/controllers"
|
||||||
"github.com/casbin/casnode/object"
|
"github.com/casbin/casnode/object"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestAvatar(t *testing.T) {
|
func TestAvatar(t *testing.T) {
|
||||||
|
@ -46,7 +46,7 @@ func TestUpdateDefaultAvatars(t *testing.T) {
|
||||||
sem := make(chan int, SyncAvatarsConcurrency)
|
sem := make(chan int, SyncAvatarsConcurrency)
|
||||||
for i, user := range users {
|
for i, user := range users {
|
||||||
sem <- 1
|
sem <- 1
|
||||||
go func(i int, user *auth.User) {
|
go func(i int, user *casdoorsdk.User) {
|
||||||
if user.IsDefaultAvatar {
|
if user.IsDefaultAvatar {
|
||||||
avatarUrl := updateDefaultAvatarForUser(user)
|
avatarUrl := updateDefaultAvatarForUser(user)
|
||||||
fmt.Printf("[%d/%d]: Updated default avatar for user: [%d, %s] as URL: %s\n", i+1, len(users), user.Ranking, user.Name, avatarUrl)
|
fmt.Printf("[%d/%d]: Updated default avatar for user: [%d, %s] as URL: %s\n", i+1, len(users), user.Ranking, user.Name, avatarUrl)
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"github.com/casbin/casnode/casdoor"
|
"github.com/casbin/casnode/casdoor"
|
||||||
"github.com/casbin/casnode/controllers"
|
"github.com/casbin/casnode/controllers"
|
||||||
"github.com/casbin/casnode/object"
|
"github.com/casbin/casnode/object"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
var SyncAvatarsConcurrency = 20
|
var SyncAvatarsConcurrency = 20
|
||||||
|
@ -39,7 +39,7 @@ func TestSyncAvatars(t *testing.T) {
|
||||||
sem := make(chan int, SyncAvatarsConcurrency)
|
sem := make(chan int, SyncAvatarsConcurrency)
|
||||||
for i, user := range users {
|
for i, user := range users {
|
||||||
sem <- 1
|
sem <- 1
|
||||||
go func(i int, user *auth.User) {
|
go func(i int, user *casdoorsdk.User) {
|
||||||
if user.Avatar == "" {
|
if user.Avatar == "" {
|
||||||
avatarUrl := syncAvatarForUser(user)
|
avatarUrl := syncAvatarForUser(user)
|
||||||
fmt.Printf("[%d/%d]: Synced avatar for user: [%d, %s] as URL: %s\n", i+1, len(users), user.Ranking, user.Name, avatarUrl)
|
fmt.Printf("[%d/%d]: Synced avatar for user: [%d, %s] as URL: %s\n", i+1, len(users), user.Ranking, user.Name, avatarUrl)
|
||||||
|
|
|
@ -18,11 +18,11 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
func getUserFromMember(memberEx *MemberEx) *auth.User {
|
func getUserFromMember(memberEx *MemberEx) *casdoorsdk.User {
|
||||||
user := &auth.User{
|
user := &casdoorsdk.User{
|
||||||
Owner: CasdoorOrganization,
|
Owner: CasdoorOrganization,
|
||||||
Name: memberEx.Member.Username,
|
Name: memberEx.Member.Username,
|
||||||
CreatedTime: getTimeFromUnixSeconds(memberEx.Member.Regdate),
|
CreatedTime: getTimeFromUnixSeconds(memberEx.Member.Regdate),
|
||||||
|
|
|
@ -22,7 +22,7 @@ import (
|
||||||
"github.com/casbin/casnode/casdoor"
|
"github.com/casbin/casnode/casdoor"
|
||||||
"github.com/casbin/casnode/controllers"
|
"github.com/casbin/casnode/controllers"
|
||||||
"github.com/casbin/casnode/object"
|
"github.com/casbin/casnode/object"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
var AddUsersConcurrency = 20
|
var AddUsersConcurrency = 20
|
||||||
|
@ -40,7 +40,7 @@ func TestAddUsers(t *testing.T) {
|
||||||
wg.Add(len(membersEx))
|
wg.Add(len(membersEx))
|
||||||
|
|
||||||
sem := make(chan int, AddUsersConcurrency)
|
sem := make(chan int, AddUsersConcurrency)
|
||||||
users := []*auth.User{}
|
users := []*casdoorsdk.User{}
|
||||||
for i, memberEx := range membersEx {
|
for i, memberEx := range membersEx {
|
||||||
sem <- 1
|
sem <- 1
|
||||||
go func(i int, memberEx *MemberEx) {
|
go func(i int, memberEx *MemberEx) {
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -6,7 +6,7 @@ require (
|
||||||
github.com/adamzy/cedar-go v0.0.0-20170805034717-80a9c64b256d // indirect
|
github.com/adamzy/cedar-go v0.0.0-20170805034717-80a9c64b256d // indirect
|
||||||
github.com/astaxie/beego v1.12.3
|
github.com/astaxie/beego v1.12.3
|
||||||
github.com/casbin/google-groups-crawler v0.1.3
|
github.com/casbin/google-groups-crawler v0.1.3
|
||||||
github.com/casdoor/casdoor-go-sdk v0.3.0
|
github.com/casdoor/casdoor-go-sdk v0.9.1
|
||||||
github.com/chromedp/chromedp v0.8.4
|
github.com/chromedp/chromedp v0.8.4
|
||||||
github.com/elazarl/go-bindata-assetfs v1.0.1 // indirect
|
github.com/elazarl/go-bindata-assetfs v1.0.1 // indirect
|
||||||
github.com/go-sql-driver/mysql v1.5.0
|
github.com/go-sql-driver/mysql v1.5.0
|
||||||
|
|
4
go.sum
4
go.sum
|
@ -62,8 +62,8 @@ github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6
|
||||||
github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
|
github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
|
||||||
github.com/casbin/google-groups-crawler v0.1.3 h1:kmbzjLK88dtSTk7ycDvjKH6hwVB0z6dAJGpJvvqRFsg=
|
github.com/casbin/google-groups-crawler v0.1.3 h1:kmbzjLK88dtSTk7ycDvjKH6hwVB0z6dAJGpJvvqRFsg=
|
||||||
github.com/casbin/google-groups-crawler v0.1.3/go.mod h1:JHKvWP8blOe/Mbob3R4aaU5RvVIOC83eBcCSlKsbKSI=
|
github.com/casbin/google-groups-crawler v0.1.3/go.mod h1:JHKvWP8blOe/Mbob3R4aaU5RvVIOC83eBcCSlKsbKSI=
|
||||||
github.com/casdoor/casdoor-go-sdk v0.3.0 h1:8tweeuebw5SD97qapQg8qZK+xpVpXXTKErOUP1vD9EU=
|
github.com/casdoor/casdoor-go-sdk v0.9.1 h1:z+5nJ4IvP9cNUodLf8wS42AYtDoUCvN6McRB5M+1SAQ=
|
||||||
github.com/casdoor/casdoor-go-sdk v0.3.0/go.mod h1:MBed3ISHQfXTtoOCAk5T8l5lt4wFvsyynrw0awggydY=
|
github.com/casdoor/casdoor-go-sdk v0.9.1/go.mod h1:MBed3ISHQfXTtoOCAk5T8l5lt4wFvsyynrw0awggydY=
|
||||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
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=
|
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
|
||||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/casbin/casnode/util"
|
"github.com/casbin/casnode/util"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ConsumptionType 1-9 means:
|
// ConsumptionType 1-9 means:
|
||||||
|
@ -64,18 +64,18 @@ func AddBalance(balance *ConsumptionRecord) bool {
|
||||||
return affected != 0
|
return affected != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetMemberBalance(user *auth.User) int {
|
func GetMemberBalance(user *casdoorsdk.User) int {
|
||||||
return user.Score
|
return user.Score
|
||||||
}
|
}
|
||||||
|
|
||||||
func UpdateMemberBalance(user *auth.User, amount int) (bool, error) {
|
func UpdateMemberBalance(user *casdoorsdk.User, amount int) (bool, error) {
|
||||||
user.Score += amount
|
user.Score += amount
|
||||||
return auth.UpdateUserForColumns(user, []string{"score"})
|
return casdoorsdk.UpdateUserForColumns(user, []string{"score"})
|
||||||
}
|
}
|
||||||
|
|
||||||
func UpdateMemberConsumptionSum(user *auth.User, amount int) (bool, error) {
|
func UpdateMemberConsumptionSum(user *casdoorsdk.User, amount int) (bool, error) {
|
||||||
user.Karma += amount
|
user.Karma += amount
|
||||||
return auth.UpdateUserForColumns(user, []string{"karma"})
|
return casdoorsdk.UpdateUserForColumns(user, []string{"karma"})
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetMemberConsumptionRecordNum(memberId string) int {
|
func GetMemberConsumptionRecordNum(memberId string) int {
|
||||||
|
@ -174,7 +174,7 @@ func GetThanksStatus(memberId string, id, recordType int) bool {
|
||||||
return total != 0
|
return total != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateTopicConsumption(user *auth.User, id int) bool {
|
func CreateTopicConsumption(user *casdoorsdk.User, id int) bool {
|
||||||
record := ConsumptionRecord{
|
record := ConsumptionRecord{
|
||||||
// Id: util.IntToString(GetConsumptionRecordId()),
|
// Id: util.IntToString(GetConsumptionRecordId()),
|
||||||
ReceiverId: GetUserName(user),
|
ReceiverId: GetUserName(user),
|
||||||
|
@ -197,7 +197,7 @@ func CreateTopicConsumption(user *auth.User, id int) bool {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateReplyConsumption(user *auth.User, id int) bool {
|
func CreateReplyConsumption(user *casdoorsdk.User, id int) bool {
|
||||||
record := ConsumptionRecord{
|
record := ConsumptionRecord{
|
||||||
// Id: util.IntToString(GetConsumptionRecordId()),
|
// Id: util.IntToString(GetConsumptionRecordId()),
|
||||||
ReceiverId: GetUserName(user),
|
ReceiverId: GetUserName(user),
|
||||||
|
@ -220,7 +220,7 @@ func CreateReplyConsumption(user *auth.User, id int) bool {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetReplyBonus(author *auth.User, consumer *auth.User, id int) {
|
func GetReplyBonus(author *casdoorsdk.User, consumer *casdoorsdk.User, id int) {
|
||||||
if author.Name == consumer.Name {
|
if author.Name == consumer.Name {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -240,7 +240,7 @@ func GetReplyBonus(author *auth.User, consumer *auth.User, id int) {
|
||||||
UpdateMemberBalance(author, record.Amount)
|
UpdateMemberBalance(author, record.Amount)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TopTopicConsumption(user *auth.User, id int) bool {
|
func TopTopicConsumption(user *casdoorsdk.User, id int) bool {
|
||||||
record := ConsumptionRecord{
|
record := ConsumptionRecord{
|
||||||
ReceiverId: GetUserName(user),
|
ReceiverId: GetUserName(user),
|
||||||
ObjectId: id,
|
ObjectId: id,
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
package object
|
package object
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
"github.com/microcosm-cc/bluemonday"
|
"github.com/microcosm-cc/bluemonday"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ func HasPlane(id string) bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsForbidden check member whether is forbidden.
|
// IsForbidden check member whether is forbidden.
|
||||||
func IsForbidden(user *auth.User) bool {
|
func IsForbidden(user *casdoorsdk.User) bool {
|
||||||
return user.IsForbidden
|
return user.IsForbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ package object
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/casbin/casnode/util"
|
"github.com/casbin/casnode/util"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Favorites struct {
|
type Favorites struct {
|
||||||
|
@ -110,14 +110,14 @@ func GetTopicsFromFavorites(memberId string, limit int, offset int, favoritesTyp
|
||||||
return topics
|
return topics
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetMembersFromFavorites(objectId string, favoritesType string) []*auth.User {
|
func GetMembersFromFavorites(objectId string, favoritesType string) []*casdoorsdk.User {
|
||||||
favorites := []*Favorites{}
|
favorites := []*Favorites{}
|
||||||
err := adapter.Engine.Where("object_id = ?", objectId).And("favorites_type = ?", favoritesType).Find(&favorites)
|
err := adapter.Engine.Where("object_id = ?", objectId).And("favorites_type = ?", favoritesType).Find(&favorites)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
members := []*auth.User{}
|
members := []*casdoorsdk.User{}
|
||||||
for _, v := range favorites {
|
for _, v := range favorites {
|
||||||
memberId := v.MemberId
|
memberId := v.MemberId
|
||||||
temp := GetUser(memberId)
|
temp := GetUser(memberId)
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
package object
|
package object
|
||||||
|
|
||||||
import "github.com/casdoor/casdoor-go-sdk/auth"
|
import "github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
|
|
||||||
type UploadFileRecord struct {
|
type UploadFileRecord struct {
|
||||||
Id int `xorm:"int notnull pk autoincr" json:"id"`
|
Id int `xorm:"int notnull pk autoincr" json:"id"`
|
||||||
|
@ -107,7 +107,7 @@ func DeleteFileRecord(id int) bool {
|
||||||
return affected != 0
|
return affected != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func FileEditable(user *auth.User, author string) bool {
|
func FileEditable(user *casdoorsdk.User, author string) bool {
|
||||||
if CheckIsAdmin(user) {
|
if CheckIsAdmin(user) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@ import (
|
||||||
"github.com/astaxie/beego/logs"
|
"github.com/astaxie/beego/logs"
|
||||||
"github.com/casbin/casnode/service"
|
"github.com/casbin/casnode/service"
|
||||||
"github.com/casbin/casnode/util"
|
"github.com/casbin/casnode/util"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
"github.com/sromku/go-gitter"
|
"github.com/sromku/go-gitter"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -304,14 +304,14 @@ func createTopicWithMessages(messages []gitter.Message, room gitter.Room, node N
|
||||||
}()
|
}()
|
||||||
|
|
||||||
// create if user is not exist
|
// create if user is not exist
|
||||||
user, err := auth.GetUser(msg.From.Username)
|
user, err := casdoorsdk.GetUser(msg.From.Username)
|
||||||
// fmt.Println("user:", user)
|
// fmt.Println("user:", user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
if user.Id == "" { // add user
|
if user.Id == "" { // add user
|
||||||
avatar := getGitterAvatarUrl(msg.From.Username, msg.From.AvatarURLMedium) // if error, avatar will be ""
|
avatar := getGitterAvatarUrl(msg.From.Username, msg.From.AvatarURLMedium) // if error, avatar will be ""
|
||||||
newUser := auth.User{
|
newUser := casdoorsdk.User{
|
||||||
Name: msg.From.Username,
|
Name: msg.From.Username,
|
||||||
CreatedTime: util.GetCurrentTime(),
|
CreatedTime: util.GetCurrentTime(),
|
||||||
UpdatedTime: util.GetCurrentTime(),
|
UpdatedTime: util.GetCurrentTime(),
|
||||||
|
@ -320,7 +320,7 @@ func createTopicWithMessages(messages []gitter.Message, room gitter.Room, node N
|
||||||
SignupApplication: CasdoorApplication,
|
SignupApplication: CasdoorApplication,
|
||||||
}
|
}
|
||||||
fmt.Println("add user: ", newUser.Name)
|
fmt.Println("add user: ", newUser.Name)
|
||||||
_, err := auth.AddUser(&newUser)
|
_, err := casdoorsdk.AddUser(&newUser)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,23 +21,23 @@ import (
|
||||||
|
|
||||||
"github.com/casbin/casnode/casdoor"
|
"github.com/casbin/casnode/casdoor"
|
||||||
"github.com/casbin/casnode/util"
|
"github.com/casbin/casnode/util"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetRankingRich() ([]*auth.User, error) {
|
func GetRankingRich() ([]*casdoorsdk.User, error) {
|
||||||
return casdoor.GetSortedUsers("score", 25), nil
|
return casdoor.GetSortedUsers("score", 25), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetRankingPlayer() ([]*auth.User, error) {
|
func GetRankingPlayer() ([]*casdoorsdk.User, error) {
|
||||||
return casdoor.GetSortedUsers("karma", 25), nil
|
return casdoor.GetSortedUsers("karma", 25), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetUser(id string) *auth.User {
|
func GetUser(id string) *casdoorsdk.User {
|
||||||
user := casdoor.GetUser(id)
|
user := casdoor.GetUser(id)
|
||||||
return user
|
return user
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetUsers() []*auth.User {
|
func GetUsers() []*casdoorsdk.User {
|
||||||
users := casdoor.GetUsers()
|
users := casdoor.GetUsers()
|
||||||
return users
|
return users
|
||||||
}
|
}
|
||||||
|
@ -46,25 +46,25 @@ func GetMemberNum() int {
|
||||||
return casdoor.GetUserCount()
|
return casdoor.GetUserCount()
|
||||||
}
|
}
|
||||||
|
|
||||||
func UpdateMemberEditorType(user *auth.User, editorType string) (bool, error) {
|
func UpdateMemberEditorType(user *casdoorsdk.User, editorType string) (bool, error) {
|
||||||
if user == nil {
|
if user == nil {
|
||||||
return false, fmt.Errorf("user is nil")
|
return false, fmt.Errorf("user is nil")
|
||||||
}
|
}
|
||||||
|
|
||||||
SetUserField(user, "editorType", editorType)
|
SetUserField(user, "editorType", editorType)
|
||||||
return auth.UpdateUserForColumns(user, []string{"properties"})
|
return casdoorsdk.UpdateUserForColumns(user, []string{"properties"})
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetMemberEditorType(user *auth.User) string {
|
func GetMemberEditorType(user *casdoorsdk.User) string {
|
||||||
return GetUserField(user, "editorType")
|
return GetUserField(user, "editorType")
|
||||||
}
|
}
|
||||||
|
|
||||||
func UpdateMemberLanguage(user *auth.User, language string) (bool, error) {
|
func UpdateMemberLanguage(user *casdoorsdk.User, language string) (bool, error) {
|
||||||
SetUserField(user, "language", language)
|
SetUserField(user, "language", language)
|
||||||
return auth.UpdateUserForColumns(user, []string{"properties"})
|
return casdoorsdk.UpdateUserForColumns(user, []string{"properties"})
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetMemberLanguage(user *auth.User) string {
|
func GetMemberLanguage(user *casdoorsdk.User) string {
|
||||||
return GetUserField(user, "language")
|
return GetUserField(user, "language")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,20 +78,20 @@ func GetMemberEmailReminder(id string) (bool, string) {
|
||||||
return true, user.Email
|
return true, user.Email
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetUserByEmail(email string) *auth.User {
|
func GetUserByEmail(email string) *casdoorsdk.User {
|
||||||
return casdoor.GetUserByEmail(email)
|
return casdoor.GetUserByEmail(email)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetMemberCheckinDate(user *auth.User) string {
|
func GetMemberCheckinDate(user *casdoorsdk.User) string {
|
||||||
return GetUserField(user, "checkinDate")
|
return GetUserField(user, "checkinDate")
|
||||||
}
|
}
|
||||||
|
|
||||||
func UpdateMemberCheckinDate(user *auth.User, checkinDate string) (bool, error) {
|
func UpdateMemberCheckinDate(user *casdoorsdk.User, checkinDate string) (bool, error) {
|
||||||
SetUserField(user, "checkinDate", checkinDate)
|
SetUserField(user, "checkinDate", checkinDate)
|
||||||
return auth.UpdateUserForColumns(user, []string{"properties"})
|
return casdoorsdk.UpdateUserForColumns(user, []string{"properties"})
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetUserName(user *auth.User) string {
|
func GetUserName(user *casdoorsdk.User) string {
|
||||||
if user == nil {
|
if user == nil {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
@ -99,7 +99,7 @@ func GetUserName(user *auth.User) string {
|
||||||
return user.Name
|
return user.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckIsAdmin(user *auth.User) bool {
|
func CheckIsAdmin(user *casdoorsdk.User) bool {
|
||||||
if user == nil {
|
if user == nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -107,7 +107,7 @@ func CheckIsAdmin(user *auth.User) bool {
|
||||||
return user.IsAdmin
|
return user.IsAdmin
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetMemberFileQuota(user *auth.User) int {
|
func GetMemberFileQuota(user *casdoorsdk.User) int {
|
||||||
if user == nil {
|
if user == nil {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
@ -116,14 +116,14 @@ func GetMemberFileQuota(user *auth.User) int {
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateMemberOnlineStatus updates member's online information.
|
// UpdateMemberOnlineStatus updates member's online information.
|
||||||
func UpdateMemberOnlineStatus(user *auth.User, isOnline bool, lastActionDate string) (bool, error) {
|
func UpdateMemberOnlineStatus(user *casdoorsdk.User, isOnline bool, lastActionDate string) (bool, error) {
|
||||||
if user == nil {
|
if user == nil {
|
||||||
return false, fmt.Errorf("user is nil")
|
return false, fmt.Errorf("user is nil")
|
||||||
}
|
}
|
||||||
|
|
||||||
user.IsOnline = isOnline
|
user.IsOnline = isOnline
|
||||||
SetUserField(user, "lastActionDate", lastActionDate)
|
SetUserField(user, "lastActionDate", lastActionDate)
|
||||||
return auth.UpdateUserForColumns(user, []string{"isOnline", "properties"})
|
return casdoorsdk.UpdateUserForColumns(user, []string{"isOnline", "properties"})
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetOnlineUserCount() int {
|
func GetOnlineUserCount() int {
|
||||||
|
@ -135,7 +135,7 @@ type UpdateListItem struct {
|
||||||
Attribute string
|
Attribute string
|
||||||
}
|
}
|
||||||
|
|
||||||
func AddMemberByNameAndEmailIfNotExist(username, email string) (*auth.User, error) {
|
func AddMemberByNameAndEmailIfNotExist(username, email string) (*casdoorsdk.User, error) {
|
||||||
username = strings.ReplaceAll(username, " ", "")
|
username = strings.ReplaceAll(username, " ", "")
|
||||||
if username == "" {
|
if username == "" {
|
||||||
return nil, fmt.Errorf("username is empty")
|
return nil, fmt.Errorf("username is empty")
|
||||||
|
@ -146,7 +146,7 @@ func AddMemberByNameAndEmailIfNotExist(username, email string) (*auth.User, erro
|
||||||
return nil, fmt.Errorf("email is empty")
|
return nil, fmt.Errorf("email is empty")
|
||||||
}
|
}
|
||||||
|
|
||||||
user, err := auth.GetUser(username)
|
user, err := casdoorsdk.GetUser(username)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -155,7 +155,7 @@ func AddMemberByNameAndEmailIfNotExist(username, email string) (*auth.User, erro
|
||||||
}
|
}
|
||||||
|
|
||||||
username = strings.Split(email, "@")[0]
|
username = strings.Split(email, "@")[0]
|
||||||
user, err = auth.GetUser(username)
|
user, err = casdoorsdk.GetUser(username)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -170,7 +170,7 @@ func AddMemberByNameAndEmailIfNotExist(username, email string) (*auth.User, erro
|
||||||
properties["fileQuota"] = strconv.Itoa(DefaultUploadFileQuota)
|
properties["fileQuota"] = strconv.Itoa(DefaultUploadFileQuota)
|
||||||
properties["renameQuota"] = strconv.Itoa(DefaultRenameQuota)
|
properties["renameQuota"] = strconv.Itoa(DefaultRenameQuota)
|
||||||
|
|
||||||
newUser = &auth.User{
|
newUser = &casdoorsdk.User{
|
||||||
Name: username,
|
Name: username,
|
||||||
CreatedTime: util.GetCurrentTime(),
|
CreatedTime: util.GetCurrentTime(),
|
||||||
UpdatedTime: util.GetCurrentTime(),
|
UpdatedTime: util.GetCurrentTime(),
|
||||||
|
@ -197,7 +197,7 @@ func AddMemberByNameAndEmailIfNotExist(username, email string) (*auth.User, erro
|
||||||
Properties: properties,
|
Properties: properties,
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = auth.AddUser(newUser)
|
_, err = casdoorsdk.AddUser(newUser)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return newUser, err
|
return newUser, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ package object
|
||||||
import (
|
import (
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Node struct {
|
type Node struct {
|
||||||
|
@ -279,7 +279,7 @@ func GetNodeModerators(id string) []string {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckNodeModerator(user *auth.User, nodeId string) bool {
|
func CheckNodeModerator(user *casdoorsdk.User, nodeId string) bool {
|
||||||
node := Node{Id: nodeId}
|
node := Node{Id: nodeId}
|
||||||
existed, err := adapter.Engine.Cols("moderators").Get(&node)
|
existed, err := adapter.Engine.Cols("moderators").Get(&node)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/astaxie/beego"
|
"github.com/astaxie/beego"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Reply struct {
|
type Reply struct {
|
||||||
|
@ -55,7 +55,7 @@ func GetReplyCount() int {
|
||||||
// @router /get-replies [get]
|
// @router /get-replies [get]
|
||||||
// @Description GetReplies returns more information about reply of a topic.
|
// @Description GetReplies returns more information about reply of a topic.
|
||||||
// @Tag Reply API
|
// @Tag Reply API
|
||||||
func GetReplies(topicId int, user *auth.User, limit int, page int) ([]*ReplyWithAvatar, int) {
|
func GetReplies(topicId int, user *casdoorsdk.User, limit int, page int) ([]*ReplyWithAvatar, int) {
|
||||||
replies := []*ReplyWithAvatar{}
|
replies := []*ReplyWithAvatar{}
|
||||||
realPage := page
|
realPage := page
|
||||||
err := adapter.Engine.Table("reply").
|
err := adapter.Engine.Table("reply").
|
||||||
|
@ -244,7 +244,7 @@ func GetReply(id int) *Reply {
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetReplyWithDetails returns more information about reply, including avatar, thanks status, deletable and editable.
|
// GetReplyWithDetails returns more information about reply, including avatar, thanks status, deletable and editable.
|
||||||
func GetReplyWithDetails(user *auth.User, id int) *ReplyWithAvatar {
|
func GetReplyWithDetails(user *casdoorsdk.User, id int) *ReplyWithAvatar {
|
||||||
reply := ReplyWithAvatar{}
|
reply := ReplyWithAvatar{}
|
||||||
existed, err := adapter.Engine.Table("reply").
|
existed, err := adapter.Engine.Table("reply").
|
||||||
Join("LEFT OUTER", "consumption_record", "consumption_record.object_id = reply.id and consumption_record.consumption_type = ?", 5).
|
Join("LEFT OUTER", "consumption_record", "consumption_record.object_id = reply.id and consumption_record.consumption_type = ?", 5).
|
||||||
|
@ -431,7 +431,7 @@ func GetReplyTopicTitle(id int) string {
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetReplyAuthor only returns reply's topic author.
|
// GetReplyAuthor only returns reply's topic author.
|
||||||
func GetReplyAuthor(id int) *auth.User {
|
func GetReplyAuthor(id int) *casdoorsdk.User {
|
||||||
reply := Reply{Id: id}
|
reply := Reply{Id: id}
|
||||||
existed, err := adapter.Engine.Cols("author").Get(&reply)
|
existed, err := adapter.Engine.Cols("author").Get(&reply)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/casbin/casnode/util"
|
"github.com/casbin/casnode/util"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
"github.com/gomarkdown/markdown"
|
"github.com/gomarkdown/markdown"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -225,7 +225,7 @@ func GetTopicsAdmin(usernameSearchKw, titleSearchKw, contentSearchKw, showDelete
|
||||||
return res, int(num)
|
return res, int(num)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetTopicWithAvatar(id int, user *auth.User) *TopicWithAvatar {
|
func GetTopicWithAvatar(id int, user *casdoorsdk.User) *TopicWithAvatar {
|
||||||
topic := TopicWithAvatar{}
|
topic := TopicWithAvatar{}
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
|
@ -333,7 +333,7 @@ func GetTopicTitle(id int) string {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetTopicAuthor(id int) *auth.User {
|
func GetTopicAuthor(id int) *casdoorsdk.User {
|
||||||
topic := Topic{Id: id}
|
topic := Topic{Id: id}
|
||||||
existed, err := adapter.Engine.Cols("author").Get(&topic)
|
existed, err := adapter.Engine.Cols("author").Get(&topic)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -681,7 +681,7 @@ func GetSortedTopics(lastReplySort, hotSort, favCountSort, createdTimeSort strin
|
||||||
return getAvataredTopics(topics)
|
return getAvataredTopics(topics)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetTopicEditableStatus(user *auth.User, author, nodeId, createdTime string) bool {
|
func GetTopicEditableStatus(user *casdoorsdk.User, author, nodeId, createdTime string) bool {
|
||||||
if CheckIsAdmin(user) || CheckNodeModerator(user, nodeId) {
|
if CheckIsAdmin(user) || CheckNodeModerator(user, nodeId) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
package object
|
package object
|
||||||
|
|
||||||
import "github.com/casdoor/casdoor-go-sdk/auth"
|
import "github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
|
|
||||||
type LatestReply struct {
|
type LatestReply struct {
|
||||||
TopicId int `xorm:"id" json:"topicId"`
|
TopicId int `xorm:"id" json:"topicId"`
|
||||||
|
@ -112,7 +112,7 @@ type AdminTabInfo struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type AdminMemberInfo struct {
|
type AdminMemberInfo struct {
|
||||||
auth.User
|
casdoorsdk.User
|
||||||
FileQuota int `json:"fileQuota"`
|
FileQuota int `json:"fileQuota"`
|
||||||
FileUploadNum int `json:"fileUploadNum"`
|
FileUploadNum int `json:"fileUploadNum"`
|
||||||
Status int `json:"status"`
|
Status int `json:"status"`
|
||||||
|
|
|
@ -18,14 +18,14 @@ import (
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/astaxie/beego"
|
"github.com/astaxie/beego"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetUserField(user *auth.User, field string) string {
|
func GetUserField(user *casdoorsdk.User, field string) string {
|
||||||
return user.Properties[field]
|
return user.Properties[field]
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetUserFieldInt(user *auth.User, field string) int {
|
func GetUserFieldInt(user *casdoorsdk.User, field string) int {
|
||||||
res, err := strconv.Atoi(user.Properties[field])
|
res, err := strconv.Atoi(user.Properties[field])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
|
@ -34,11 +34,11 @@ func GetUserFieldInt(user *auth.User, field string) int {
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
func SetUserField(user *auth.User, field string, value string) {
|
func SetUserField(user *casdoorsdk.User, field string, value string) {
|
||||||
user.Properties[field] = value
|
user.Properties[field] = value
|
||||||
}
|
}
|
||||||
|
|
||||||
func SetUserFieldInt(user *auth.User, field string, value int) {
|
func SetUserFieldInt(user *casdoorsdk.User, field string, value int) {
|
||||||
user.Properties[field] = strconv.Itoa(value)
|
user.Properties[field] = strconv.Itoa(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ package routers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/astaxie/beego/context"
|
"github.com/astaxie/beego/context"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
func AutoSigninFilter(ctx *context.Context) {
|
func AutoSigninFilter(ctx *context.Context) {
|
||||||
|
@ -33,7 +33,7 @@ func AutoSigninFilter(ctx *context.Context) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if accessToken != "" {
|
if accessToken != "" {
|
||||||
claims, err := auth.ParseJwtToken(accessToken)
|
claims, err := casdoorsdk.ParseJwtToken(accessToken)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
responseError(ctx, "invalid JWT token")
|
responseError(ctx, "invalid JWT token")
|
||||||
return
|
return
|
||||||
|
|
|
@ -16,7 +16,7 @@ package routers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/astaxie/beego/context"
|
"github.com/astaxie/beego/context"
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Response struct {
|
type Response struct {
|
||||||
|
@ -42,17 +42,17 @@ func responseError(ctx *context.Context, error string, data ...interface{}) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func getSessionClaims(ctx *context.Context) *auth.Claims {
|
func getSessionClaims(ctx *context.Context) *casdoorsdk.Claims {
|
||||||
s := ctx.Input.CruSession.Get("user")
|
s := ctx.Input.CruSession.Get("user")
|
||||||
if s == nil {
|
if s == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
claims := s.(auth.Claims)
|
claims := s.(casdoorsdk.Claims)
|
||||||
return &claims
|
return &claims
|
||||||
}
|
}
|
||||||
|
|
||||||
func setSessionClaims(ctx *context.Context, claims *auth.Claims) {
|
func setSessionClaims(ctx *context.Context, claims *casdoorsdk.Claims) {
|
||||||
if claims == nil {
|
if claims == nil {
|
||||||
err := ctx.Input.CruSession.Delete("user")
|
err := ctx.Input.CruSession.Delete("user")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -18,7 +18,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SendRemindMail sends mail with remind information.
|
// SendRemindMail sends mail with remind information.
|
||||||
|
@ -36,7 +36,7 @@ You are receiving this because you are subscribed to this thread.
|
||||||
}
|
}
|
||||||
|
|
||||||
func SendEmail(title string, content string, sender string, receivers ...string) error {
|
func SendEmail(title string, content string, sender string, receivers ...string) error {
|
||||||
err := auth.SendEmail(title, content, sender, receivers...)
|
err := casdoorsdk.SendEmail(title, content, sender, receivers...)
|
||||||
if err != nil && strings.HasPrefix(err.Error(), "No provider for category: \"Email\" is found") {
|
if err != nil && strings.HasPrefix(err.Error(), "No provider for category: \"Email\" is found") {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,12 +17,12 @@ package service
|
||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor-go-sdk/auth"
|
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
// UploadFileToStorage uploads a file to the path, returns public URL
|
// UploadFileToStorage uploads a file to the path, returns public URL
|
||||||
func UploadFileToStorage(user string, tag string, parent string, fullFilePath string, fileBytes []byte) (string, error) {
|
func UploadFileToStorage(user string, tag string, parent string, fullFilePath string, fileBytes []byte) (string, error) {
|
||||||
fileUrl, _, err := auth.UploadResource(user, tag, parent, fullFilePath, fileBytes)
|
fileUrl, _, err := casdoorsdk.UploadResource(user, tag, parent, fullFilePath, fileBytes)
|
||||||
return fileUrl, err
|
return fileUrl, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ func UploadFileToStorageSafe(user string, tag string, parent string, fullFilePat
|
||||||
var err error
|
var err error
|
||||||
times := 0
|
times := 0
|
||||||
for {
|
for {
|
||||||
fileUrl, _, err = auth.UploadResourceEx(user, tag, parent, fullFilePath, fileBytes, createdTime, description)
|
fileUrl, _, err = casdoorsdk.UploadResourceEx(user, tag, parent, fullFilePath, fileBytes, createdTime, description)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
times += 1
|
times += 1
|
||||||
time.Sleep(3 * time.Second)
|
time.Sleep(3 * time.Second)
|
||||||
|
@ -47,7 +47,7 @@ func UploadFileToStorageSafe(user string, tag string, parent string, fullFilePat
|
||||||
|
|
||||||
// DeleteFileFromStorage deletes file according to the file path.
|
// DeleteFileFromStorage deletes file according to the file path.
|
||||||
func DeleteFileFromStorage(filePath string) bool {
|
func DeleteFileFromStorage(filePath string) bool {
|
||||||
affected, err := auth.DeleteResource(filePath)
|
affected, err := casdoorsdk.DeleteResource(filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue