mirror of
https://github.com/casdoor/casdoor.git
synced 2025-07-15 06:23:51 +08:00
Rename getStateFromQueryParams() and getQueryParamsFromState()
This commit is contained in:
@ -35,7 +35,7 @@ class AuthCallback extends React.Component {
|
|||||||
// realRedirectUrl = "http://localhost:9000"
|
// realRedirectUrl = "http://localhost:9000"
|
||||||
const params = new URLSearchParams(this.props.location.search);
|
const params = new URLSearchParams(this.props.location.search);
|
||||||
const state = params.get("state");
|
const state = params.get("state");
|
||||||
const queryString = Util.stateToGetQueryParams(state);
|
const queryString = Util.getQueryParamsFromState(state);
|
||||||
return new URLSearchParams(queryString);
|
return new URLSearchParams(queryString);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -177,7 +177,7 @@ export function getAuthUrl(application, provider, method) {
|
|||||||
let endpoint = authInfo[provider.type].endpoint;
|
let endpoint = authInfo[provider.type].endpoint;
|
||||||
const redirectUri = `${window.location.origin}/callback`;
|
const redirectUri = `${window.location.origin}/callback`;
|
||||||
const scope = authInfo[provider.type].scope;
|
const scope = authInfo[provider.type].scope;
|
||||||
const state = Util.getQueryParamsToState(application.name, provider.name, method);
|
const state = Util.getStateFromQueryParams(application.name, provider.name, method);
|
||||||
|
|
||||||
if (provider.type === "Google") {
|
if (provider.type === "Google") {
|
||||||
return `${endpoint}?client_id=${provider.clientId}&redirect_uri=${redirectUri}&scope=${scope}&response_type=code&state=${state}`;
|
return `${endpoint}?client_id=${provider.clientId}&redirect_uri=${redirectUri}&scope=${scope}&response_type=code&state=${state}`;
|
||||||
|
@ -126,7 +126,7 @@ export function getOAuthGetParameters(params) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getQueryParamsToState(applicationName, providerName, method) {
|
export function getStateFromQueryParams(applicationName, providerName, method) {
|
||||||
let query = window.location.search;
|
let query = window.location.search;
|
||||||
query = `${query}&application=${applicationName}&provider=${providerName}&method=${method}`;
|
query = `${query}&application=${applicationName}&provider=${providerName}&method=${method}`;
|
||||||
if (method === "link") {
|
if (method === "link") {
|
||||||
@ -135,6 +135,6 @@ export function getQueryParamsToState(applicationName, providerName, method) {
|
|||||||
return btoa(query);
|
return btoa(query);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function stateToGetQueryParams(state) {
|
export function getQueryParamsFromState(state) {
|
||||||
return atob(state);
|
return atob(state);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user