+ 
diff --git a/backend/package-lock.json b/backend/package-lock.json
index 9020620dd..42c8205bd 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -31,7 +31,7 @@
"libsodium-wrappers": "^0.7.10",
"mongoose": "^6.7.2",
"nodemailer": "^6.8.0",
- "posthog-node": "^2.2.0",
+ "posthog-node": "^2.2.2",
"query-string": "^7.1.3",
"rimraf": "^3.0.2",
"stripe": "^10.7.0",
@@ -9810,9 +9810,9 @@
}
},
"node_modules/posthog-node": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-2.2.0.tgz",
- "integrity": "sha512-p5ltKQO6YvBNy09OmpJvcknvxBAs8MvHv1AGbXGWDdnGCwKZxa9Ln2cN5XHnzU7rYuNT7YMAVQzZ6cE7Mu1yPA==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-2.2.2.tgz",
+ "integrity": "sha512-aXYe/D+28kF63W8Cz53t09ypEORz+ULeDCahdAqhVrRm2scbOXFbtnn0GGhvMpYe45grepLKuwui9KxrZ2ZuMw==",
"dependencies": {
"axios": "^0.27.0"
},
@@ -18752,9 +18752,9 @@
}
},
"posthog-node": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-2.2.0.tgz",
- "integrity": "sha512-p5ltKQO6YvBNy09OmpJvcknvxBAs8MvHv1AGbXGWDdnGCwKZxa9Ln2cN5XHnzU7rYuNT7YMAVQzZ6cE7Mu1yPA==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-2.2.2.tgz",
+ "integrity": "sha512-aXYe/D+28kF63W8Cz53t09ypEORz+ULeDCahdAqhVrRm2scbOXFbtnn0GGhvMpYe45grepLKuwui9KxrZ2ZuMw==",
"requires": {
"axios": "^0.27.0"
},
diff --git a/backend/package.json b/backend/package.json
index 329e027b5..266bb7b39 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -22,7 +22,7 @@
"libsodium-wrappers": "^0.7.10",
"mongoose": "^6.7.2",
"nodemailer": "^6.8.0",
- "posthog-node": "^2.2.0",
+ "posthog-node": "^2.2.2",
"query-string": "^7.1.3",
"rimraf": "^3.0.2",
"stripe": "^10.7.0",
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 43a9026ac..08fb1862e 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -25,9 +25,9 @@ const POSTHOG_PROJECT_API_KEY =
'phc_nSin8j5q2zdhpFDI1ETmFNUIuTG4DwKVyIigrY10XiE';
const SENTRY_DSN = process.env.SENTRY_DSN!;
const SITE_URL = process.env.SITE_URL!;
-const SMTP_HOST = process.env.SMTP_HOST! || 'smtp.gmail.com';
-const SMTP_SECURE = process.env.SMTP_SECURE! || false;
-const SMTP_PORT = process.env.SMTP_PORT! || 587;
+const SMTP_HOST = process.env.SMTP_HOST!;
+const SMTP_SECURE = process.env.SMTP_SECURE! === 'true' || false;
+const SMTP_PORT = parseInt(process.env.SMTP_PORT!) || 587;
const SMTP_USERNAME = process.env.SMTP_USERNAME!;
const SMTP_PASSWORD = process.env.SMTP_PASSWORD!;
const SMTP_FROM_ADDRESS = process.env.SMTP_FROM_ADDRESS!;
diff --git a/backend/src/integrations/exchange.ts b/backend/src/integrations/exchange.ts
index dafddc785..cb0ff84e0 100644
--- a/backend/src/integrations/exchange.ts
+++ b/backend/src/integrations/exchange.ts
@@ -9,8 +9,7 @@ import {
INTEGRATION_VERCEL_TOKEN_URL,
INTEGRATION_NETLIFY_TOKEN_URL,
INTEGRATION_GITHUB_TOKEN_URL,
- INTEGRATION_GITHUB_API_URL,
- ACTION_PUSH_TO_HEROKU
+ INTEGRATION_GITHUB_API_URL
} from '../variables';
import {
SITE_URL,
diff --git a/backend/src/services/smtp.ts b/backend/src/services/smtp.ts
index 14d543439..12841eee7 100644
--- a/backend/src/services/smtp.ts
+++ b/backend/src/services/smtp.ts
@@ -1,13 +1,14 @@
import nodemailer from 'nodemailer';
import { SMTP_HOST, SMTP_PORT, SMTP_USERNAME, SMTP_PASSWORD, SMTP_SECURE } from '../config';
+import { SMTP_HOST_SENDGRID, SMTP_HOST_MAILGUN } from '../variables';
import SMTPConnection from 'nodemailer/lib/smtp-connection';
import * as Sentry from '@sentry/node';
const mailOpts: SMTPConnection.Options = {
host: SMTP_HOST,
- secure: SMTP_SECURE as boolean,
port: SMTP_PORT as number
};
+
if (SMTP_USERNAME && SMTP_PASSWORD) {
mailOpts.auth = {
user: SMTP_USERNAME,
@@ -15,6 +16,23 @@ if (SMTP_USERNAME && SMTP_PASSWORD) {
};
}
+if (SMTP_SECURE) {
+ switch (SMTP_HOST) {
+ case SMTP_HOST_SENDGRID:
+ mailOpts.requireTLS = true;
+ break;
+ case SMTP_HOST_MAILGUN:
+ mailOpts.requireTLS = true;
+ mailOpts.tls = {
+ ciphers: 'TLSv1.2'
+ }
+ break;
+ default:
+ mailOpts.secure = true;
+ break;
+ }
+}
+
export const initSmtp = () => {
const transporter = nodemailer.createTransport(mailOpts);
transporter
diff --git a/backend/src/variables/action.ts b/backend/src/variables/action.ts
deleted file mode 100644
index 1f913bbe9..000000000
--- a/backend/src/variables/action.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-const ACTION_PUSH_TO_HEROKU = 'pushToHeroku';
-
-export {
- ACTION_PUSH_TO_HEROKU
-}
\ No newline at end of file
diff --git a/backend/src/variables/index.ts b/backend/src/variables/index.ts
index c69ed8176..e284d6d5c 100644
--- a/backend/src/variables/index.ts
+++ b/backend/src/variables/index.ts
@@ -32,9 +32,9 @@ import {
GRANTED
} from './organization';
import { SECRET_SHARED, SECRET_PERSONAL } from './secret';
-import { PLAN_STARTER, PLAN_PRO } from './stripe';
import { EVENT_PUSH_SECRETS, EVENT_PULL_SECRETS } from './event';
-import { ACTION_PUSH_TO_HEROKU } from './action';
+import { SMTP_HOST_SENDGRID, SMTP_HOST_MAILGUN } from './smtp';
+import { PLAN_STARTER, PLAN_PRO } from './stripe';
export {
OWNER,
@@ -44,8 +44,6 @@ export {
ACCEPTED,
COMPLETED,
GRANTED,
- PLAN_STARTER,
- PLAN_PRO,
SECRET_SHARED,
SECRET_PERSONAL,
ENV_DEV,
@@ -69,6 +67,9 @@ export {
INTEGRATION_GITHUB_API_URL,
EVENT_PUSH_SECRETS,
EVENT_PULL_SECRETS,
- ACTION_PUSH_TO_HEROKU,
- INTEGRATION_OPTIONS
+ INTEGRATION_OPTIONS,
+ SMTP_HOST_SENDGRID,
+ SMTP_HOST_MAILGUN,
+ PLAN_STARTER,
+ PLAN_PRO,
};
diff --git a/backend/src/variables/smtp.ts b/backend/src/variables/smtp.ts
new file mode 100644
index 000000000..4db7c9f12
--- /dev/null
+++ b/backend/src/variables/smtp.ts
@@ -0,0 +1,7 @@
+const SMTP_HOST_SENDGRID = 'smtp.sendgrid.net';
+const SMTP_HOST_MAILGUN = 'smtp.mailgun.org';
+
+export {
+ SMTP_HOST_SENDGRID,
+ SMTP_HOST_MAILGUN
+}
\ No newline at end of file
diff --git a/docs/contributing/FAQ.mdx b/docs/contributing/FAQ.mdx
deleted file mode 100644
index 9f4f7aee9..000000000
--- a/docs/contributing/FAQ.mdx
+++ /dev/null
@@ -1,18 +0,0 @@
----
-title: 'Frequently Asked Questions'
-description: 'Have any questions? [Join our Slack community](https://join.slack.com/t/infisical-users/shared_invite/zt-1kdbk07ro-RtoyEt_9E~fyzGo_xQYP6g).'
----
-
-## Problem with SMTP
-
-If you opt for actual SMTP server (not the local MailHog), you have to have the right environment variables set.
-
-You can normally populate `SMTP_USERNAME` and `SMTP_PASSWORD` with your usual login and password (you could also create a 'burner' email). Sometimes, there still are problems.
-
-You can go to your Gmail account settings > security and enable “less secure apps”. This would allow Infisical to use your Gmail to send emails.
-
-If it still doesn't work, [this](https://stackoverflow.com/questions/72547853/unable-to-send-email-in-c-sharp-less-secure-app-access-not-longer-available/72553362#72553362) should help.
-
-## `MONGO_URL` issues
-
-Your `MONGO_URL` should be something like `mongodb://root:example@mongo:27017/?authSource=admin`. If you want to change it (not recommended), you should make sure that you keep this URL in line with `MONGO_USERNAME=root` and `MONGO_PASSWORD=example`.
diff --git a/docs/contributing/developing.mdx b/docs/contributing/developing.mdx
index 812025dbc..423b83da2 100644
--- a/docs/contributing/developing.mdx
+++ b/docs/contributing/developing.mdx
@@ -16,53 +16,43 @@ cd infisical
## Set up environment variables
-Start by creating a .env file at the root of the Infisical directory
+Start by creating a .env file at the root of the Infisical directory. It's best to start with the provided [`.env.example`](https://github.com/Infisical/infisical/blob/main/.env.example) template containing the necessary envars to fill out your .env file — you only have to modify the SMTP parameters.
+
+Oops, something went wrong
+Think this is a mistake? Email team@infisical.com and we`ll fix it!
+ + Go to Dashboard + +- {"Let'"}s get started + {'Let\''}s get started
- {"We've"} sent a verification email to{' '} + {'We\'ve'} sent a verification email to{' '}
{email}{' '} @@ -328,13 +340,16 @@ export default function SignUp() {
Make sure to check your spam inbox.
@@ -382,7 +397,7 @@ export default function SignUp() { setPasswordErrorLength, setPasswordErrorNumber, setPasswordErrorLowerCase, - currentErrorCheck: false + currentErrorCheck: false, }); }} type="password" @@ -506,7 +521,7 @@ export default function SignUp() { password, personalName: firstName + ' ' + lastName, setBackupKeyError, - setBackupKeyIssued + setBackupKeyIssued, }); const userWorkspaces = await getWorkspaces(); const userWorkspace = userWorkspaces[0]._id; diff --git a/frontend/public/images/dragon-404.svg b/frontend/public/images/dragon-404.svg new file mode 100644 index 000000000..dcd7f715a --- /dev/null +++ b/frontend/public/images/dragon-404.svg @@ -0,0 +1,475 @@ + + \ No newline at end of file