Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: Add config to disable the form login (#10153)

Browse Source 
* updated login/signup pages to use form login disabled config

* added env var config
This commit is contained in:
Pranav Kanade 2022-01-05 10:26:42 +05:30 committed by GitHub
parent c7e2d5a2bb
commit 7861ce6915
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 92 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/client/docker/templates/nginx-app-http.conf.template
View File

@ -42,6 +42,7 @@ server {
sub_filter __APPSMITH_DISABLE_TELEMETRY__ '${APPSMITH_DISABLE_TELEMETRY}';
sub_filter __APPSMITH_CLOUD_SERVICES_BASE_URL__ '${APPSMITH_CLOUD_SERVICES_BASE_URL}';
sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
sub_filter __APPSMITH_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}';
}
location /f {

1
app/client/docker/templates/nginx-app-https.conf.template
View File

@ -52,6 +52,7 @@ server {
sub_filter __APPSMITH_DISABLE_TELEMETRY__ '${APPSMITH_DISABLE_TELEMETRY}';
sub_filter __APPSMITH_CLOUD_SERVICES_BASE_URL__ '${APPSMITH_CLOUD_SERVICES_BASE_URL}';
sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
sub_filter __APPSMITH_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}';
}
location /f {

1
app/client/docker/templates/nginx-app.conf.template
View File

@ -50,6 +50,7 @@ server {
sub_filter __APPSMITH_CLOUD_SERVICES_BASE_URL__ '${APPSMITH_CLOUD_SERVICES_BASE_URL}';
sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
sub_filter __APPSMITH_DISABLE_INTERCOM__ '${APPSMITH_DISABLE_INTERCOM}';
sub_filter __APPSMITH_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}';
}
location /f {

1
app/client/jest.config.js
View File

@ -41,6 +41,7 @@ module.exports = {
},
enableGoogleOAuth: parseConfig("__APPSMITH_OAUTH2_GOOGLE_CLIENT_ID__"),
enableGithubOAuth: parseConfig("__APPSMITH_OAUTH2_GITHUB_CLIENT_ID__"),
disableLoginForm: parseConfig("__APPSMITH_FORM_LOGIN_DISABLED__"),
enableRapidAPI: parseConfig("__APPSMITH_MARKETPLACE_ENABLED__"),
segment: {
apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"),

1
app/client/public/index.html
View File

@ -180,6 +180,7 @@
},
enableGoogleOAuth: parseConfig("__APPSMITH_OAUTH2_GOOGLE_CLIENT_ID__"),
enableGithubOAuth: parseConfig("__APPSMITH_OAUTH2_GITHUB_CLIENT_ID__"),
disableLoginForm: parseConfig("__APPSMITH_FORM_LOGIN_DISABLED__"),
enableRapidAPI: parseConfig("__APPSMITH_MARKETPLACE_ENABLED__"),
segment: {
apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"),

4
app/client/src/configs/index.ts
View File

@ -16,6 +16,7 @@ export type INJECTED_CONFIGS = {
};
enableGoogleOAuth: boolean;
enableGithubOAuth: boolean;
disableLoginForm: boolean;
enableRapidAPI: boolean;
segment: {
apiKey: string;
@ -79,6 +80,7 @@ const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
enableGithubOAuth: process.env.REACT_APP_OAUTH2_GITHUB_CLIENT_ID
? process.env.REACT_APP_OAUTH2_GITHUB_CLIENT_ID.length > 0
: false,
disableLoginForm: !!process.env.APPSMITH_FORM_LOGIN_DISABLED,
segment: {
apiKey: process.env.REACT_APP_SEGMENT_KEY || "",
ceKey: process.env.REACT_APP_SEGMENT_CE_KEY || "",
@ -258,6 +260,8 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
enableGithubOAuth:
ENV_CONFIG.enableGithubOAuth ||
APPSMITH_FEATURE_CONFIGS.enableGithubOAuth,
disableLoginForm:
ENV_CONFIG.disableLoginForm || APPSMITH_FEATURE_CONFIGS.disableLoginForm,
enableGoogleOAuth:
ENV_CONFIG.enableGoogleOAuth ||
APPSMITH_FEATURE_CONFIGS.enableGoogleOAuth,

1
app/client/src/configs/types.ts
View File

@ -55,6 +55,7 @@ export type AppsmithUIConfigs = {
enableRapidAPI: boolean;
enableGoogleOAuth: boolean;
enableGithubOAuth: boolean;
disableLoginForm: boolean;
enableMixpanel: boolean;
enableTNCPP: boolean;

124
app/client/src/pages/UserAuth/Login.tsx
View File

@ -50,7 +50,11 @@ import PerformanceTracker, {
} from "utils/PerformanceTracker";
import { getIsSafeRedirectURL } from "utils/helpers";
import { getCurrentUser } from "selectors/usersSelectors";
const { enableGithubOAuth, enableGoogleOAuth } = getAppsmithConfigs();
const {
disableLoginForm,
enableGithubOAuth,
enableGoogleOAuth,
} = getAppsmithConfigs();
const validate = (values: LoginFormValues) => {
const errors: LoginFormValues = {};
@ -116,15 +120,17 @@ export function Login(props: LoginFormProps) {
<AuthCardHeader>
<h1>{createMessage(LOGIN_PAGE_TITLE)}</h1>
</AuthCardHeader>
<SignUpLinkSection>
{createMessage(NEW_TO_APPSMITH)}
<AuthCardNavLink
style={{ marginLeft: props.theme.spaces[3] }}
to={signupURL}
>
{createMessage(LOGIN_PAGE_SIGN_UP_LINK_TEXT)}
</AuthCardNavLink>
</SignUpLinkSection>
{!disableLoginForm && (
<SignUpLinkSection>
{createMessage(NEW_TO_APPSMITH)}
<AuthCardNavLink
style={{ marginLeft: props.theme.spaces[3] }}
to={signupURL}
>
{createMessage(LOGIN_PAGE_SIGN_UP_LINK_TEXT)}
</AuthCardNavLink>
</SignUpLinkSection>
)}
{showError && (
<FormMessage
actions={
@ -151,53 +157,59 @@ export function Login(props: LoginFormProps) {
{SocialLoginList.length > 0 && (
<ThirdPartyAuth logins={SocialLoginList} type={"SIGNIN"} />
)}
<SpacedSubmitForm action={loginURL} method="POST">
<FormGroup
intent={error ? "danger" : "none"}
label={createMessage(LOGIN_PAGE_EMAIL_INPUT_LABEL)}
>
<FormTextField
autoFocus
name={LOGIN_FORM_EMAIL_FIELD_NAME}
placeholder={createMessage(LOGIN_PAGE_EMAIL_INPUT_PLACEHOLDER)}
type="email"
/>
</FormGroup>
<FormGroup
intent={error ? "danger" : "none"}
label={createMessage(LOGIN_PAGE_PASSWORD_INPUT_LABEL)}
>
<FormTextField
name={LOGIN_FORM_PASSWORD_FIELD_NAME}
placeholder={createMessage(LOGIN_PAGE_PASSWORD_INPUT_PLACEHOLDER)}
type="password"
/>
</FormGroup>
{!disableLoginForm && (
<>
<SpacedSubmitForm action={loginURL} method="POST">
<FormGroup
intent={error ? "danger" : "none"}
label={createMessage(LOGIN_PAGE_EMAIL_INPUT_LABEL)}
>
<FormTextField
autoFocus
name={LOGIN_FORM_EMAIL_FIELD_NAME}
placeholder={createMessage(LOGIN_PAGE_EMAIL_INPUT_PLACEHOLDER)}
type="email"
/>
</FormGroup>
<FormGroup
intent={error ? "danger" : "none"}
label={createMessage(LOGIN_PAGE_PASSWORD_INPUT_LABEL)}
>
<FormTextField
name={LOGIN_FORM_PASSWORD_FIELD_NAME}
placeholder={createMessage(
LOGIN_PAGE_PASSWORD_INPUT_PLACEHOLDER,
)}
type="password"
/>
</FormGroup>
<FormActions>
<Button
disabled={!isFormValid}
fill
onClick={() => {
PerformanceTracker.startTracking(
PerformanceTransactionName.LOGIN_CLICK,
);
AnalyticsUtil.logEvent("LOGIN_CLICK", {
loginMethod: "EMAIL",
});
}}
size={Size.large}
tag="button"
text={createMessage(LOGIN_PAGE_LOGIN_BUTTON_TEXT)}
type="submit"
/>
</FormActions>
</SpacedSubmitForm>
<ForgotPasswordLink>
<Link to={forgotPasswordURL}>
{createMessage(LOGIN_PAGE_FORGOT_PASSWORD_TEXT)}
</Link>
</ForgotPasswordLink>
<FormActions>
<Button
disabled={!isFormValid}
fill
onClick={() => {
PerformanceTracker.startTracking(
PerformanceTransactionName.LOGIN_CLICK,
);
AnalyticsUtil.logEvent("LOGIN_CLICK", {
loginMethod: "EMAIL",
});
}}
size={Size.large}
tag="button"
text={createMessage(LOGIN_PAGE_LOGIN_BUTTON_TEXT)}
type="submit"
/>
</FormActions>
</SpacedSubmitForm>
<ForgotPasswordLink>
<Link to={forgotPasswordURL}>
{createMessage(LOGIN_PAGE_FORGOT_PASSWORD_TEXT)}
</Link>
</ForgotPasswordLink>
</>
)}
</>
);
}

17
app/client/src/pages/UserAuth/SignUp.tsx
View File

@ -1,8 +1,13 @@
import React from "react";
import React, { useEffect } from "react";
import { reduxForm, InjectedFormProps, formValueSelector } from "redux-form";
import { AUTH_LOGIN_URL } from "constants/routes";
import { SIGNUP_FORM_NAME } from "constants/forms";
import { RouteComponentProps, useLocation, withRouter } from "react-router-dom";
import {
RouteComponentProps,
useHistory,
useLocation,
withRouter,
} from "react-router-dom";
import {
AuthCardHeader,
AuthCardNavLink,
@ -61,7 +66,7 @@ declare global {
grecaptcha: any;
}
}
const { googleRecaptchaSiteKey } = getAppsmithConfigs();
const { disableLoginForm, googleRecaptchaSiteKey } = getAppsmithConfigs();
const validate = (values: SignupFormValues) => {
const errors: SignupFormValues = {};
@ -85,6 +90,12 @@ type SignUpFormProps = InjectedFormProps<
RouteComponentProps<{ email: string }> & { theme: Theme; emailValue: string };
export function SignUp(props: SignUpFormProps) {
const history = useHistory();
useEffect(() => {
if (disableLoginForm) {
history.replace(AUTH_LOGIN_URL);
}
}, []);
const { emailValue: email, error, pristine, submitting, valid } = props;
const isFormValid = valid && email && !isEmptyString(email);