llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-04 21:30:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: forget password and sign up router (#1227)

Browse Source 
* fix: forget password and sign up router

* fix: link

* fix: jump logic

* fix: signup link

* fix: signup link

* fix: login and signup router

* remove comments

* fix: normal router

* fix: link abstraction

* rename jump component

* fix: session storage

* fix: store signin url

* fix: jumplink props

* fix: simplify link

* fix: path join

* fix: remove unused functions
This commit is contained in:
Chell
2022-10-22 17:17:50 +02:00
committed by GitHub
parent b0f572c51a
commit 304643736b
4 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
web/src/Setting.js
View File

@ -22,6 +22,8 @@ import copy from "copy-to-clipboard";
import {authConfig} from "./auth/Auth";
import {Helmet} from "react-helmet";
import * as Conf from "./Conf";
import {Link} from "react-router-dom";
import * as path from "path-browserify";
export const ServerUrl = "";
@ -752,49 +754,64 @@ export function goToLogin(ths, application) {
goToLinkSoft(ths, "/login");
} else {
if (application.signinUrl === "") {
goToLink(`${application.homepageUrl}/login`);
goToLink(path.join(application.homepageUrl, "login"));
} else {
goToLink(application.signinUrl);
}
}
}
export function goToSignup(ths, application) {
if (application === null) {
return;
function JumpLink({url, children, onClick}) {
if (url === null) {
return <Link style={{float: "right"}} onClick={onClick} to={""}>{children}</Link>;
}
if (!application.enablePassword && window.location.pathname.includes("/login/oauth/authorize")) {
const link = window.location.href.replace("/login/oauth/authorize", "/auto-signup/oauth/authorize");
goToLink(link);
return;
}
if (authConfig.appName === application.name) {
goToLinkSoft(ths, "/signup");
if (url.startsWith("/")) {
return <Link to={url} style={{float: "right"}} onClick={onClick}>{children}</Link>;
} else if (url.startsWith("http")) {
return <a href={url} target="_blank" rel="noopener noreferrer" style={{float: "right"}} onClick={onClick}>{children}</a>;
} else {
if (application.signupUrl === "") {
goToLinkSoft(ths, `/signup/${application.name}`);
} else {
goToLink(application.signupUrl);
}
return <Link style={{float: "right"}} onClick={onClick} to={""}>{children}</Link>;
}
}
export function goToForget(ths, application) {
if (application === null) {
return;
}
function storeSigninUrl() {
sessionStorage.setItem("signinUrl", window.location.href);
}
if (authConfig.appName === application.name) {
goToLinkSoft(ths, "/forget");
export function renderSignupLink(application, text) {
let link;
if (application === null) {
link = null;
} else if (!application.enablePassword && window.location.pathname.includes("/login/oauth/authorize")) {
link = window.location.href.replace("/login/oauth/authorize", "/auto-signup/oauth/authorize");
} else if (authConfig.appName === application.name) {
link = "/signup";
} else {
if (application.forgetUrl === "") {
goToLinkSoft(ths, `/forget/${application.name}`);
if (application.signupUrl === "") {
link = `/signup/${application.name}`;
} else {
goToLink(application.forgetUrl);
link = application.signupUrl;
}
}
return <JumpLink url={link} onClick={storeSigninUrl}>{text}</JumpLink>;
}
export function renderForgetLink(application, text) {
let link;
if (application === null) {
link = null;
} else if (authConfig.appName === application.name) {
link = "/forget";
} else {
if (application.forgetUrl === "") {
link = `/forget/${application.name}`;
} else {
link = application.forgetUrl;
}
}
return <JumpLink url={link}>{text}</JumpLink>;
}
export function renderHelmet(application) {