diff --git a/controllers/provider.go b/controllers/provider.go index ff820587..2acb4e4c 100644 --- a/controllers/provider.go +++ b/controllers/provider.go @@ -32,18 +32,6 @@ func (c *ApiController) GetProviders() { c.ServeJSON() } -// @Title GetDefaultProviders -// @Description get default providers -// @Param owner query string true "The owner of providers" -// @Success 200 {array} object.Provider The Response object -// @router /get-default-providers [get] -func (c *ApiController) GetDefaultProviders() { - owner := c.Input().Get("owner") - - c.Data["json"] = object.GetDefaultProviders(owner) - c.ServeJSON() -} - // @Title GetProvider // @Description get provider // @Param id query string true "The id of the provider" diff --git a/object/provider.go b/object/provider.go index 8baae9d3..21c3876f 100644 --- a/object/provider.go +++ b/object/provider.go @@ -15,8 +15,6 @@ package object import ( - "strings" - "github.com/casdoor/casdoor/util" "xorm.io/core" ) @@ -43,17 +41,6 @@ func GetProviders(owner string) []*Provider { return providers } -func GetDefaultProviders(owner string) []*Provider { - providers := GetProviders(owner) - res := []*Provider{} - for _, provider := range providers { - if strings.Contains(provider.Name, "casdoor") { - res = append(res, provider) - } - } - return res -} - func getProvider(owner string, name string) *Provider { provider := Provider{Owner: owner, Name: name} existed, err := adapter.Engine.Get(&provider) diff --git a/routers/router.go b/routers/router.go index a68be07d..359aac4f 100644 --- a/routers/router.go +++ b/routers/router.go @@ -64,7 +64,6 @@ func initAPI() { beego.Router("/api/reset-email-or-phone", &controllers.ApiController{}, "POST:ResetEmailOrPhone") beego.Router("/api/get-providers", &controllers.ApiController{}, "GET:GetProviders") - beego.Router("/api/get-default-providers", &controllers.ApiController{}, "GET:GetDefaultProviders") beego.Router("/api/get-provider", &controllers.ApiController{}, "GET:GetProvider") beego.Router("/api/update-provider", &controllers.ApiController{}, "POST:UpdateProvider") beego.Router("/api/add-provider", &controllers.ApiController{}, "POST:AddProvider") diff --git a/web/src/UserEditPage.js b/web/src/UserEditPage.js index 05290a8a..8dca66a6 100644 --- a/web/src/UserEditPage.js +++ b/web/src/UserEditPage.js @@ -22,7 +22,6 @@ import i18next from "i18next"; import CropperDiv from "./CropperDiv.js"; import * as AuthBackend from "./auth/AuthBackend"; import * as ApplicationBackend from "./backend/ApplicationBackend"; -import * as ProviderBackend from "./backend/ProviderBackend"; import * as Provider from "./auth/Provider"; import PasswordModal from "./PasswordModal"; import ResetModal from "./ResetModal"; @@ -39,7 +38,6 @@ class UserEditPage extends React.Component { user: null, application: null, organizations: [], - providers: [], }; } @@ -47,7 +45,6 @@ class UserEditPage extends React.Component { this.getUser(); this.getOrganizations(); this.getDefaultApplication(); - this.getDefaultProviders(); } getUser() { @@ -77,15 +74,6 @@ class UserEditPage extends React.Component { }); } - getDefaultProviders() { - ProviderBackend.getDefaultProviders("admin") - .then((res) => { - this.setState({ - providers: res, - }); - }); - } - parseUserField(key, value) { // if ([].includes(key)) { // value = Setting.myParseInt(value); @@ -316,7 +304,7 @@ class UserEditPage extends React.Component {