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

added config for signup disabling

Browse Source
This commit is contained in:
Ankita Kinger 2022-02-07 20:48:44 +05:30
parent 22384fc921
commit 1c8d804d88
9 changed files with 14 additions and 4 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

@ -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 {

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

@ -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 {

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

@ -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 {

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

@ -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__"),

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

@ -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__"),

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

@ -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,

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

@ -56,6 +56,7 @@ export interface AppsmithUIConfigs {
enableGoogleOAuth: boolean;
enableGithubOAuth: boolean;
disableLoginForm: boolean;
disableSignup: boolean;
enableMixpanel: boolean;
enableTNCPP: boolean;

4
app/client/src/ce/pages/UserAuth/Login.tsx
View File

@ -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) {
<AuthCardHeader>
<h1>{createMessage(LOGIN_PAGE_TITLE)}</h1>
</AuthCardHeader>
{!disableLoginForm && (
{!disableSignup && (
<SignUpLinkSection>
{createMessage(NEW_TO_APPSMITH)}
<AuthCardNavLink

4
app/client/src/ce/pages/UserAuth/SignUp.tsx
View File

@ -61,7 +61,7 @@ declare global {
grecaptcha: any;
}
}
const { disableLoginForm, googleRecaptchaSiteKey } = getAppsmithConfigs();
const { disableSignup, googleRecaptchaSiteKey } = getAppsmithConfigs();
const validate = (values: SignupFormValues) => {
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);
}
}, []);