Remove /get-default-providers API.

This commit is contained in:
Yang Luo
2021-05-14 16:07:39 +08:00
parent 9346587ca6
commit db5ecddd3f
5 changed files with 1 additions and 46 deletions

View File

@ -32,18 +32,6 @@ func (c *ApiController) GetProviders() {
c.ServeJSON() 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 // @Title GetProvider
// @Description get provider // @Description get provider
// @Param id query string true "The id of the provider" // @Param id query string true "The id of the provider"

View File

@ -15,8 +15,6 @@
package object package object
import ( import (
"strings"
"github.com/casdoor/casdoor/util" "github.com/casdoor/casdoor/util"
"xorm.io/core" "xorm.io/core"
) )
@ -43,17 +41,6 @@ func GetProviders(owner string) []*Provider {
return providers 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 { func getProvider(owner string, name string) *Provider {
provider := Provider{Owner: owner, Name: name} provider := Provider{Owner: owner, Name: name}
existed, err := adapter.Engine.Get(&provider) existed, err := adapter.Engine.Get(&provider)

View File

@ -64,7 +64,6 @@ func initAPI() {
beego.Router("/api/reset-email-or-phone", &controllers.ApiController{}, "POST:ResetEmailOrPhone") beego.Router("/api/reset-email-or-phone", &controllers.ApiController{}, "POST:ResetEmailOrPhone")
beego.Router("/api/get-providers", &controllers.ApiController{}, "GET:GetProviders") 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/get-provider", &controllers.ApiController{}, "GET:GetProvider")
beego.Router("/api/update-provider", &controllers.ApiController{}, "POST:UpdateProvider") beego.Router("/api/update-provider", &controllers.ApiController{}, "POST:UpdateProvider")
beego.Router("/api/add-provider", &controllers.ApiController{}, "POST:AddProvider") beego.Router("/api/add-provider", &controllers.ApiController{}, "POST:AddProvider")

View File

@ -22,7 +22,6 @@ import i18next from "i18next";
import CropperDiv from "./CropperDiv.js"; import CropperDiv from "./CropperDiv.js";
import * as AuthBackend from "./auth/AuthBackend"; import * as AuthBackend from "./auth/AuthBackend";
import * as ApplicationBackend from "./backend/ApplicationBackend"; import * as ApplicationBackend from "./backend/ApplicationBackend";
import * as ProviderBackend from "./backend/ProviderBackend";
import * as Provider from "./auth/Provider"; import * as Provider from "./auth/Provider";
import PasswordModal from "./PasswordModal"; import PasswordModal from "./PasswordModal";
import ResetModal from "./ResetModal"; import ResetModal from "./ResetModal";
@ -39,7 +38,6 @@ class UserEditPage extends React.Component {
user: null, user: null,
application: null, application: null,
organizations: [], organizations: [],
providers: [],
}; };
} }
@ -47,7 +45,6 @@ class UserEditPage extends React.Component {
this.getUser(); this.getUser();
this.getOrganizations(); this.getOrganizations();
this.getDefaultApplication(); this.getDefaultApplication();
this.getDefaultProviders();
} }
getUser() { getUser() {
@ -77,15 +74,6 @@ class UserEditPage extends React.Component {
}); });
} }
getDefaultProviders() {
ProviderBackend.getDefaultProviders("admin")
.then((res) => {
this.setState({
providers: res,
});
});
}
parseUserField(key, value) { parseUserField(key, value) {
// if ([].includes(key)) { // if ([].includes(key)) {
// value = Setting.myParseInt(value); // value = Setting.myParseInt(value);
@ -316,7 +304,7 @@ class UserEditPage extends React.Component {
<Col span={22} > <Col span={22} >
<div style={{marginBottom: 20}}> <div style={{marginBottom: 20}}>
{ {
this.state.providers.filter(provider => Setting.isProviderVisible(provider)).map((provider, index) => this.renderIdp(provider)) this.state.application?.providerObjs.filter(provider => Setting.isProviderVisible(provider)).map((provider, index) => this.renderIdp(provider))
} }
</div> </div>
</Col> </Col>

View File

@ -21,13 +21,6 @@ export function getProviders(owner) {
}).then(res => res.json()); }).then(res => res.json());
} }
export function getDefaultProviders(owner) {
return fetch(`${Setting.ServerUrl}/api/get-default-providers?owner=${owner}`, {
method: "GET",
credentials: "include"
}).then(res => res.json());
}
export function getProvider(owner, name) { export function getProvider(owner, name) {
return fetch(`${Setting.ServerUrl}/api/get-provider?id=${owner}/${encodeURIComponent(name)}`, { return fetch(`${Setting.ServerUrl}/api/get-provider?id=${owner}/${encodeURIComponent(name)}`, {
method: "GET", method: "GET",