diff --git a/README.md b/README.md index 64e051ac5..761f6135a 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ Not sure where to get started? [Book a free, non-pressure pairing sessions with - [GitHub Discussions](https://github.com/Infisical/infisical/discussions) for help with building and discussion. - [GitHub Issues](https://github.com/Infisical/infisical-cli/issues) for any bugs and errors you encounter using Infisical. -- [Community Slack](https://join.slack.com/t/infisical/shared_invite/zt-1dgg63ln8-G7PCNJdCymAT9YF3j1ewVA) for hanging out with the community and quick communication with the team. +- [Community Slack](https://join.slack.com/t/infisical-users/shared_invite/zt-1kdbk07ro-RtoyEt_9E~fyzGo_xQYP6g) for hanging out with the community and quick communication with the team. ## Status diff --git a/frontend/components/basic/dialog/AddServiceTokenDialog.js b/frontend/components/basic/dialog/AddServiceTokenDialog.js index 0e084d29d..8f5419502 100644 --- a/frontend/components/basic/dialog/AddServiceTokenDialog.js +++ b/frontend/components/basic/dialog/AddServiceTokenDialog.js @@ -8,7 +8,7 @@ import nacl from "tweetnacl"; import addServiceToken from "~/pages/api/serviceToken/addServiceToken"; import getLatestFileKey from "~/pages/api/workspace/getLatestFileKey"; -import { decryptAssymmetric, encryptAssymmetric } from "../../utilities/crypto"; +import { decryptAssymmetric, encryptAssymmetric } from "../../utilities/cryptography/crypto"; import Button from "../buttons/Button"; import InputField from "../InputField"; import ListBox from "../Listbox"; diff --git a/frontend/components/basic/layout.js b/frontend/components/basic/layout.js index 382eb2777..edac0dc9b 100644 --- a/frontend/components/basic/layout.js +++ b/frontend/components/basic/layout.js @@ -20,7 +20,7 @@ import createWorkspace from "~/pages/api/workspace/createWorkspace"; import getWorkspaces from "~/pages/api/workspace/getWorkspaces"; import NavBarDashboard from "../navigation/NavBarDashboard"; -import { decryptAssymmetric, encryptAssymmetric } from "../utilities/crypto"; +import { decryptAssymmetric, encryptAssymmetric } from "../utilities/cryptography/crypto"; import Button from "./buttons/Button"; import AddWorkspaceDialog from "./dialog/AddWorkspaceDialog"; import Listbox from "./Listbox"; diff --git a/frontend/components/basic/table/UserTable.js b/frontend/components/basic/table/UserTable.js index a09ff6e16..4d364b4a5 100644 --- a/frontend/components/basic/table/UserTable.js +++ b/frontend/components/basic/table/UserTable.js @@ -15,7 +15,7 @@ import Listbox from "../Listbox"; const { decryptAssymmetric, encryptAssymmetric, -} = require("../../utilities/crypto"); +} = require("../../utilities/cryptography/crypto"); const nacl = require("tweetnacl"); nacl.util = require("tweetnacl-util"); diff --git a/frontend/components/billing/Card.js b/frontend/components/billing/Card.js deleted file mode 100644 index 07f91b07a..000000000 --- a/frontend/components/billing/Card.js +++ /dev/null @@ -1,75 +0,0 @@ -import React from "react"; -import { faCcMastercard, faCcVisa } from "@fortawesome/free-brands-svg-icons"; -import { faCheck, faQuestionCircle } from "@fortawesome/free-solid-svg-icons"; -import { faCircle } from "@fortawesome/free-solid-svg-icons"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; - -export default function Card({ card, changeSelectedCard, selected }) { - function creditCardBrandIcon(cc) { - if (cc == "visa") { - return faCcVisa; - } else if ((cc = "mastercard")) { - return faCcMastercard; - } else return faQuestionCircle; - } - - return ( - - ); -} diff --git a/frontend/components/navigation/NavBarDashboard.js b/frontend/components/navigation/NavBarDashboard.js index 154bf0a55..d4f0c704a 100644 --- a/frontend/components/navigation/NavBarDashboard.js +++ b/frontend/components/navigation/NavBarDashboard.js @@ -27,8 +27,8 @@ import guidGenerator from "../utilities/randomId"; const supportOptions = [ [ , - "[NEW] Join Slack Forum", - "https://join.slack.com/t/infisical/shared_invite/zt-1dgg63ln8-G7PCNJdCymAT9YF3j1ewVA", + "Join Slack Forum", + "https://join.slack.com/t/infisical-users/shared_invite/zt-1kdbk07ro-RtoyEt_9E~fyzGo_xQYP6g", ], [ , diff --git a/frontend/components/utilities/attemptLogin.js b/frontend/components/utilities/attemptLogin.js index bbf0ba72c..53c56789b 100644 --- a/frontend/components/utilities/attemptLogin.js +++ b/frontend/components/utilities/attemptLogin.js @@ -1,4 +1,4 @@ -import Aes256Gcm from "~/components/aes-256-gcm"; +import Aes256Gcm from "~/components/utilities/cryptography/aes-256-gcm"; import login1 from "~/pages/api/auth/Login1"; import login2 from "~/pages/api/auth/Login2"; import getOrganizations from "~/pages/api/organization/getOrgs"; @@ -6,7 +6,7 @@ import getOrganizationUserProjects from "~/pages/api/organization/GetOrgUserProj import { initPostHog } from "../analytics/posthog"; import { ENV } from "./config"; -import pushKeys from "./pushKeys"; +import pushKeys from "./secrets/pushKeys"; import SecurityClient from "./SecurityClient"; const nacl = require("tweetnacl"); diff --git a/frontend/components/aes-256-gcm.js b/frontend/components/utilities/cryptography/aes-256-gcm.js similarity index 100% rename from frontend/components/aes-256-gcm.js rename to frontend/components/utilities/cryptography/aes-256-gcm.js diff --git a/frontend/components/utilities/changePassword.js b/frontend/components/utilities/cryptography/changePassword.js similarity index 95% rename from frontend/components/utilities/changePassword.js rename to frontend/components/utilities/cryptography/changePassword.js index 4e2b375aa..1951d5885 100644 --- a/frontend/components/utilities/changePassword.js +++ b/frontend/components/utilities/cryptography/changePassword.js @@ -1,7 +1,7 @@ import changePassword2 from "~/pages/api/auth/ChangePassword2"; import SRP1 from "~/pages/api/auth/SRP1"; -import Aes256Gcm from "../aes-256-gcm"; +import Aes256Gcm from "./aes-256-gcm"; const nacl = require("tweetnacl"); nacl.util = require("tweetnacl-util"); @@ -63,6 +63,7 @@ const changePassword = async ( async () => { clientNewPassword.createVerifier( async (err, result) => { + // The Blob part here is needed to account for symbols that count as 2+ bytes (e.g., é, å, ø) let { ciphertext, iv, tag } = Aes256Gcm.encrypt( localStorage.getItem("PRIVATE_KEY"), newPassword diff --git a/frontend/components/utilities/crypto.js b/frontend/components/utilities/cryptography/crypto.js similarity index 98% rename from frontend/components/utilities/crypto.js rename to frontend/components/utilities/cryptography/crypto.js index eac908e29..f7c0388fa 100644 --- a/frontend/components/utilities/crypto.js +++ b/frontend/components/utilities/cryptography/crypto.js @@ -1,6 +1,6 @@ const nacl = require("tweetnacl"); nacl.util = require("tweetnacl-util"); -const aes = require("../aes-256-gcm"); +const aes = require("./aes-256-gcm"); /** * Return assymmetrically encrypted [plaintext] using [publicKey] where diff --git a/frontend/components/utilities/issueBackupKey.js b/frontend/components/utilities/cryptography/issueBackupKey.js similarity index 96% rename from frontend/components/utilities/issueBackupKey.js rename to frontend/components/utilities/cryptography/issueBackupKey.js index cd2bc6a2d..570c8bc1a 100644 --- a/frontend/components/utilities/issueBackupKey.js +++ b/frontend/components/utilities/cryptography/issueBackupKey.js @@ -1,8 +1,8 @@ import issueBackupPrivateKey from "~/pages/api/auth/IssueBackupPrivateKey"; import SRP1 from "~/pages/api/auth/SRP1"; -import Aes256Gcm from "../aes-256-gcm"; -import generateBackupPDF from "./generateBackupPDF"; +import Aes256Gcm from "./aes-256-gcm"; +import generateBackupPDF from "../generateBackupPDF"; const nacl = require("tweetnacl"); nacl.util = require("tweetnacl-util"); diff --git a/frontend/components/utilities/csp.js b/frontend/components/utilities/csp.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/frontend/components/utilities/getSecretsForProject.js b/frontend/components/utilities/secrets/getSecretsForProject.js similarity index 96% rename from frontend/components/utilities/getSecretsForProject.js rename to frontend/components/utilities/secrets/getSecretsForProject.js index bec41b15f..4087e72d0 100644 --- a/frontend/components/utilities/getSecretsForProject.js +++ b/frontend/components/utilities/secrets/getSecretsForProject.js @@ -1,11 +1,11 @@ import getSecrets from "~/pages/api/files/GetSecrets"; -import guidGenerator from "./randomId"; +import guidGenerator from "../randomId"; const { decryptAssymmetric, decryptSymmetric, -} = require("../../components/utilities/crypto"); +} = require("../cryptography/crypto"); const nacl = require("tweetnacl"); nacl.util = require("tweetnacl-util"); diff --git a/frontend/components/utilities/pushKeys.js b/frontend/components/utilities/secrets/pushKeys.js similarity index 98% rename from frontend/components/utilities/pushKeys.js rename to frontend/components/utilities/secrets/pushKeys.js index c43b1cc1d..16b095632 100644 --- a/frontend/components/utilities/pushKeys.js +++ b/frontend/components/utilities/secrets/pushKeys.js @@ -8,7 +8,7 @@ const { decryptSymmetric, encryptSymmetric, encryptAssymmetric, -} = require("../../components/utilities/crypto"); +} = require("../cryptography/crypto"); const nacl = require("tweetnacl"); nacl.util = require("tweetnacl-util"); diff --git a/frontend/components/utilities/pushKeysIntegration.js b/frontend/components/utilities/secrets/pushKeysIntegration.js similarity index 95% rename from frontend/components/utilities/pushKeysIntegration.js rename to frontend/components/utilities/secrets/pushKeysIntegration.js index 06ad8c0e6..3f1bc6ee4 100644 --- a/frontend/components/utilities/pushKeysIntegration.js +++ b/frontend/components/utilities/secrets/pushKeysIntegration.js @@ -2,7 +2,7 @@ import publicKeyInfical from "~/pages/api/auth/publicKeyInfisical"; import changeHerokuConfigVars from "~/pages/api/integrations/ChangeHerokuConfigVars"; const crypto = require("crypto"); -const { encryptSymmetric, encryptAssymmetric } = require("./crypto"); +const { encryptSymmetric, encryptAssymmetric } = require("../cryptography/crypto"); const nacl = require("tweetnacl"); nacl.util = require("tweetnacl-util"); diff --git a/frontend/pages/dashboard/[id].js b/frontend/pages/dashboard/[id].js index 50db8a45e..a8195bb27 100644 --- a/frontend/pages/dashboard/[id].js +++ b/frontend/pages/dashboard/[id].js @@ -29,9 +29,9 @@ import BottonRightPopup from "~/components/basic/popups/BottomRightPopup"; import DashboardInputField from "~/components/dashboard/DashboardInputField"; import DropZone from "~/components/dashboard/DropZone"; import NavHeader from "~/components/navigation/NavHeader"; -import getSecretsForProject from "~/utilities/getSecretsForProject"; -import pushKeys from "~/utilities/pushKeys"; -import pushKeysIntegration from "~/utilities/pushKeysIntegration"; +import getSecretsForProject from "~/components/utilities/secrets/getSecretsForProject"; +import pushKeys from "~/components/utilities/secrets/pushKeys"; +import pushKeysIntegration from "~/components/utilities/secrets/pushKeysIntegration"; import guidGenerator from "~/utilities/randomId"; import getWorkspaceIntegrations from "../api/integrations/getWorkspaceIntegrations"; @@ -699,7 +699,7 @@ export default function Dashboard() { data?.length > 8 ? "h-3/4" : "h-min" }`} > -
+
{/* */}

diff --git a/frontend/pages/integrations/[id].js b/frontend/pages/integrations/[id].js index 35a9a6f06..9ae9c1c7c 100644 --- a/frontend/pages/integrations/[id].js +++ b/frontend/pages/integrations/[id].js @@ -13,8 +13,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import Button from "~/components/basic/buttons/Button"; import ListBox from "~/components/basic/Listbox"; import NavHeader from "~/components/navigation/NavHeader"; -import getSecretsForProject from "~/utilities/getSecretsForProject"; -import pushKeysIntegration from "~/utilities/pushKeysIntegration"; +import getSecretsForProject from "~/components/utilities/secrets/getSecretsForProject"; +import pushKeysIntegration from "~/components/utilities/secrets/pushKeysIntegration"; import guidGenerator from "~/utilities/randomId"; import deleteIntegration from "../api/integrations/DeleteIntegration"; diff --git a/frontend/pages/settings/personal/[id].js b/frontend/pages/settings/personal/[id].js index 2b5b90a35..9c4ad59bd 100644 --- a/frontend/pages/settings/personal/[id].js +++ b/frontend/pages/settings/personal/[id].js @@ -6,9 +6,9 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import Button from "~/components/basic/buttons/Button"; import InputField from "~/components/basic/InputField"; import NavHeader from "~/components/navigation/NavHeader"; -import changePassword from "~/utilities/changePassword"; +import changePassword from "~/components/utilities/cryptography/changePassword"; import passwordCheck from "~/utilities/checks/PasswordCheck"; -import issueBackupKey from "~/utilities/issueBackupKey"; +import issueBackupKey from "~/components/utilities/cryptography/issueBackupKey"; import getUser from "../../api/user/getUser"; diff --git a/frontend/pages/signup.js b/frontend/pages/signup.js index 3998bcf42..e9f000ed2 100644 --- a/frontend/pages/signup.js +++ b/frontend/pages/signup.js @@ -7,13 +7,13 @@ import { useRouter } from "next/router"; import { faCheck, faWarning, faX } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import Aes256Gcm from "~/components/aes-256-gcm"; +import Aes256Gcm from "~/components/utilities/cryptography/aes-256-gcm"; import Button from "~/components/basic/buttons/Button"; import Error from "~/components/basic/Error"; import InputField from "~/components/basic/InputField"; import attemptLogin from "~/utilities/attemptLogin"; import passwordCheck from "~/utilities/checks/PasswordCheck"; -import issueBackupKey from "~/utilities/issueBackupKey"; +import issueBackupKey from "~/components/utilities/cryptography/issueBackupKey"; import checkEmailVerificationCode from "./api/auth/CheckEmailVerificationCode"; import completeAccountInformationSignup from "./api/auth/CompleteAccountInformationSignup"; diff --git a/frontend/pages/signupinvite.js b/frontend/pages/signupinvite.js index 0f6a5c1c4..256bbb83f 100644 --- a/frontend/pages/signupinvite.js +++ b/frontend/pages/signupinvite.js @@ -6,12 +6,12 @@ import { useRouter } from "next/router"; import { faCheck, faWarning,faX } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import Aes256Gcm from "~/components/aes-256-gcm"; +import Aes256Gcm from "~/components/utilities/cryptography/aes-256-gcm"; import Button from "~/components/basic/buttons/Button"; import InputField from "~/components/basic/InputField"; import attemptLogin from "~/utilities/attemptLogin"; import passwordCheck from "~/utilities/checks/PasswordCheck"; -import issueBackupKey from "~/utilities/issueBackupKey"; +import issueBackupKey from "~/components/utilities/cryptography/issueBackupKey"; import completeAccountInformationSignupInvite from "./api/auth/CompleteAccountInformationSignupInvite"; import verifySignupInvite from "./api/auth/VerifySignupInvite"; diff --git a/frontend/pages/users/[id].js b/frontend/pages/users/[id].js index 0d1fd7d3d..f46abdf1d 100644 --- a/frontend/pages/users/[id].js +++ b/frontend/pages/users/[id].js @@ -23,7 +23,7 @@ const crypto = require("crypto"); const { decryptAssymmetric, encryptAssymmetric, -} = require("../../components/utilities/crypto"); +} = require("../../components/utilities/cryptography/crypto"); const nacl = require("tweetnacl"); nacl.util = require("tweetnacl-util");