added config for signup disabling
This commit is contained in:
parent
22384fc921
commit
1c8d804d88
|
|
@ -43,6 +43,7 @@ server {
|
||||||
sub_filter __APPSMITH_CLOUD_SERVICES_BASE_URL__ '${APPSMITH_CLOUD_SERVICES_BASE_URL}';
|
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_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
|
||||||
sub_filter __APPSMITH_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}';
|
sub_filter __APPSMITH_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}';
|
||||||
|
sub_filter __APPSMITH_SIGNUP_DISABLED__ '${APPSMITH_SIGNUP_DISABLED}';
|
||||||
}
|
}
|
||||||
|
|
||||||
location /f {
|
location /f {
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,7 @@ server {
|
||||||
sub_filter __APPSMITH_CLOUD_SERVICES_BASE_URL__ '${APPSMITH_CLOUD_SERVICES_BASE_URL}';
|
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_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
|
||||||
sub_filter __APPSMITH_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}';
|
sub_filter __APPSMITH_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}';
|
||||||
|
sub_filter __APPSMITH_SIGNUP_DISABLED__ '${APPSMITH_SIGNUP_DISABLED}';
|
||||||
}
|
}
|
||||||
|
|
||||||
location /f {
|
location /f {
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@ server {
|
||||||
sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
|
sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY}';
|
||||||
sub_filter __APPSMITH_DISABLE_INTERCOM__ '${APPSMITH_DISABLE_INTERCOM}';
|
sub_filter __APPSMITH_DISABLE_INTERCOM__ '${APPSMITH_DISABLE_INTERCOM}';
|
||||||
sub_filter __APPSMITH_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}';
|
sub_filter __APPSMITH_FORM_LOGIN_DISABLED__ '${APPSMITH_FORM_LOGIN_DISABLED}';
|
||||||
|
sub_filter __APPSMITH_SIGNUP_DISABLED__ '${APPSMITH_SIGNUP_DISABLED}';
|
||||||
}
|
}
|
||||||
|
|
||||||
location /f {
|
location /f {
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,7 @@ module.exports = {
|
||||||
enableGoogleOAuth: parseConfig("__APPSMITH_OAUTH2_GOOGLE_CLIENT_ID__"),
|
enableGoogleOAuth: parseConfig("__APPSMITH_OAUTH2_GOOGLE_CLIENT_ID__"),
|
||||||
enableGithubOAuth: parseConfig("__APPSMITH_OAUTH2_GITHUB_CLIENT_ID__"),
|
enableGithubOAuth: parseConfig("__APPSMITH_OAUTH2_GITHUB_CLIENT_ID__"),
|
||||||
disableLoginForm: parseConfig("__APPSMITH_FORM_LOGIN_DISABLED__"),
|
disableLoginForm: parseConfig("__APPSMITH_FORM_LOGIN_DISABLED__"),
|
||||||
|
disableSignup: parseConfig("__APPSMITH_SIGNUP_DISABLED__"),
|
||||||
enableRapidAPI: parseConfig("__APPSMITH_MARKETPLACE_ENABLED__"),
|
enableRapidAPI: parseConfig("__APPSMITH_MARKETPLACE_ENABLED__"),
|
||||||
segment: {
|
segment: {
|
||||||
apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"),
|
apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"),
|
||||||
|
|
|
||||||
|
|
@ -181,6 +181,7 @@
|
||||||
enableGoogleOAuth: parseConfig("__APPSMITH_OAUTH2_GOOGLE_CLIENT_ID__"),
|
enableGoogleOAuth: parseConfig("__APPSMITH_OAUTH2_GOOGLE_CLIENT_ID__"),
|
||||||
enableGithubOAuth: parseConfig("__APPSMITH_OAUTH2_GITHUB_CLIENT_ID__"),
|
enableGithubOAuth: parseConfig("__APPSMITH_OAUTH2_GITHUB_CLIENT_ID__"),
|
||||||
disableLoginForm: parseConfig("__APPSMITH_FORM_LOGIN_DISABLED__"),
|
disableLoginForm: parseConfig("__APPSMITH_FORM_LOGIN_DISABLED__"),
|
||||||
|
disableSignup: parseConfig("__APPSMITH_SIGNUP_DISABLED__"),
|
||||||
enableRapidAPI: parseConfig("__APPSMITH_MARKETPLACE_ENABLED__"),
|
enableRapidAPI: parseConfig("__APPSMITH_MARKETPLACE_ENABLED__"),
|
||||||
segment: {
|
segment: {
|
||||||
apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"),
|
apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"),
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ export interface INJECTED_CONFIGS {
|
||||||
enableGoogleOAuth: boolean;
|
enableGoogleOAuth: boolean;
|
||||||
enableGithubOAuth: boolean;
|
enableGithubOAuth: boolean;
|
||||||
disableLoginForm: boolean;
|
disableLoginForm: boolean;
|
||||||
|
disableSignup: boolean;
|
||||||
enableRapidAPI: boolean;
|
enableRapidAPI: boolean;
|
||||||
segment: {
|
segment: {
|
||||||
apiKey: string;
|
apiKey: string;
|
||||||
|
|
@ -72,6 +73,7 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
|
||||||
? process.env.REACT_APP_OAUTH2_GITHUB_CLIENT_ID.length > 0
|
? process.env.REACT_APP_OAUTH2_GITHUB_CLIENT_ID.length > 0
|
||||||
: false,
|
: false,
|
||||||
disableLoginForm: !!process.env.APPSMITH_FORM_LOGIN_DISABLED,
|
disableLoginForm: !!process.env.APPSMITH_FORM_LOGIN_DISABLED,
|
||||||
|
disableSignup: !!process.env.APPSMITH_SIGNUP_DISABLED,
|
||||||
segment: {
|
segment: {
|
||||||
apiKey: process.env.REACT_APP_SEGMENT_KEY || "",
|
apiKey: process.env.REACT_APP_SEGMENT_KEY || "",
|
||||||
ceKey: process.env.REACT_APP_SEGMENT_CE_KEY || "",
|
ceKey: process.env.REACT_APP_SEGMENT_CE_KEY || "",
|
||||||
|
|
@ -253,6 +255,8 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
|
||||||
APPSMITH_FEATURE_CONFIGS.enableGithubOAuth,
|
APPSMITH_FEATURE_CONFIGS.enableGithubOAuth,
|
||||||
disableLoginForm:
|
disableLoginForm:
|
||||||
ENV_CONFIG.disableLoginForm || APPSMITH_FEATURE_CONFIGS.disableLoginForm,
|
ENV_CONFIG.disableLoginForm || APPSMITH_FEATURE_CONFIGS.disableLoginForm,
|
||||||
|
disableSignup:
|
||||||
|
ENV_CONFIG.disableSignup || APPSMITH_FEATURE_CONFIGS.disableSignup,
|
||||||
enableGoogleOAuth:
|
enableGoogleOAuth:
|
||||||
ENV_CONFIG.enableGoogleOAuth ||
|
ENV_CONFIG.enableGoogleOAuth ||
|
||||||
APPSMITH_FEATURE_CONFIGS.enableGoogleOAuth,
|
APPSMITH_FEATURE_CONFIGS.enableGoogleOAuth,
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,7 @@ export interface AppsmithUIConfigs {
|
||||||
enableGoogleOAuth: boolean;
|
enableGoogleOAuth: boolean;
|
||||||
enableGithubOAuth: boolean;
|
enableGithubOAuth: boolean;
|
||||||
disableLoginForm: boolean;
|
disableLoginForm: boolean;
|
||||||
|
disableSignup: boolean;
|
||||||
enableMixpanel: boolean;
|
enableMixpanel: boolean;
|
||||||
enableTNCPP: boolean;
|
enableTNCPP: boolean;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ import PerformanceTracker, {
|
||||||
} from "utils/PerformanceTracker";
|
} from "utils/PerformanceTracker";
|
||||||
import { getIsSafeRedirectURL } from "utils/helpers";
|
import { getIsSafeRedirectURL } from "utils/helpers";
|
||||||
import { getCurrentUser } from "selectors/usersSelectors";
|
import { getCurrentUser } from "selectors/usersSelectors";
|
||||||
const { disableLoginForm } = getAppsmithConfigs();
|
const { disableLoginForm, disableSignup } = getAppsmithConfigs();
|
||||||
|
|
||||||
const validate = (values: LoginFormValues) => {
|
const validate = (values: LoginFormValues) => {
|
||||||
const errors: LoginFormValues = {};
|
const errors: LoginFormValues = {};
|
||||||
|
|
@ -113,7 +113,7 @@ export function Login(props: LoginFormProps) {
|
||||||
<AuthCardHeader>
|
<AuthCardHeader>
|
||||||
<h1>{createMessage(LOGIN_PAGE_TITLE)}</h1>
|
<h1>{createMessage(LOGIN_PAGE_TITLE)}</h1>
|
||||||
</AuthCardHeader>
|
</AuthCardHeader>
|
||||||
{!disableLoginForm && (
|
{!disableSignup && (
|
||||||
<SignUpLinkSection>
|
<SignUpLinkSection>
|
||||||
{createMessage(NEW_TO_APPSMITH)}
|
{createMessage(NEW_TO_APPSMITH)}
|
||||||
<AuthCardNavLink
|
<AuthCardNavLink
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ declare global {
|
||||||
grecaptcha: any;
|
grecaptcha: any;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const { disableLoginForm, googleRecaptchaSiteKey } = getAppsmithConfigs();
|
const { disableSignup, googleRecaptchaSiteKey } = getAppsmithConfigs();
|
||||||
|
|
||||||
const validate = (values: SignupFormValues) => {
|
const validate = (values: SignupFormValues) => {
|
||||||
const errors: SignupFormValues = {};
|
const errors: SignupFormValues = {};
|
||||||
|
|
@ -87,7 +87,7 @@ type SignUpFormProps = InjectedFormProps<
|
||||||
export function SignUp(props: SignUpFormProps) {
|
export function SignUp(props: SignUpFormProps) {
|
||||||
const history = useHistory();
|
const history = useHistory();
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (disableLoginForm) {
|
if (disableSignup) {
|
||||||
history.replace(AUTH_LOGIN_URL);
|
history.replace(AUTH_LOGIN_URL);
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user