awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 15:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into service-account

Browse Source
This commit is contained in:
Tuan Dang
2023-04-04 11:08:28 +03:00
parent aa53de9070 84d46a428c
commit 35d345f17e
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/package-lock.json
Generated
+8 -8
View File
@@ -38,7 +38,7 @@
"jsrp": "^0.2.4", "jsrp": "^0.2.4",
"libsodium-wrappers": "^0.7.10", "libsodium-wrappers": "^0.7.10",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mongoose": "^6.10.1", "mongoose": "^6.10.2",
"nodemailer": "^6.8.0", "nodemailer": "^6.8.0",
"posthog-node": "^2.5.4", "posthog-node": "^2.5.4",
"query-string": "^7.1.3", "query-string": "^7.1.3",
@@ -7624,9 +7624,9 @@
} }
}, },
"node_modules/mongoose": { "node_modules/mongoose": {
"version": "6.10.1", "version": "6.10.2",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.1.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.2.tgz",
"integrity": "sha512-QBXX27XXCEIi1zqimTBjlZsFFg2YzK9uQfuAIqG1AyIEeyKiiCaobD0Tst2ULwiX4PRB53VLRQvAqyu5TwvOZg==", "integrity": "sha512-9/AbheG2PiVVBWLx3S6LgCIEQNdMppjdnp/WH9nLGjFzjJeb9LiHNPEtsOGOm8qXmuICHMdbn5iUFAsLWWvpEw==",
"dependencies": { "dependencies": {
"bson": "^4.7.0", "bson": "^4.7.0",
"kareem": "2.5.1", "kareem": "2.5.1",
@@ -7637,7 +7637,7 @@
"sift": "16.0.1" "sift": "16.0.1"
}, },
"engines": { "engines": {
"node": ">=14.0.0" "node": ">=12.0.0"
}, },
"funding": { "funding": {
"type": "opencollective", "type": "opencollective",
@@ -18285,9 +18285,9 @@
} }
}, },
"mongoose": { "mongoose": {
"version": "6.10.1", "version": "6.10.2",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.1.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.2.tgz",
"integrity": "sha512-QBXX27XXCEIi1zqimTBjlZsFFg2YzK9uQfuAIqG1AyIEeyKiiCaobD0Tst2ULwiX4PRB53VLRQvAqyu5TwvOZg==", "integrity": "sha512-9/AbheG2PiVVBWLx3S6LgCIEQNdMppjdnp/WH9nLGjFzjJeb9LiHNPEtsOGOm8qXmuICHMdbn5iUFAsLWWvpEw==",
"requires": { "requires": {
"bson": "^4.7.0", "bson": "^4.7.0",
"kareem": "2.5.1", "kareem": "2.5.1",
backend/package.json
+1 -1
View File
@@ -29,7 +29,7 @@
"jsrp": "^0.2.4", "jsrp": "^0.2.4",
"libsodium-wrappers": "^0.7.10", "libsodium-wrappers": "^0.7.10",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mongoose": "^6.10.1", "mongoose": "^6.10.2",
"nodemailer": "^6.8.0", "nodemailer": "^6.8.0",
"posthog-node": "^2.5.4", "posthog-node": "^2.5.4",
"query-string": "^7.1.3", "query-string": "^7.1.3",
frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx
+8 -5
View File
@@ -56,7 +56,7 @@ export const OrgSettingsPage = () => {
const addIncidentContact = useAddIncidentContact(); const addIncidentContact = useAddIncidentContact();
const removeIncidentContact = useDeleteIncidentContact(); const removeIncidentContact = useDeleteIncidentContact();
const [completeInviteLink, setcompleteInviteLink] = useState<string|undefined>("") const [completeInviteLink, setcompleteInviteLink] = useState<string | undefined>('');
const isMoreUsersNotAllowed = const isMoreUsersNotAllowed =
(orgUsers || []).length >= 5 && (orgUsers || []).length >= 5 &&
@@ -88,7 +88,7 @@ export const OrgSettingsPage = () => {
try { try {
await removeUserOrgMembership.mutateAsync({ orgId: currentOrg?._id, membershipId }); await removeUserOrgMembership.mutateAsync({ orgId: currentOrg?._id, membershipId });
createNotification({ createNotification({
text: 'Successfully removed used from org', text: 'Successfully removed user from org',
type: 'success' type: 'success'
}); });
} catch (error) { } catch (error) {
@@ -103,11 +103,14 @@ export const OrgSettingsPage = () => {
if (!currentOrg?._id) return; if (!currentOrg?._id) return;
try { try {
const {data} = await addUserToOrg.mutateAsync({ organizationId: currentOrg?._id, inviteeEmail: email }); const { data } = await addUserToOrg.mutateAsync({
setcompleteInviteLink(data?.completeInviteLink) organizationId: currentOrg?._id,
inviteeEmail: email
});
setcompleteInviteLink(data?.completeInviteLink);
// only show this notification when email is configured. A [completeInviteLink] will not be sent if smtp is configured // only show this notification when email is configured. A [completeInviteLink] will not be sent if smtp is configured
if (!data.completeInviteLink){ if (!data.completeInviteLink) {
createNotification({ createNotification({
text: 'Successfully invited user to the organization.', text: 'Successfully invited user to the organization.',
type: 'success' type: 'success'