awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-13 22:29:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts for variable imports

Browse Source
This commit is contained in:
Tuan Dang
2023-05-03 19:30:30 +03:00
parent 099cee7f39 ca31a70032
commit c766686670
10 changed files with 82 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/package-lock.json
Generated
+22 -22
View File
@@ -22,7 +22,7 @@
"axios": "^1.3.5",
"axios-retry": "^3.4.0",
"bcrypt": "^5.1.0",
"bigint-conversion": "^2.2.2",
"bigint-conversion": "^2.4.0",
"builder-pattern": "^2.2.0",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
@@ -39,7 +39,7 @@
"jsrp": "^0.2.4",
"libsodium-wrappers": "^0.7.10",
"lodash": "^4.17.21",
"mongoose": "^6.10.4",
"mongoose": "^6.10.5",
"nodemailer": "^6.8.0",
"posthog-node": "^2.6.0",
"query-string": "^7.1.3",
@@ -3171,9 +3171,9 @@
}
},
"node_modules/@juanelas/base64": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/@juanelas/base64/-/base64-1.0.5.tgz",
"integrity": "sha512-gTIElNo4ohMcYUZzol/Hb6DYJzphxl0b1B4egJJ+JiqxqcOcWx4XLMAB+lhWuMsMX3uR1oc5hwPusU3lgc1FkQ=="
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@juanelas/base64/-/base64-1.1.2.tgz",
"integrity": "sha512-mr2pfRQpWap0Uq4tlrCgp3W+Yjx1/Bpq4QJsYeAQUh1mExgyQvXz7xUhmYT2HcLLspuAL5dpnos8P2QhaCSXsQ=="
},
"node_modules/@mapbox/node-pre-gyp": {
"version": "1.0.10",
@@ -4942,11 +4942,11 @@
"integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="
},
"node_modules/bigint-conversion": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/bigint-conversion/-/bigint-conversion-2.3.0.tgz",
"integrity": "sha512-U4Yzg8ygZ3m78n9weKP/6NMxN/98Pdsw6YdnDYgQO8fffL7ila31fCZIy5lCMswr4kEcyl8bGHltcHT0QdG/MQ==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/bigint-conversion/-/bigint-conversion-2.4.0.tgz",
"integrity": "sha512-PApDhrpW5qjdK8ecsBgcJ08pNMt8nNsnPxlw9a9PVPeF01tzBaeV66ogu3L9i/tEz5WhD8IvSf9ipQILujThzA==",
"dependencies": {
"@juanelas/base64": "^1.0.1"
"@juanelas/base64": "^1.1.0"
}
},
"node_modules/binary-extensions": {
@@ -8325,9 +8325,9 @@
}
},
"node_modules/mongoose": {
"version": "6.10.4",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.4.tgz",
"integrity": "sha512-xCHVVEaOuhZxbthsKYxvHexWafJqWsl03sD7y7uyyt3euLd1sQoDI8DKueeJq9+hrbWkMkAGbGzgFPTIRqenPg==",
"version": "6.10.5",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.5.tgz",
"integrity": "sha512-y4HL4/9EySec7L0gJ+pCm9heLSF45uIIvRS4fSeAFWDfe4vXW1vRZJwTz7OGkra3ZoSfRnFTo9bNZkuggDVlVA==",
"dependencies": {
"bson": "^4.7.0",
"kareem": "2.5.1",
@@ -15685,9 +15685,9 @@
}
},
"@juanelas/base64": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/@juanelas/base64/-/base64-1.0.5.tgz",
"integrity": "sha512-gTIElNo4ohMcYUZzol/Hb6DYJzphxl0b1B4egJJ+JiqxqcOcWx4XLMAB+lhWuMsMX3uR1oc5hwPusU3lgc1FkQ=="
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@juanelas/base64/-/base64-1.1.2.tgz",
"integrity": "sha512-mr2pfRQpWap0Uq4tlrCgp3W+Yjx1/Bpq4QJsYeAQUh1mExgyQvXz7xUhmYT2HcLLspuAL5dpnos8P2QhaCSXsQ=="
},
"@mapbox/node-pre-gyp": {
"version": "1.0.10",
@@ -16992,11 +16992,11 @@
"integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="
},
"bigint-conversion": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/bigint-conversion/-/bigint-conversion-2.3.0.tgz",
"integrity": "sha512-U4Yzg8ygZ3m78n9weKP/6NMxN/98Pdsw6YdnDYgQO8fffL7ila31fCZIy5lCMswr4kEcyl8bGHltcHT0QdG/MQ==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/bigint-conversion/-/bigint-conversion-2.4.0.tgz",
"integrity": "sha512-PApDhrpW5qjdK8ecsBgcJ08pNMt8nNsnPxlw9a9PVPeF01tzBaeV66ogu3L9i/tEz5WhD8IvSf9ipQILujThzA==",
"requires": {
"@juanelas/base64": "^1.0.1"
"@juanelas/base64": "^1.1.0"
}
},
"binary-extensions": {
@@ -19550,9 +19550,9 @@
}
},
"mongoose": {
"version": "6.10.4",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.4.tgz",
"integrity": "sha512-xCHVVEaOuhZxbthsKYxvHexWafJqWsl03sD7y7uyyt3euLd1sQoDI8DKueeJq9+hrbWkMkAGbGzgFPTIRqenPg==",
"version": "6.10.5",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.5.tgz",
"integrity": "sha512-y4HL4/9EySec7L0gJ+pCm9heLSF45uIIvRS4fSeAFWDfe4vXW1vRZJwTz7OGkra3ZoSfRnFTo9bNZkuggDVlVA==",
"requires": {
"bson": "^4.7.0",
"kareem": "2.5.1",
backend/package.json
+2 -2
View File
@@ -13,7 +13,7 @@
"axios": "^1.3.5",
"axios-retry": "^3.4.0",
"bcrypt": "^5.1.0",
"bigint-conversion": "^2.2.2",
"bigint-conversion": "^2.4.0",
"builder-pattern": "^2.2.0",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
@@ -30,7 +30,7 @@
"jsrp": "^0.2.4",
"libsodium-wrappers": "^0.7.10",
"lodash": "^4.17.21",
"mongoose": "^6.10.4",
"mongoose": "^6.10.5",
"nodemailer": "^6.8.0",
"posthog-node": "^2.6.0",
"query-string": "^7.1.3",
backend/src/services/smtp.ts
+8 -1
View File
@@ -3,7 +3,8 @@ import {
SMTP_HOST_SENDGRID,
SMTP_HOST_MAILGUN,
SMTP_HOST_SOCKETLABS,
SMTP_HOST_ZOHOMAIL
SMTP_HOST_ZOHOMAIL,
SMTP_HOST_GMAIL
} from '../variables';
import SMTPConnection from 'nodemailer/lib/smtp-connection';
import * as Sentry from '@sentry/node';
@@ -46,6 +47,12 @@ export const initSmtp = async () => {
}
break;
case SMTP_HOST_ZOHOMAIL:
mailOpts.requireTLS = true;
mailOpts.tls = {
ciphers: 'TLSv1.2'
}
break;
case SMTP_HOST_GMAIL:
mailOpts.requireTLS = true;
mailOpts.tls = {
ciphers: 'TLSv1.2'
backend/src/variables/index.ts
+1 -1
View File
@@ -10,4 +10,4 @@ export * from './secret';
export * from './smtp';
export * from './stripe';
export * from './token';
export * from './user';
export * from './user';
backend/src/variables/smtp.ts
+2 -1
View File
@@ -1,4 +1,5 @@
export const SMTP_HOST_SENDGRID = 'smtp.sendgrid.net';
export const SMTP_HOST_MAILGUN = 'smtp.mailgun.org';
export const SMTP_HOST_SOCKETLABS = 'smtp.socketlabs.com';
export const SMTP_HOST_ZOHOMAIL = 'smtp.zoho.com';
export const SMTP_HOST_ZOHOMAIL = 'smtp.zoho.com';
export const SMTP_HOST_GMAIL = 'smtp.gmail.com';