Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Use SessionStorage for handling redirect after login/register#532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletionsclient/packages/lowcoder/src/appView/AppViewInstance.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { AppView } from "./AppView";
import { API_STATUS_CODES } from "constants/apiConstants";
import { AUTH_LOGIN_URL } from "constants/routesURL";
import { AuthSearchParams } from "constants/authConstants";
import { saveAuthSearchParams } from "@lowcoder-ee/pages/userAuth/authUtils";

export type OutputChangeHandler<O> = (output: O) => void;
export type EventTriggerHandler = (eventName: string) => void;
Expand DownExpand Up@@ -71,9 +72,11 @@ export class AppViewInstance<I = any, O = any> {
.then((i) => i.data)
.catch((e) => {
if (e.response?.status === API_STATUS_CODES.REQUEST_NOT_AUTHORISED) {
window.location.href = `${webUrl}${AUTH_LOGIN_URL}?${
AuthSearchParams.redirectUrl
}=${encodeURIComponent(window.location.href)}`;
saveAuthSearchParams({
[AuthSearchParams.redirectUrl]: encodeURIComponent(window.location.href),
[AuthSearchParams.loginType]: null,
})
window.location.href = `${webUrl}${AUTH_LOGIN_URL}`;
}
});

Expand Down
11 changes: 8 additions & 3 deletionsclient/packages/lowcoder/src/constants/authConstants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,14 @@ import {
export type AuthInviteInfo = InviteInfo & { invitationId: string };
export type AuthLocationState = { inviteInfo?: AuthInviteInfo; thirdPartyAuthError?: boolean };

export const AuthSearchParams = {
loginType: "loginType",
redirectUrl: "redirectUrl",
export enum AuthSearchParams {
loginType = "loginType",
redirectUrl = "redirectUrl",
};

export type AuthSearchParamsType = {
loginType: string | null,
redirectUrl: string | null,
};

export type OauthRequestParam = {
Expand Down
1 change: 0 additions & 1 deletionclient/packages/lowcoder/src/constants/routesURL.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,6 @@ export const QR_CODE_OAUTH_URL = `${USER_AUTH_URL}/oauth/qrcode`;
export const OAUTH_REDIRECT = `${USER_AUTH_URL}/oauth/redirect`;
export const CAS_AUTH_REDIRECT = `${USER_AUTH_URL}/cas/redirect`;
export const LDAP_AUTH_LOGIN_URL = `${USER_AUTH_URL}/ldap/login`;
export const USER_INFO_COMPLETION = `${USER_AUTH_URL}/completion`;
export const INVITE_LANDING_URL = "/invite/:invitationId";
export const ORG_AUTH_LOGIN_URL = `/org/:orgId/auth/login`;
export const ORG_AUTH_REGISTER_URL = `/org/:orgId/auth/register`;
Expand Down
27 changes: 20 additions & 7 deletionsclient/packages/lowcoder/src/pages/userAuth/authUtils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@ import {
BASE_URL,
CAS_AUTH_REDIRECT,
OAUTH_REDIRECT,
USER_INFO_COMPLETION,
} from "constants/routesURL";
import { AxiosPromise, AxiosResponse } from "axios";
import { ApiResponse } from "api/apiResponses";
Expand All@@ -16,6 +15,7 @@ import { createContext, useState } from "react";
import { SystemConfig } from "constants/configConstants";
import {
AuthInviteInfo,
AuthSearchParamsType,
AuthSessionStoreParams,
ThirdPartyAuthGoal,
ThirdPartyAuthType,
Expand DownExpand Up@@ -79,12 +79,7 @@ export function authRespValidate(
) {
let replaceUrl = redirectUrl || BASE_URL;
const baseUrl = `${window.location.protocol}//${window.location.host}`;
if (infoCompleteCheck) {
// need complete info
replaceUrl = redirectUrl
? `${USER_INFO_COMPLETION}?redirectUrl=${redirectUrl}`
: USER_INFO_COMPLETION;
}

if (doValidResponse(resp)) {
onAuthSuccess?.();
history.replace(replaceUrl.replace(baseUrl, ''));
Expand DownExpand Up@@ -185,3 +180,21 @@ export const getRedirectUrl = (authType: ThirdPartyAuthType) => {
`${window.location.origin}${authType === "CAS" ? CAS_AUTH_REDIRECT : OAUTH_REDIRECT}`
);
};

const AuthSearchParamStorageKey = "_temp_auth_search_params_";

export const saveAuthSearchParams = (
authSearchParams: AuthSearchParamsType
) => {
sessionStorage.setItem(AuthSearchParamStorageKey, JSON.stringify(authSearchParams));
}

export const loadAuthSearchParams = ():AuthSearchParamsType | null => {
const authParams = sessionStorage.getItem(AuthSearchParamStorageKey);
if (!authParams) return null;
return JSON.parse(authParams);
}

export const clearAuthSearchParams = () => {
sessionStorage.removeItem(AuthSearchParamStorageKey);
}
3 changes: 2 additions & 1 deletionclient/packages/lowcoder/src/pages/userAuth/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { Redirect, Route, Switch, useLocation, useParams } from "react-router-do
import React, { useEffect, useMemo } from "react";
import { useSelector, useDispatch } from "react-redux";
import { selectSystemConfig } from "redux/selectors/configSelectors";
import { AuthContext } from "pages/userAuth/authUtils";
import { AuthContext, clearAuthSearchParams } from "pages/userAuth/authUtils";
import { AuthRoutes } from "@lowcoder-ee/constants/authConstants";
import { AuthLocationState } from "constants/authConstants";
import { ProductLoading } from "components/ProductLoading";
Expand DownExpand Up@@ -37,6 +37,7 @@ export default function UserAuth() {

const fetchUserAfterAuthSuccess = () => {
dispatch(fetchUserAction());
clearAuthSearchParams();
}

return (
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ export abstract class AbstractAuthenticator {
authRespValidate(
resp,
this.needInfoCheck(this.authParams.sourceType),
this.authParams.afterLoginRedirect,
getSafeAuthRedirectURL(this.authParams.afterLoginRedirect),
onAuthSuccess,
);
})
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
import {
AuthSearchParams,
OAuthLocationState,
ThirdPartyAuthGoal,
ThirdPartyConfigType,
} from "constants/authConstants";
import { CommonGrayLabel, WhiteLoading } from "lowcoder-design";
import { useLocation } from "react-router-dom";
import { WhiteLoading } from "lowcoder-design";
import history from "util/history";
import { LoginLogoStyle, LoginLabelStyle, StyledLoginButton } from "pages/userAuth/authComponents";
import { useSelector } from "react-redux";
Expand All@@ -16,6 +14,7 @@ import styled from "styled-components";
import { trans } from "i18n";
import { geneAuthStateAndSaveParam, getAuthUrl, getRedirectUrl } from "pages/userAuth/authUtils";
import { Divider } from "antd";
import { useRedirectUrl } from "util/hooks";

const ThirdPartyLoginButtonWrapper = styled.div`
button{
Expand All@@ -36,9 +35,7 @@ function ThirdPartyLoginButton(props: {
label: string;
}) {
const { config, label } = props;
const location = useLocation();
const queryParams = new URLSearchParams(location.search);
const loginRedirectUrl = queryParams.get(AuthSearchParams.redirectUrl);
const loginRedirectUrl = useRedirectUrl();
const redirectUrl = getRedirectUrl(config.authType);
const onLoginClick = () => {
const state = geneAuthStateAndSaveParam(
Expand Down
11 changes: 6 additions & 5 deletionsclient/packages/lowcoder/src/redux/sagas/userSagas.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import { defaultUser } from "constants/userConstants";
import { messageInstance } from "lowcoder-design";

import { AuthSearchParams } from "constants/authConstants";
import { saveAuthSearchParams } from "pages/userAuth/authUtils";

function validResponseData(response: AxiosResponse<ApiResponse>) {
return response && response.data && response.data.data;
Expand DownExpand Up@@ -132,14 +133,14 @@ export function* logoutSaga(action: LogoutActionType) {
try {
let redirectURL = AUTH_LOGIN_URL;
if (action.payload.notAuthorised) {
const currentUrl = window.location.href;
redirectURL = `${AUTH_LOGIN_URL}?redirectUrl=${encodeURIComponent(currentUrl)}`;
const currentUrl = window.location.href
const urlObj = new URL(currentUrl);
// Add loginType param for auto login jump
const loginType = urlObj.searchParams.get(AuthSearchParams.loginType);
if (loginType) {
redirectURL = redirectURL + `&${AuthSearchParams.loginType}=${loginType}`;
}
saveAuthSearchParams({
[AuthSearchParams.redirectUrl]: encodeURIComponent(currentUrl),
[AuthSearchParams.loginType]: loginType
});
}
let isValidResponse = true;
if (!action.payload.notAuthorised) {
Expand Down
7 changes: 4 additions & 3 deletionsclient/packages/lowcoder/src/util/hooks.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import { checkIsMobile } from "util/commonUtils";
import { EditorContext } from "comps/editorState";
import { getDataSourceStructures } from "redux/selectors/datasourceSelectors";
import { DatasourceStructure } from "api/datasourceApi";
import { loadAuthSearchParams } from "pages/userAuth/authUtils";

export const ForceViewModeContext = React.createContext<boolean>(false);

Expand DownExpand Up@@ -59,9 +60,9 @@ export function useApplicationId() {
}

export function useRedirectUrl() {
constlocation =useLocation();
constqueryParams =new URLSearchParams(location.search);
returnqueryParams.get(AuthSearchParams.redirectUrl);
constauthSearchParams =loadAuthSearchParams()
constredirectUrl =authSearchParams && authSearchParams.redirectUrl
returnredirectUrl && decodeURIComponent(redirectUrl);
}

export function useFixedDelay(callback: () => Promise<unknown>, delay: number | null) {
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp