Web: Registration form added.
This commit is contained in:
parent
80645ee784
commit
1125472aad
@ -1,4 +1,5 @@
|
||||
{
|
||||
"AccountWillBeCreated": "A DocSpace account will be created for <1>{{email}}</1>. Please, complete your registration:",
|
||||
"ChangePasswordSuccess": "Password has been successfully changed",
|
||||
"ConfirmOwnerPortalSuccessMessage": "DocSpace owner has been successfully changed. You will be redirected in 10 seconds.",
|
||||
"ConfirmOwnerPortalTitle": "Please confirm you want to change the DocSpace owner to {{newOwner}}.",
|
||||
|
||||
@ -127,4 +127,25 @@ export const RegisterContainer = styled.div`
|
||||
margin-top: 24px;
|
||||
text-align: center;
|
||||
}
|
||||
.greeting-container{
|
||||
margin-bottom: 32px;
|
||||
p{
|
||||
text-align: center;
|
||||
}
|
||||
.sign-in-container {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
position: relative;
|
||||
|
||||
margin-bottom: 16px;
|
||||
p:first-child {
|
||||
position: absolute;
|
||||
max-width: 60px;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}`;
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
import SsoReactSvgUrl from "PUBLIC_DIR/images/sso.react.svg?url";
|
||||
import DefaultUserPhoto from "PUBLIC_DIR/images/default_user_photo_size_82-82.png";
|
||||
|
||||
import React, { useEffect, useState, useCallback } from "react";
|
||||
import { withTranslation, Trans } from "react-i18next";
|
||||
import { inject, observer } from "mobx-react";
|
||||
import { isMobile } from "react-device-detect";
|
||||
import { useSearchParams } from "react-router-dom";
|
||||
import { Avatar } from "@docspace/shared/components/avatar";
|
||||
import { Button } from "@docspace/shared/components/button";
|
||||
import { TextInput } from "@docspace/shared/components/text-input";
|
||||
import { Text } from "@docspace/shared/components/text";
|
||||
@ -15,7 +13,6 @@ import { PasswordInput } from "@docspace/shared/components/password-input";
|
||||
import { FieldContainer } from "@docspace/shared/components/field-container";
|
||||
import { toastr } from "@docspace/shared/components/toast";
|
||||
import { SocialButtonsGroup } from "@docspace/shared/components/social-buttons-group";
|
||||
import MoreLoginModal from "@docspace/shared/components/more-login-modal";
|
||||
import { EmailInput } from "@docspace/shared/components/email-input";
|
||||
import { FormWrapper } from "@docspace/shared/components/form-wrapper";
|
||||
|
||||
@ -52,6 +49,41 @@ const DEFAULT_ROOM_TEXT =
|
||||
const DEFAULT_PORTAL_TEXT =
|
||||
"<strong>{{firstName}} {{lastName}}</strong> invites you to join the room <strong>{{roomName}}</strong> for secure document collaboration.";
|
||||
|
||||
const DEFAULT_CREATION_TEXT =
|
||||
"A DocSpace account will be created for {{email}}. Please, complete your registration:";
|
||||
|
||||
const RegistrationFormGreeting = ({ email, t, setRegistrationForm }) => {
|
||||
const onClickBack = () => {
|
||||
setRegistrationForm(false);
|
||||
};
|
||||
return (
|
||||
<div className="greeting-container">
|
||||
<div className="sign-in-container">
|
||||
<Text fontWeight={600} onClick={onClickBack}>
|
||||
{t("Back")}
|
||||
</Text>
|
||||
|
||||
<Text fontWeight={600} fontSize={"16px"}>
|
||||
{t("Common:LoginButton")}
|
||||
</Text>
|
||||
</div>
|
||||
<Text>
|
||||
<Trans
|
||||
t={t}
|
||||
i18nKey={"AccountWillBeCreated"}
|
||||
ns="Confirm"
|
||||
defaults={DEFAULT_CREATION_TEXT}
|
||||
values={{
|
||||
email,
|
||||
}}
|
||||
components={{
|
||||
1: <Link type="page" isHovered={false} />,
|
||||
}}
|
||||
/>
|
||||
</Text>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
const CreateUserForm = (props) => {
|
||||
const {
|
||||
settings,
|
||||
@ -74,24 +106,28 @@ const CreateUserForm = (props) => {
|
||||
const [emailValid, setEmailValid] = useState(true);
|
||||
const [emailErrorText, setEmailErrorText] = useState("");
|
||||
|
||||
// const [password, setPassword] = useState("");
|
||||
// const [passwordValid, setPasswordValid] = useState(true);
|
||||
const [password, setPassword] = useState("");
|
||||
const [passwordValid, setPasswordValid] = useState(true);
|
||||
|
||||
// const [fname, setFname] = useState("");
|
||||
// const [fnameValid, setFnameValid] = useState(true);
|
||||
// const [sname, setSname] = useState("");
|
||||
// const [snameValid, setSnameValid] = useState(true);
|
||||
const [fname, setFname] = useState("");
|
||||
const [fnameValid, setFnameValid] = useState(true);
|
||||
const [sname, setSname] = useState("");
|
||||
const [snameValid, setSnameValid] = useState(true);
|
||||
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
|
||||
const [errorText, setErrorText] = useState("");
|
||||
|
||||
const [user, setUser] = useState("");
|
||||
|
||||
const [isEmailErrorShow, setIsEmailErrorShow] = useState(false);
|
||||
// const [isPasswordErrorShow, setIsPasswordErrorShow] = useState(false);
|
||||
const [isPasswordErrorShow, setIsPasswordErrorShow] = useState(false);
|
||||
|
||||
const [showForm, setShowForm] = useState(true);
|
||||
const [showGreeting, setShowGreeting] = useState(true);
|
||||
//const [searchParams, setSearchParams] = useSearchParams();
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
|
||||
const [registrationForm, setRegistrationForm] = useState(emailFromLink);
|
||||
|
||||
const focusInput = () => {
|
||||
if (inputRef) {
|
||||
@ -136,7 +172,7 @@ const CreateUserForm = (props) => {
|
||||
}, []);
|
||||
|
||||
const onContinue = async () => {
|
||||
const { linkData, hashSettings } = props;
|
||||
const { linkData } = props;
|
||||
setIsLoading(true);
|
||||
|
||||
let hasError = false;
|
||||
@ -157,107 +193,116 @@ const CreateUserForm = (props) => {
|
||||
const headerKey = linkData.confirmHeader;
|
||||
|
||||
try {
|
||||
const user = await getUserByEmail(email, headerKey);
|
||||
const loginData = window.btoa(
|
||||
JSON.stringify({
|
||||
type: "invitation",
|
||||
email,
|
||||
roomName,
|
||||
firstName: user.firstName,
|
||||
lastName: user.lastName,
|
||||
}),
|
||||
);
|
||||
|
||||
console.log("roomName", roomName);
|
||||
await getUserByEmail(email, headerKey);
|
||||
|
||||
window.location.href = combineUrl(
|
||||
window.DocSpaceConfig?.proxy?.url,
|
||||
"/login",
|
||||
`?type=invitation&email=${email}&roomName=${roomName}&firstName=${user.firstName}&lastName=${user.lastName}`,
|
||||
`?loginData=${loginData}`,
|
||||
);
|
||||
} catch (err) {
|
||||
const status = err?.response?.status;
|
||||
const isNotExistUser = status === 404;
|
||||
|
||||
if (isNotExistUser) {
|
||||
setRegistrationForm(true);
|
||||
}
|
||||
}
|
||||
|
||||
setIsLoading(false);
|
||||
};
|
||||
// const onSubmit = () => {
|
||||
// const { linkData, hashSettings } = props;
|
||||
// const type = parseInt(linkData.emplType);
|
||||
// const culture = searchParams.get("culture");
|
||||
// setIsLoading(true);
|
||||
const onSubmit = () => {
|
||||
const { linkData, hashSettings } = props;
|
||||
const type = parseInt(linkData.emplType);
|
||||
const culture = searchParams.get("culture");
|
||||
setIsLoading(true);
|
||||
|
||||
// setErrorText("");
|
||||
setErrorText("");
|
||||
|
||||
// let hasError = false;
|
||||
let hasError = false;
|
||||
|
||||
// if (!fname.trim() || !fnameValid) {
|
||||
// hasError = true;
|
||||
// setFnameValid(!hasError);
|
||||
// }
|
||||
if (!fname.trim() || !fnameValid) {
|
||||
hasError = true;
|
||||
setFnameValid(!hasError);
|
||||
}
|
||||
|
||||
// if (!sname.trim() || !snameValid) {
|
||||
// hasError = true;
|
||||
// setSnameValid(!hasError);
|
||||
// }
|
||||
if (!sname.trim() || !snameValid) {
|
||||
hasError = true;
|
||||
setSnameValid(!hasError);
|
||||
}
|
||||
|
||||
// const emailRegex = "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,}$";
|
||||
// const validationEmail = new RegExp(emailRegex);
|
||||
const emailRegex = "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,}$";
|
||||
const validationEmail = new RegExp(emailRegex);
|
||||
|
||||
// if (!validationEmail.test(email.trim())) {
|
||||
// hasError = true;
|
||||
// setEmailValid(!hasError);
|
||||
// }
|
||||
if (!validationEmail.test(email.trim())) {
|
||||
hasError = true;
|
||||
setEmailValid(!hasError);
|
||||
}
|
||||
|
||||
// if (!passwordValid || !password.trim()) {
|
||||
// hasError = true;
|
||||
// setPasswordValid(!hasError);
|
||||
// setIsPasswordErrorShow(true);
|
||||
// }
|
||||
if (!passwordValid || !password.trim()) {
|
||||
hasError = true;
|
||||
setPasswordValid(!hasError);
|
||||
setIsPasswordErrorShow(true);
|
||||
}
|
||||
|
||||
// if (hasError) {
|
||||
// setIsLoading(false);
|
||||
// return false;
|
||||
// }
|
||||
if (hasError) {
|
||||
setIsLoading(false);
|
||||
return false;
|
||||
}
|
||||
|
||||
// const hash = createPasswordHash(password, hashSettings);
|
||||
const hash = createPasswordHash(password, hashSettings);
|
||||
|
||||
// const loginData = {
|
||||
// userName: email,
|
||||
// passwordHash: hash,
|
||||
// };
|
||||
const loginData = {
|
||||
userName: email,
|
||||
passwordHash: hash,
|
||||
};
|
||||
|
||||
// const personalData = {
|
||||
// firstname: fname.trim(),
|
||||
// lastname: sname.trim(),
|
||||
// email: email,
|
||||
// cultureName: culture,
|
||||
// };
|
||||
const personalData = {
|
||||
firstname: fname.trim(),
|
||||
lastname: sname.trim(),
|
||||
email: email,
|
||||
cultureName: culture,
|
||||
};
|
||||
|
||||
// if (!!type) {
|
||||
// personalData.type = type;
|
||||
// }
|
||||
if (!!type) {
|
||||
personalData.type = type;
|
||||
}
|
||||
|
||||
// if (!!linkData.key) {
|
||||
// personalData.key = linkData.key;
|
||||
// }
|
||||
if (!!linkData.key) {
|
||||
personalData.key = linkData.key;
|
||||
}
|
||||
|
||||
// const headerKey = linkData.confirmHeader;
|
||||
const headerKey = linkData.confirmHeader;
|
||||
|
||||
// createConfirmUser(personalData, loginData, headerKey).catch((error) => {
|
||||
// let errorMessage = "";
|
||||
// if (typeof error === "object") {
|
||||
// errorMessage =
|
||||
// error?.response?.data?.error?.message ||
|
||||
// error?.statusText ||
|
||||
// error?.message ||
|
||||
// "";
|
||||
// } else {
|
||||
// errorMessage = error;
|
||||
// }
|
||||
createConfirmUser(personalData, loginData, headerKey).catch((error) => {
|
||||
let errorMessage = "";
|
||||
if (typeof error === "object") {
|
||||
errorMessage =
|
||||
error?.response?.data?.error?.message ||
|
||||
error?.statusText ||
|
||||
error?.message ||
|
||||
"";
|
||||
} else {
|
||||
errorMessage = error;
|
||||
}
|
||||
|
||||
// console.error("confirm error", errorMessage);
|
||||
// setIsEmailErrorShow(true);
|
||||
// setEmailErrorText(errorMessage);
|
||||
// setEmailValid(false);
|
||||
// setIsLoading(false);
|
||||
// });
|
||||
// };
|
||||
console.error("confirm error", errorMessage);
|
||||
setIsEmailErrorShow(true);
|
||||
setEmailErrorText(errorMessage);
|
||||
setEmailValid(false);
|
||||
setIsLoading(false);
|
||||
});
|
||||
};
|
||||
|
||||
const authCallback = (profile) => {
|
||||
const signupAccount = {
|
||||
@ -279,50 +324,78 @@ const CreateUserForm = (props) => {
|
||||
});
|
||||
};
|
||||
|
||||
// const createConfirmUser = async (registerData, loginData, key) => {
|
||||
// const { defaultPage } = props;
|
||||
const createConfirmUser = async (registerData, loginData, key) => {
|
||||
const { defaultPage } = props;
|
||||
|
||||
// const fromInviteLink = linkData.type === "LinkInvite" ? true : false;
|
||||
const fromInviteLink = linkData.type === "LinkInvite" ? true : false;
|
||||
|
||||
// const data = Object.assign(
|
||||
// { fromInviteLink: fromInviteLink },
|
||||
// registerData,
|
||||
// loginData,
|
||||
// );
|
||||
const data = Object.assign(
|
||||
{ fromInviteLink: fromInviteLink },
|
||||
registerData,
|
||||
loginData,
|
||||
);
|
||||
|
||||
// await createUser(data, key);
|
||||
await createUser(data, key);
|
||||
|
||||
// const { userName, passwordHash } = loginData;
|
||||
const { userName, passwordHash } = loginData;
|
||||
|
||||
// const res = await login(userName, passwordHash);
|
||||
const res = await login(userName, passwordHash);
|
||||
|
||||
// //console.log({ res });
|
||||
//console.log({ res });
|
||||
|
||||
// const finalUrl = roomData.roomId
|
||||
// ? `/rooms/shared/filter?folder=${roomData.roomId}`
|
||||
// : defaultPage;
|
||||
const finalUrl = roomData.roomId
|
||||
? `/rooms/shared/filter?folder=${roomData.roomId}`
|
||||
: defaultPage;
|
||||
|
||||
// const isConfirm = typeof res === "string" && res.includes("confirm");
|
||||
const isConfirm = typeof res === "string" && res.includes("confirm");
|
||||
|
||||
// if (isConfirm) {
|
||||
// sessionStorage.setItem("referenceUrl", finalUrl);
|
||||
if (isConfirm) {
|
||||
sessionStorage.setItem("referenceUrl", finalUrl);
|
||||
|
||||
// return window.location.replace(typeof res === "string" ? res : "/");
|
||||
// }
|
||||
return window.location.replace(typeof res === "string" ? res : "/");
|
||||
}
|
||||
|
||||
// window.location.replace(finalUrl);
|
||||
// };
|
||||
window.location.replace(finalUrl);
|
||||
};
|
||||
|
||||
const onChangeEmail = (e) => {
|
||||
setEmail(e.target.value);
|
||||
setIsEmailErrorShow(false);
|
||||
};
|
||||
const onChangeFname = (e) => {
|
||||
setFname(e.target.value);
|
||||
setFnameValid(nameRegex.test(e.target.value.trim()));
|
||||
setErrorText("");
|
||||
};
|
||||
|
||||
const onChangeSname = (e) => {
|
||||
setSname(e.target.value);
|
||||
setSnameValid(nameRegex.test(e.target.value.trim()));
|
||||
setErrorText("");
|
||||
};
|
||||
|
||||
const onChangePassword = (e) => {
|
||||
setPassword(e.target.value);
|
||||
setErrorText("");
|
||||
setIsPasswordErrorShow(false);
|
||||
};
|
||||
|
||||
const onKeyPress = (event) => {
|
||||
if (event.key === "Enter") {
|
||||
onContinue();
|
||||
registrationForm ? onSubmit() : onContinue();
|
||||
}
|
||||
};
|
||||
const onValidatePassword = (res) => {
|
||||
setPasswordValid(res);
|
||||
};
|
||||
|
||||
const onBlurEmail = () => {
|
||||
setIsEmailErrorShow(true);
|
||||
};
|
||||
|
||||
const onBlurPassword = () => {
|
||||
setIsPasswordErrorShow(true);
|
||||
};
|
||||
|
||||
const onSocialButtonClick = useCallback((e) => {
|
||||
const { target } = e;
|
||||
@ -383,10 +456,6 @@ const CreateUserForm = (props) => {
|
||||
setEmailErrorText(res.errors[0]);
|
||||
};
|
||||
|
||||
const onBlurEmail = () => {
|
||||
setIsEmailErrorShow(true);
|
||||
};
|
||||
|
||||
const ssoProps = ssoExists()
|
||||
? {
|
||||
ssoUrl: capabilities?.ssoUrl,
|
||||
@ -436,84 +505,198 @@ const CreateUserForm = (props) => {
|
||||
{showForm && (
|
||||
<form className="auth-form-container">
|
||||
<div className="auth-form-fields">
|
||||
<FieldContainer
|
||||
className="form-field"
|
||||
isVertical={true}
|
||||
labelVisible={false}
|
||||
hasError={isEmailErrorShow && !emailValid}
|
||||
errorMessage={
|
||||
emailErrorText
|
||||
? t(`Common:${emailErrorText}`)
|
||||
: t("Common:RequiredField")
|
||||
}
|
||||
>
|
||||
<EmailInput
|
||||
id="login"
|
||||
name="login"
|
||||
type="email"
|
||||
hasError={isEmailErrorShow && !emailValid}
|
||||
value={email}
|
||||
placeholder={t("Common:Email")}
|
||||
size="large"
|
||||
scale={true}
|
||||
isAutoFocussed={true}
|
||||
tabIndex={1}
|
||||
isDisabled={isLoading || !!emailFromLink}
|
||||
autoComplete="username"
|
||||
onChange={onChangeEmail}
|
||||
onBlur={onBlurEmail}
|
||||
onValidateInput={onValidateEmail}
|
||||
forwardedRef={inputRef}
|
||||
onKeyDown={onKeyPress}
|
||||
/>
|
||||
</FieldContainer>
|
||||
{!registrationForm && (
|
||||
<>
|
||||
<FieldContainer
|
||||
className="form-field"
|
||||
isVertical={true}
|
||||
labelVisible={false}
|
||||
hasError={isEmailErrorShow && !emailValid}
|
||||
errorMessage={
|
||||
emailErrorText
|
||||
? t(`Common:${emailErrorText}`)
|
||||
: t("Common:RequiredField")
|
||||
}
|
||||
>
|
||||
<EmailInput
|
||||
id="login"
|
||||
name="login"
|
||||
type="email"
|
||||
hasError={isEmailErrorShow && !emailValid}
|
||||
value={email}
|
||||
placeholder={t("Common:Email")}
|
||||
size="large"
|
||||
scale={true}
|
||||
isAutoFocussed={true}
|
||||
tabIndex={1}
|
||||
isDisabled={isLoading || !!emailFromLink}
|
||||
autoComplete="username"
|
||||
onChange={onChangeEmail}
|
||||
onBlur={onBlurEmail}
|
||||
onValidateInput={onValidateEmail}
|
||||
forwardedRef={inputRef}
|
||||
onKeyDown={onKeyPress}
|
||||
/>
|
||||
</FieldContainer>
|
||||
<Button
|
||||
className="login-button"
|
||||
primary
|
||||
size="medium"
|
||||
scale={true}
|
||||
label={t("Common:ContinueButton")}
|
||||
tabIndex={1}
|
||||
isDisabled={isLoading}
|
||||
isLoading={isLoading}
|
||||
onClick={onContinue}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
|
||||
<Button
|
||||
className="login-button"
|
||||
primary
|
||||
size="medium"
|
||||
scale={true}
|
||||
label={t("Common:ContinueButton")}
|
||||
tabIndex={1}
|
||||
isDisabled={isLoading}
|
||||
isLoading={isLoading}
|
||||
onClick={onContinue}
|
||||
/>
|
||||
{registrationForm && (
|
||||
<>
|
||||
<RegistrationFormGreeting
|
||||
email={email}
|
||||
t={t}
|
||||
setRegistrationForm={setRegistrationForm}
|
||||
/>
|
||||
<FieldContainer
|
||||
className="form-field"
|
||||
isVertical={true}
|
||||
labelVisible={false}
|
||||
hasError={!fnameValid}
|
||||
errorMessage={
|
||||
errorText
|
||||
? errorText
|
||||
: fname.trim().length === 0
|
||||
? t("Common:RequiredField")
|
||||
: t("Common:IncorrectFirstName")
|
||||
}
|
||||
>
|
||||
<TextInput
|
||||
id="first-name"
|
||||
name="first-name"
|
||||
type="text"
|
||||
hasError={!fnameValid}
|
||||
value={fname}
|
||||
placeholder={t("Common:FirstName")}
|
||||
size="large"
|
||||
scale={true}
|
||||
tabIndex={1}
|
||||
isDisabled={isLoading}
|
||||
onChange={onChangeFname}
|
||||
onKeyDown={onKeyPress}
|
||||
/>
|
||||
</FieldContainer>
|
||||
<FieldContainer
|
||||
className="form-field"
|
||||
isVertical={true}
|
||||
labelVisible={false}
|
||||
hasError={!snameValid}
|
||||
errorMessage={
|
||||
errorText
|
||||
? errorText
|
||||
: sname.trim().length === 0
|
||||
? t("Common:RequiredField")
|
||||
: t("Common:IncorrectLastName")
|
||||
}
|
||||
>
|
||||
<TextInput
|
||||
id="last-name"
|
||||
name="last-name"
|
||||
type="text"
|
||||
hasError={!snameValid}
|
||||
value={sname}
|
||||
placeholder={t("Common:LastName")}
|
||||
size="large"
|
||||
scale={true}
|
||||
tabIndex={1}
|
||||
isDisabled={isLoading}
|
||||
onChange={onChangeSname}
|
||||
onKeyDown={onKeyPress}
|
||||
/>
|
||||
</FieldContainer>
|
||||
<FieldContainer
|
||||
className="form-field password-field"
|
||||
isVertical={true}
|
||||
labelVisible={false}
|
||||
hasError={isPasswordErrorShow && !passwordValid}
|
||||
errorMessage={`${t(
|
||||
"Common:PasswordLimitMessage",
|
||||
)}: ${getPasswordErrorMessage(t, settings)}`}
|
||||
>
|
||||
<PasswordInput
|
||||
simpleView={false}
|
||||
hideNewPasswordButton
|
||||
showCopyLink={false}
|
||||
passwordSettings={settings}
|
||||
id="password"
|
||||
inputName="password"
|
||||
placeholder={t("Common:Password")}
|
||||
type="password"
|
||||
hasError={isPasswordErrorShow && !passwordValid}
|
||||
inputValue={password}
|
||||
size="large"
|
||||
scale={true}
|
||||
tabIndex={1}
|
||||
isDisabled={isLoading}
|
||||
autoComplete="current-password"
|
||||
onChange={onChangePassword}
|
||||
onBlur={onBlurPassword}
|
||||
onKeyDown={onKeyPress}
|
||||
onValidateInput={onValidatePassword}
|
||||
tooltipPasswordTitle={`${t(
|
||||
"Common:PasswordLimitMessage",
|
||||
)}:`}
|
||||
tooltipPasswordLength={`${t(
|
||||
"Common:PasswordMinimumLength",
|
||||
)}: ${settings ? settings.minLength : 8}`}
|
||||
tooltipPasswordDigits={`${t(
|
||||
"Common:PasswordLimitDigits",
|
||||
)}`}
|
||||
tooltipPasswordCapital={`${t(
|
||||
"Common:PasswordLimitUpperCase",
|
||||
)}`}
|
||||
tooltipPasswordSpecial={`${t(
|
||||
"Common:PasswordLimitSpecialSymbols",
|
||||
)}`}
|
||||
generatePasswordTitle={t("Wizard:GeneratePassword")}
|
||||
/>
|
||||
</FieldContainer>
|
||||
|
||||
<Button
|
||||
className="login-button"
|
||||
primary
|
||||
size="medium"
|
||||
scale={true}
|
||||
label={
|
||||
isLoading
|
||||
? t("Common:LoadingProcessing")
|
||||
: t("LoginRegistryButton")
|
||||
}
|
||||
tabIndex={1}
|
||||
isDisabled={isLoading}
|
||||
isLoading={isLoading}
|
||||
onClick={onSubmit}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
{/* <div className="signin-container">
|
||||
<Link
|
||||
isHovered
|
||||
type="action"
|
||||
fontSize="13px"
|
||||
fontWeight="600"
|
||||
color={currentColorScheme?.main?.accent}
|
||||
className="signin-button"
|
||||
onClick={onSignIn}
|
||||
>
|
||||
{t("Common:LoginButton")}
|
||||
</Link>
|
||||
</div> */}
|
||||
</form>
|
||||
)}
|
||||
{!emailFromLink && (
|
||||
{!emailFromLink && (oauthDataExists() || ssoExists()) && (
|
||||
<>
|
||||
{(oauthDataExists() || ssoExists()) && (
|
||||
<div className="line">
|
||||
<Text color="#A3A9AE" className="or-label">
|
||||
{t("Common:orContinueWith")}
|
||||
</Text>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{(oauthDataExists() || ssoExists()) && (
|
||||
<SocialButtonsGroup
|
||||
providers={providers}
|
||||
onClick={onSocialButtonClick}
|
||||
t={t}
|
||||
isDisabled={isLoading}
|
||||
{...ssoProps}
|
||||
/>
|
||||
)}
|
||||
<div className="line">
|
||||
<Text color="#A3A9AE" className="or-label">
|
||||
{t("Common:orContinueWith")}
|
||||
</Text>
|
||||
</div>
|
||||
<SocialButtonsGroup
|
||||
providers={providers}
|
||||
onClick={onSocialButtonClick}
|
||||
t={t}
|
||||
isDisabled={isLoading}
|
||||
{...ssoProps}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
|
||||
import { inject, observer } from "mobx-react";
|
||||
import { useLocation } from "react-router-dom";
|
||||
|
||||
import { ButtonsWrapper, LoginFormWrapper, LoginContent } from "./StyledLogin";
|
||||
import { LoginFormWrapper, LoginContent } from "./StyledLogin";
|
||||
import { Text } from "@docspace/shared/components/text";
|
||||
import { SocialButtonsGroup } from "@docspace/shared/components/social-buttons-group";
|
||||
import {
|
||||
@ -27,8 +27,6 @@ import { getBgPattern, frameCallCommand } from "@docspace/shared/utils/common";
|
||||
import useIsomorphicLayoutEffect from "../hooks/useIsomorphicLayoutEffect";
|
||||
import { getLogoFromPath, getSystemTheme } from "@docspace/shared/utils";
|
||||
import { TenantStatus } from "@docspace/shared/enums";
|
||||
import { getObjectByLocation } from "@docspace/shared/utils/common";
|
||||
import InvitationContainer from "./sub-components/GreetingContainer";
|
||||
import GreetingContainer from "./sub-components/GreetingContainer";
|
||||
|
||||
const themes = {
|
||||
@ -57,14 +55,20 @@ const Login: React.FC<ILoginProps> = ({
|
||||
}) => {
|
||||
const location = useLocation();
|
||||
|
||||
const { search } = location;
|
||||
const isRestoringPortal =
|
||||
portalSettings?.tenantStatus === TenantStatus.PortalRestore;
|
||||
|
||||
useEffect(() => {
|
||||
if (location.search) {
|
||||
const queryParams = getObjectByLocation(location);
|
||||
setInvitationLinkData(queryParams);
|
||||
if (search) {
|
||||
|
||||
const encodeString = search.slice(search.indexOf("=") + 1);
|
||||
|
||||
const decodeString = atob(encodeString);
|
||||
const queryParams = JSON.parse(decodeString);
|
||||
|
||||
setInvitationLinkData(queryParams);
|
||||
console.log("queryParams", queryParams);
|
||||
//window.history.replaceState({}, document.title, window.location.pathname);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user