Merge branch 'main' of https://github.com/Infisical/infisical

frontend/components/basic/Listbox.tsx

@@ -11,7 +11,7 @@ import { Listbox, Transition } from "@headlessui/react";
 interface ListBoxProps {
   selected: string;
   onChange: (arg: string) => void;
-  data: string[];
+  data: string[] | null;
   text?: string;
   buttonAction?: () => void;
   isFull?: boolean;

frontend/components/basic/dialog/ActivateBotDialog.js

@@ -1,7 +1,8 @@
 import { Fragment } from "react";
 import { Dialog, Transition } from "@headlessui/react";
-import getLatestFileKey from "../../../pages/api/workspace/getLatestFileKey";
+
 import setBotActiveStatus from "../../../pages/api/bot/setBotActiveStatus";
+import getLatestFileKey from "../../../pages/api/workspace/getLatestFileKey";
 import { 
     decryptAssymmetric,
     encryptAssymmetric

frontend/components/basic/dialog/IntegrationAccessTokenDialog.js

@@ -1,7 +1,8 @@
 import { Fragment } from "react";
 import { Dialog, Transition } from "@headlessui/react";
-import getLatestFileKey from "../../../pages/api/workspace/getLatestFileKey";
+
 import setBotActiveStatus from "../../../pages/api/bot/setBotActiveStatus";
+import getLatestFileKey from "../../../pages/api/workspace/getLatestFileKey";
 import { 
     decryptAssymmetric,
     encryptAssymmetric

frontend/components/integrations/Integration.tsx

@@ -14,9 +14,11 @@ import deleteIntegration from "../../pages/api/integrations/DeleteIntegration"
 import getIntegrationApps from "../../pages/api/integrations/GetIntegrationApps";
 import updateIntegration from "../../pages/api/integrations/updateIntegration"
 import {
+  contextNetlifyMapping,
   envMapping,
   reverseContextNetlifyMapping,
-  reverseEnvMapping} from "../../public/data/frequentConstants";
+  reverseEnvMapping,
+} from "../../public/data/frequentConstants";
 
 interface Integration {
     _id: string;
@@ -25,6 +27,7 @@ interface Integration {
     integration: string;
     integrationAuth: string;
     isActive: boolean;
+    context: string;
 }
 
 interface IntegrationApp {
@@ -69,7 +72,7 @@ const Integration = ({
             setIntegrationTarget("Development");
             break;
           case "netlify":
-            setIntegrationContext("All");
+            setIntegrationContext(integration?.context ? contextNetlifyMapping[integration.context] : "Local development");
             break;
           default:
             break;
@@ -93,7 +96,7 @@ const Integration = ({
                     "Production",
                     "Preview",
                     "Development"
-                  ] : []}
+                  ] : null}
                   selected={"Production"}
                   onChange={setIntegrationTarget}
                 />
@@ -107,12 +110,11 @@ const Integration = ({
                 </div>
                 <ListBox
                   data={!integration.isActive ? [
-                    "All",
                     "Production",
                     "Deploy previews",
                     "Branch deploys",
                     "Local development"
-                  ] : []}
+                  ] : null}
                   selected={integrationContext}
                   onChange={setIntegrationContext}
                 />
@@ -138,7 +140,7 @@ const Integration = ({
                   "Staging",
                   "Testing",
                   "Production",
-                ] : []}
+                ] : null}
               selected={integrationEnvironment}
               onChange={(environment) => {
                 setIntegrationEnvironment(environment);
@@ -166,7 +168,7 @@ const Integration = ({
               APP
             </div>
             <ListBox
-              data={!integration.isActive ? apps.map((app) => app.name) : []}
+              data={!integration.isActive ? apps.map((app) => app.name) : null}
               selected={integrationApp}
               onChange={(app) => {
                 setIntegrationApp(app);
@@ -190,7 +192,8 @@ const Integration = ({
                 onButtonPressed={async () => {
                   
                   const siteApp = apps.find((app) => app.name === integrationApp); // obj or undefined
-                  const siteId = siteApp ? siteApp.siteId : null;
+                  const siteId = siteApp?.siteId ? siteApp.siteId : null;
+                  
                   const result = await updateIntegration({
                     integrationId: integration._id,
                     environment: envMapping[integrationEnvironment],
@@ -200,6 +203,7 @@ const Integration = ({
                     context: integrationContext ? reverseContextNetlifyMapping[integrationContext] : null,
                     siteId
                   });
+
                   router.reload();
                 }}
                 color="mineshaft"

frontend/components/integrations/IntegrationSection.tsx

@@ -15,6 +15,7 @@ interface IntegrationType {
   integration: string;
   integrationAuth: string;
   isActive: boolean;
+  context: string;
 }
 
 const ProjectIntegrationSection = ({

frontend/components/utilities/attemptLogin.js

@@ -42,9 +42,9 @@ const attemptLogin = async (
       async () => {
         const clientPublicKey = client.getPublicKey();
 
-        const { serverPublicKey, salt } = await login1(email, clientPublicKey);
-
         try {
+          const { serverPublicKey, salt } = await login1(email, clientPublicKey);
+
           client.setSalt(salt);
           client.setServerPublicKey(serverPublicKey);
           const clientProof = client.getProof(); // called M1

frontend/pages/github.js

@@ -0,0 +1,37 @@
+import React, { useEffect } from "react";
+import Head from "next/head";
+import { useRouter } from "next/router";
+const queryString = require("query-string");
+import AuthorizeIntegration from "./api/integrations/authorizeIntegration";
+
+export default function Github() {
+  const router = useRouter();
+  const parsedUrl = queryString.parse(router.asPath.split("?")[1]);
+  const code = parsedUrl.code;
+  const state = parsedUrl.state;
+
+  /**
+   * Here we forward to the default workspace if a user opens this url
+   */
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  useEffect(async () => {
+    try {
+      if (state === localStorage.getItem('latestCSRFToken')) {
+        localStorage.removeItem('latestCSRFToken');
+        await AuthorizeIntegration({
+          workspaceId: localStorage.getItem('projectData.id'),
+          code,
+          integration: "github",
+        });
+        router.push("/integrations/" + localStorage.getItem("projectData.id"));
+      }
+    } catch (error) {
+      console.error('Github integration error: ', error);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return <div></div>;
+}
+
+Github.requireAuth = true;

frontend/pages/integrations/[id].js

@@ -41,7 +41,7 @@ export default function Integrations() {
       setCloudIntegrationOptions(
         await getIntegrationOptions()
       );
-
+      
       // get project integration authorizations
       setIntegrationAuths(
         await getWorkspaceAuthorizations({
@@ -123,6 +123,8 @@ export default function Integrations() {
    * @returns 
    */
   const handleIntegrationOption = async ({ integrationOption }) => {
+    
+    console.log('handleIntegrationOption', integrationOption);
 
     try {
       // generate CSRF token for OAuth2 code-token exchange integrations
@@ -134,11 +136,14 @@ export default function Integrations() {
           window.location = `https://id.heroku.com/oauth/authorize?client_id=${integrationOption.clientId}&response_type=code&scope=write-protected&state=${state}`;
           break;
         case 'Vercel':
-          window.location = `https://vercel.com/integrations/infisical-dev/new?state=${state}`;
+          window.location = `https://vercel.com/integrations/${integrationOption.clientSlug}/new?state=${state}`;
           break;
         case 'Netlify':
           window.location = `https://app.netlify.com/authorize?client_id=${integrationOption.clientId}&response_type=code&state=${state}&redirect_uri=${window.location.origin}/netlify`;
           break;
+        case 'GitHub':
+          window.location = `https://github.com/login/oauth/authorize?client_id=${integrationOption.clientId}&response_type=code&scope=repo&redirect_uri=${window.location.origin}/github&state=${state}`;
+          break;
         // case 'Fly.io':
         //   console.log('fly.io');
         //   setIntegrationAccessTokenDialogOpen(true);

frontend/public/data/frequentConstants.ts

@@ -16,8 +16,14 @@ const reverseEnvMapping: Mapping = {
   test: "Testing",
 };
 
+const contextNetlifyMapping: Mapping = {
+  "dev": "Local development",
+  "branch-deploy": "Branch deploys",
+  "deploy-review": "Deploy Previews",
+  "production": "Production"
+}
+
 const reverseContextNetlifyMapping: Mapping = {
-  "All": "all",
   "Local development": "dev",
   "Branch deploys": "branch-deploy",
   "Deploy Previews": "deploy-preview",
@@ -25,6 +31,7 @@ const reverseContextNetlifyMapping: Mapping = {
 }
 
 export {
+  contextNetlifyMapping,
   envMapping,
   reverseContextNetlifyMapping,
-  reverseEnvMapping};
+  reverseEnvMapping}