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

Commitf2400d2

Browse files
update checks on login page based on env variables
1 parent4a341b9 commitf2400d2

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

‎client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export default function FormLoginSteps(props: FormLoginProps) {
127127
constisEmailLoginEnabled=useMemo(()=>{
128128
returnisFormLoginEnabled&&signinEnabled;
129129
},[isFormLoginEnabled,signinEnabled]);
130-
130+
131131
constisEnterpriseMode=useMemo(()=>{
132132
returnserverSettings?.LOWCODER_WORKSPACE_MODE==="ENTERPRISE"||serverSettings?.LOWCODER_WORKSPACE_MODE==="SINGLEWORKSPACE";
133133
},[serverSettings]);
@@ -239,7 +239,7 @@ export default function FormLoginSteps(props: FormLoginProps) {
239239
invitedOrganizationId={organizationId}
240240
authGoal="login"
241241
/>
242-
{(isFormLoginEnabled&&signupEnabled)&&(
242+
{(isEmailLoginEnabled&&signupEnabled)&&(
243243
<>
244244
<Divider/>
245245
<AuthBottomView>

‎client/packages/lowcoder/src/pages/userAuth/register.tsx

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,24 @@ function UserRegister() {
5858
const[lastEmailChecked,setLastEmailChecked]=useState("");
5959
const[signupEnabled,setSignupEnabled]=useState<boolean>(true);
6060
const[signinEnabled,setSigninEnabled]=useState<boolean>(true);
61+
const[defaultOrgId,setDefaultOrgId]=useState<string|undefined>();
6162
constredirectUrl=useRedirectUrl();
6263
constserverSettings=useSelector(getServerSettings);
6364
const{ systemConfig, inviteInfo, fetchUserAfterAuthSuccess}=useContext(AuthContext);
6465
constinvitationId=inviteInfo?.invitationId;
65-
constisFormLoginEnabled=systemConfig?.form.enableLogin;
66+
constisFormLoginEnabled=systemConfig ?systemConfig?.form.enableLogin :true;
6667
constauthId=systemConfig?.form.id;
6768
constorgId=useParams<any>().orgId;
6869

6970
constorganizationId=useMemo(()=>{
7071
if(inviteInfo?.invitedOrganizationId){
7172
returninviteInfo?.invitedOrganizationId;
7273
}
73-
returnorgId;
74-
},[inviteInfo,orgId]);
74+
if(orgId){
75+
returnorgId;
76+
}
77+
returndefaultOrgId;
78+
},[inviteInfo,orgId,defaultOrgId]);
7579

7680
constisEmailLoginEnabled=useMemo(()=>{
7781
returnisFormLoginEnabled&&signinEnabled;
@@ -81,6 +85,16 @@ function UserRegister() {
8185
returnserverSettings?.LOWCODER_WORKSPACE_MODE==="ENTERPRISE"||serverSettings?.LOWCODER_WORKSPACE_MODE==="SINGLEWORKSPACE";
8286
},[serverSettings]);
8387

88+
useEffect(()=>{
89+
const{
90+
LOWCODER_EMAIL_SIGNUP_ENABLED,
91+
LOWCODER_EMAIL_AUTH_ENABLED,
92+
}=serverSettings;
93+
94+
setSignupEnabled(LOWCODER_EMAIL_SIGNUP_ENABLED==='true');
95+
setSigninEnabled(LOWCODER_EMAIL_AUTH_ENABLED==='true');
96+
},[serverSettings]);
97+
8498
useEffect(()=>{
8599
if(isEnterpriseMode){
86100
// dispatch(fetchConfigAction());
@@ -95,6 +109,7 @@ function UserRegister() {
95109
if(orgList.length){
96110
// in Enterprise mode, we will get org data in different format
97111
constselectedOrgId=orgList[0]?.id||orgList[0]?.orgId;
112+
setDefaultOrgId(selectedOrgId);
98113
dispatch(fetchConfigAction(selectedOrgId));
99114
}
100115
}
@@ -172,7 +187,7 @@ function UserRegister() {
172187
type="large"
173188
>
174189
<RegisterContent>
175-
{isFormLoginEnabled&&(
190+
{isEmailLoginEnabled&&(
176191
<>
177192
<StyledFormInput
178193
className="form-input"
@@ -212,7 +227,7 @@ function UserRegister() {
212227
/>
213228
)}
214229
</RegisterContent>
215-
{isFormLoginEnabled&&(
230+
{isEmailLoginEnabled&&(
216231
<>
217232
<Divider/>
218233
<StyledRouteLinkLoginto={{

‎client/packages/lowcoder/src/pages/userAuth/thirdParty/thirdPartyAuth.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ export function ThirdPartyAuth(props: {
154154
return(
155155
<ThirdPartyLoginButtonWrapper>
156156
{(
157-
(isFormLoginEnabled&&props.authGoal==='login')
158-
||(isFormLoginEnabled&&isEmailSignupEnabled&&props.authGoal==='register')
157+
(isEmailLoginEnabled&&props.authGoal==='login')
158+
||(isEmailLoginEnabled&&isEmailSignupEnabled&&props.authGoal==='register')
159159
)&&Boolean(socialLoginButtons.length)&&(
160160
<Dividerplain>
161161
<Texttype="secondary">or</Text>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp