diff --git a/app/client/docker/templates/nginx-app-http.conf.template b/app/client/docker/templates/nginx-app-http.conf.template index 3fb6cdb6b9..71b532c9e9 100644 --- a/app/client/docker/templates/nginx-app-http.conf.template +++ b/app/client/docker/templates/nginx-app-http.conf.template @@ -43,6 +43,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_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}'; + sub_filter __APPSMITH_SIGNUP_DISABLED__ '${APPSMITH_SIGNUP_DISABLED}'; } location /f { diff --git a/app/client/docker/templates/nginx-app-https.conf.template b/app/client/docker/templates/nginx-app-https.conf.template index c2ec7ddc86..a54627465d 100644 --- a/app/client/docker/templates/nginx-app-https.conf.template +++ b/app/client/docker/templates/nginx-app-https.conf.template @@ -53,6 +53,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_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}'; + sub_filter __APPSMITH_SIGNUP_DISABLED__ '${APPSMITH_SIGNUP_DISABLED}'; } location /f { diff --git a/app/client/docker/templates/nginx-app.conf.template b/app/client/docker/templates/nginx-app.conf.template index 31ccf48d35..3ecd408a6f 100644 --- a/app/client/docker/templates/nginx-app.conf.template +++ b/app/client/docker/templates/nginx-app.conf.template @@ -51,6 +51,7 @@ server { 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}'; + sub_filter __APPSMITH_SIGNUP_DISABLED__ '${APPSMITH_SIGNUP_DISABLED}'; } location /f { diff --git a/app/client/jest.config.js b/app/client/jest.config.js index 8fb707d516..f262c759d7 100644 --- a/app/client/jest.config.js +++ b/app/client/jest.config.js @@ -43,6 +43,7 @@ module.exports = { enableGoogleOAuth: parseConfig("__APPSMITH_OAUTH2_GOOGLE_CLIENT_ID__"), enableGithubOAuth: parseConfig("__APPSMITH_OAUTH2_GITHUB_CLIENT_ID__"), disableLoginForm: parseConfig("__APPSMITH_FORM_LOGIN_DISABLED__"), + disableSignup: parseConfig("__APPSMITH_SIGNUP_DISABLED__"), enableRapidAPI: parseConfig("__APPSMITH_MARKETPLACE_ENABLED__"), segment: { apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"), diff --git a/app/client/public/index.html b/app/client/public/index.html index b154ca1df6..1f59be9ce5 100755 --- a/app/client/public/index.html +++ b/app/client/public/index.html @@ -181,6 +181,7 @@ enableGoogleOAuth: parseConfig("__APPSMITH_OAUTH2_GOOGLE_CLIENT_ID__"), enableGithubOAuth: parseConfig("__APPSMITH_OAUTH2_GITHUB_CLIENT_ID__"), disableLoginForm: parseConfig("__APPSMITH_FORM_LOGIN_DISABLED__"), + disableSignup: parseConfig("__APPSMITH_SIGNUP_DISABLED__"), enableRapidAPI: parseConfig("__APPSMITH_MARKETPLACE_ENABLED__"), segment: { apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"), diff --git a/app/client/src/ce/configs/index.ts b/app/client/src/ce/configs/index.ts index bb7c8a9f0a..7fd3e70a73 100644 --- a/app/client/src/ce/configs/index.ts +++ b/app/client/src/ce/configs/index.ts @@ -16,6 +16,7 @@ export interface INJECTED_CONFIGS { enableGoogleOAuth: boolean; enableGithubOAuth: boolean; disableLoginForm: boolean; + disableSignup: boolean; enableRapidAPI: boolean; segment: { apiKey: string; @@ -72,6 +73,7 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => { ? process.env.REACT_APP_OAUTH2_GITHUB_CLIENT_ID.length > 0 : false, disableLoginForm: !!process.env.APPSMITH_FORM_LOGIN_DISABLED, + disableSignup: !!process.env.APPSMITH_SIGNUP_DISABLED, segment: { apiKey: process.env.REACT_APP_SEGMENT_KEY || "", ceKey: process.env.REACT_APP_SEGMENT_CE_KEY || "", @@ -253,6 +255,8 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => { APPSMITH_FEATURE_CONFIGS.enableGithubOAuth, disableLoginForm: ENV_CONFIG.disableLoginForm || APPSMITH_FEATURE_CONFIGS.disableLoginForm, + disableSignup: + ENV_CONFIG.disableSignup || APPSMITH_FEATURE_CONFIGS.disableSignup, enableGoogleOAuth: ENV_CONFIG.enableGoogleOAuth || APPSMITH_FEATURE_CONFIGS.enableGoogleOAuth, diff --git a/app/client/src/ce/configs/types.ts b/app/client/src/ce/configs/types.ts index c1554b85f6..dd8449cff0 100644 --- a/app/client/src/ce/configs/types.ts +++ b/app/client/src/ce/configs/types.ts @@ -56,6 +56,7 @@ export interface AppsmithUIConfigs { enableGoogleOAuth: boolean; enableGithubOAuth: boolean; disableLoginForm: boolean; + disableSignup: boolean; enableMixpanel: boolean; enableTNCPP: boolean; diff --git a/app/client/src/ce/pages/UserAuth/Login.tsx b/app/client/src/ce/pages/UserAuth/Login.tsx index 881d7dedfa..9406384c2f 100644 --- a/app/client/src/ce/pages/UserAuth/Login.tsx +++ b/app/client/src/ce/pages/UserAuth/Login.tsx @@ -51,7 +51,7 @@ import PerformanceTracker, { } from "utils/PerformanceTracker"; import { getIsSafeRedirectURL } from "utils/helpers"; import { getCurrentUser } from "selectors/usersSelectors"; -const { disableLoginForm } = getAppsmithConfigs(); +const { disableLoginForm, disableSignup } = getAppsmithConfigs(); const validate = (values: LoginFormValues) => { const errors: LoginFormValues = {}; @@ -113,7 +113,7 @@ export function Login(props: LoginFormProps) {

{createMessage(LOGIN_PAGE_TITLE)}

- {!disableLoginForm && ( + {!disableSignup && ( {createMessage(NEW_TO_APPSMITH)} { const errors: SignupFormValues = {}; @@ -87,7 +87,7 @@ type SignUpFormProps = InjectedFormProps< export function SignUp(props: SignUpFormProps) { const history = useHistory(); useEffect(() => { - if (disableLoginForm) { + if (disableSignup) { history.replace(AUTH_LOGIN_URL); } }, []);