diff --git a/object/init.go b/object/init.go index 07fb320e..4cef263e 100644 --- a/object/init.go +++ b/object/init.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/astaxie/beego" + "github.com/casdoor/casdoor/conf" "github.com/casdoor/casdoor/util" "github.com/duo-labs/webauthn/webauthn" ) @@ -39,8 +39,6 @@ func InitDb() { initWebAuthn() } -var staticBaseUrl = beego.AppConfig.String("staticBaseUrl") - func initBuiltInOrganization() bool { organization := getOrganization("admin", "built-in") if organization != nil { @@ -53,10 +51,10 @@ func initBuiltInOrganization() bool { CreatedTime: util.GetCurrentTime(), DisplayName: "Built-in Organization", WebsiteUrl: "https://example.com", - Favicon: fmt.Sprintf("%s/img/casbin/favicon.ico", staticBaseUrl), + Favicon: fmt.Sprintf("%s/img/casbin/favicon.ico", conf.GetConfigString("staticBaseUrl")), PasswordType: "plain", PhonePrefix: "86", - DefaultAvatar: fmt.Sprintf("%s/img/casbin.svg", staticBaseUrl), + DefaultAvatar: fmt.Sprintf("%s/img/casbin.svg", conf.GetConfigString("staticBaseUrl")), Tags: []string{}, AccountItems: []*AccountItem{ {Name: "Organization", Visible: true, ViewRule: "Public", ModifyRule: "Admin"}, @@ -106,7 +104,7 @@ func initBuiltInUser() { Type: "normal-user", Password: "123", DisplayName: "Admin", - Avatar: fmt.Sprintf("%s/img/casbin.svg", staticBaseUrl), + Avatar: fmt.Sprintf("%s/img/casbin.svg", conf.GetConfigString("staticBaseUrl")), Email: "admin@example.com", Phone: "12345678910", Address: []string{}, @@ -136,7 +134,7 @@ func initBuiltInApplication() { Name: "app-built-in", CreatedTime: util.GetCurrentTime(), DisplayName: "Casdoor", - Logo: fmt.Sprintf("%s/img/casdoor-logo_1185x256.png", staticBaseUrl), + Logo: fmt.Sprintf("%s/img/casdoor-logo_1185x256.png", conf.GetConfigString("staticBaseUrl")), HomepageUrl: "https://casdoor.org", Organization: "built-in", Cert: "cert-built-in", diff --git a/object/saml_idp.go b/object/saml_idp.go index 8e38b9b7..4bcae664 100644 --- a/object/saml_idp.go +++ b/object/saml_idp.go @@ -28,8 +28,8 @@ import ( "time" "github.com/RobotsAndPencils/go-saml" - "github.com/astaxie/beego" "github.com/beevik/etree" + "github.com/casdoor/casdoor/conf" "github.com/golang-jwt/jwt/v4" dsig "github.com/russellhaering/goxmldsig" uuid "github.com/satori/go.uuid" @@ -181,7 +181,7 @@ func GetSamlMeta(application *Application, host string) (*IdpEntityDescriptor, e block, _ := pem.Decode([]byte(cert.Certificate)) certificate := base64.StdEncoding.EncodeToString(block.Bytes) - origin := beego.AppConfig.String("origin") + origin := conf.GetConfigString("origin") originFrontend, originBackend := getOriginFromHost(host) if origin != "" { originBackend = origin diff --git a/object/user_webauthn.go b/object/user_webauthn.go index 7ddf9126..8f3a4f97 100644 --- a/object/user_webauthn.go +++ b/object/user_webauthn.go @@ -19,7 +19,7 @@ import ( "net/url" "strings" - "github.com/astaxie/beego" + "github.com/casdoor/casdoor/conf" "github.com/duo-labs/webauthn/protocol" "github.com/duo-labs/webauthn/webauthn" ) @@ -27,7 +27,7 @@ import ( func GetWebAuthnObject(host string) *webauthn.WebAuthn { var err error - origin := beego.AppConfig.String("origin") + origin := conf.GetConfigString("origin") if origin == "" { _, origin = getOriginFromHost(host) } @@ -38,7 +38,7 @@ func GetWebAuthnObject(host string) *webauthn.WebAuthn { } webAuthn, err := webauthn.New(&webauthn.Config{ - RPDisplayName: beego.AppConfig.String("appname"), // Display Name for your site + RPDisplayName: conf.GetConfigString("appname"), // Display Name for your site RPID: strings.Split(localUrl.Host, ":")[0], // Generally the domain name for your site, it's ok because splits cannot return empty array RPOrigin: origin, // The origin URL for WebAuthn requests // RPIcon: "https://duo.com/logo.png", // Optional icon URL for your site diff --git a/routers/static_filter.go b/routers/static_filter.go index 7c1ad5c5..0f787fe9 100644 --- a/routers/static_filter.go +++ b/routers/static_filter.go @@ -19,14 +19,14 @@ import ( "os" "strings" - "github.com/astaxie/beego" "github.com/astaxie/beego/context" + "github.com/casdoor/casdoor/conf" "github.com/casdoor/casdoor/util" ) var ( oldStaticBaseUrl = "https://cdn.casbin.org" - newStaticBaseUrl = beego.AppConfig.String("staticBaseUrl") + newStaticBaseUrl = conf.GetConfigString("staticBaseUrl") ) func StaticFilter(ctx *context.Context) {